diff --git a/rheometerApp/Db/read_data.db b/rheometerApp/Db/read_data.db index df63ab054b50ac52d09094eb62dab28ee15c5c63..799038f4ffe1906e3f9729597d05a2eae50dbdfc 100644 --- a/rheometerApp/Db/read_data.db +++ b/rheometerApp/Db/read_data.db @@ -132,7 +132,7 @@ record(ai, "$(P)$(R)CSSfactor") { record(ai, "$(P)$(R)CSRfactor") { field(DESC, "Defined by the measuring system") field(VAL, "149.382") - field(EGU, "s/s") + field(EGU, "1") field(PINI, "YES") } @@ -161,7 +161,7 @@ record(calc, "$(P)$(R)ShearStrain") { field(INPA, "$(P)$(R)Strain1-R.VAL NPP") field(INPB, "$(P)$(R)CSRfactor.VAL NPP") field(CALC, "A*B/(2*PI)") - field(EGU, "Pa") + field(EGU, "1") } record(calc, "$(P)$(R)Viscosity") { @@ -179,7 +179,7 @@ record(calc, "$(P)$(R)TotModulus") { field(INPA, "$(P)$(R)ShearStress.VAL PP") field(INPB, "$(P)$(R)ShearStrain.VAL PP") field(CALC, "A/B") - field(EGU, "?") + field(EGU, "1") field(TSE, "-2") field(TSEL, "$(P)$(R)#meas_data.TIME NPP") } \ No newline at end of file diff --git a/rheometerApp/Db/rheo_comm.proto b/rheometerApp/Db/rheo_comm.proto index 4e7dbd8a3b441fe463bf6eef06de6973de1f4014..db6a8b8c86efc48afc200e0733a9836ecee2e996 100644 --- a/rheometerApp/Db/rheo_comm.proto +++ b/rheometerApp/Db/rheo_comm.proto @@ -1,6 +1,6 @@ -# Terminator = SUB; +Terminator = SUB; # ReplyTimeout = 2000; -TERMINATOR = LF; +# TERMINATOR = LF; initRheo { @@ -119,8 +119,8 @@ Kconfig_amp_sweep { getWaveform { Separator = ','; - # InTerminator = ")]",SUB; - InTerminator = ")]",LF; + InTerminator = ")]",SUB; + # InTerminator = ")]",LF; in ":MEAS[%d,%(\$1)i,%*f,%*f,%*i,(),(%(\$2)[^,]"; }