diff --git a/rheometerApp/Db/rheo_comm.db b/rheometerApp/Db/rheo_comm.db
index 7d2a4e8b45fe24ef72330fbb303a4edba056887d..f8579629e22a4fe94023991a53f2fd09a08c9a02 100644
--- a/rheometerApp/Db/rheo_comm.db
+++ b/rheometerApp/Db/rheo_comm.db
@@ -128,6 +128,36 @@ record(calcout, $(P):loadMeasConfig){
 	field(OUT, "@rheo_comm.proto loadMeasConfig_viscometry($(P):errMessage) rheo")
 }
 
+record(calcout, $(P):loadMeasConfig_amp_sweep) {
+	field(INPA, "$(P):npoints-S pp")
+	field(INPB, "$(P):FreqInterval_start") 
+	field(INPC, "$(P):FreqInterval_end")
+	field(INPD, "$(P):FreqPeriod")
+	field(CALC, "0")
+	field(SCAN, "Passive")
+	field(DTYP, "stream")
+	field("@rheo_comm.proto loadMeasConfig_amplitude_sweep($(P):errMessage) rheo")
+}
+
+
+record(ai, $(P):FreqInterval_start) {
+	field(DESC, "")
+	field(VAL, "0.0001")
+	field(EGU, "fraction")
+}
+
+record(ai, "$(P):FreqInterval_End) {
+	field(DESC, "")
+	field(VAL, "1")
+	field(EGU, "fraction")
+}
+
+record(ai, "$(P):FreqPeriod) {
+	field(DESC, "")
+	field(VAL, "1.591549431")
+	field(EGU, "s")
+}
+
 record(ai, $(P):npoints-S){
 	field(DESC, "Number of measurement points.")
 	field(VAL, "5")	
@@ -201,6 +231,11 @@ record(stringin, $(P):KCONFIG) {
 	field(INP, "@rheo_comm.proto Kconfig_viscometry($(P):errMessage) rheo")
 }
 
+record(stringin, $(P):KCONFIG_amp_sweep) {
+	field(DTYP, "stream")
+	field(INP, "@rheo_comm.proto Kconfig_amp_sweep($(P):errMessage) rheo")
+} 
+
 record(stringin, $(P):errMessage){
 }
 
@@ -222,6 +257,25 @@ record(longin, $(P):MeasNumber){
 	field(SCAN, "I/O Intr")
 }
 
+record(longin, $(P):ScanMeasurement) {
+	field(DTYP, "stream")
+	field(INP, "@rheo_comm.proto getMeasurementValues_amp_sweep($(P):NUMB-RB,$(P):TEMP-RB,$(P):PhasAngle-RB,$(P):TORQ-RB,$(P):Strain1-RB,$(P):Strain2-RB) rheo")
+	field(SCAN, "I/O Intr")
+}
+
+record(ai, $(P):PhasAngle-RB) {
+	field(DESC, "Phase angle.")
+	field(EGU, "rad")
+}
+
+record(ai, $(P):Strain1-RB) {
+	field(DESC, "")
+}
+
+record(ai, $(P):Strain2-RB) {
+	field(DESC, "")
+}
+
 record(ai, $(P):TEMP-RB){
 	field(DESC, "Temperature in control system")
 	field(EGU, "K")
@@ -370,5 +424,12 @@ record(compress, $(P):ArrayViscosity) {
 	field(FLNK, "$(P):ArrayShearStress.PROC")
 }
 
- 
+record(calc, $(P):ShearStrain) {
+	field(DESC, "Strain*CSR factor /(2*pi)")
+	field(INPA, "$(P):Strain1-RB.VAL NPP")
+	field(INPB, "$(P):CSRfactor.VAL NPP")
+	field(CALC, "A*B/(2*PI)")
+	field(EGU, "Pa")
+}
+
 
diff --git a/rheometerApp/Db/rheo_comm.proto b/rheometerApp/Db/rheo_comm.proto
index 0307574fe8c54e42e89934f05fc07e87fee8a18f..41806a672630b473220494ff660bf16a75ac3596 100644
--- a/rheometerApp/Db/rheo_comm.proto
+++ b/rheometerApp/Db/rheo_comm.proto
@@ -75,12 +75,14 @@ loadMeasConfig_viscometry {
 	
 }
 
-loadMeasConfig_ampltiude_sweep {
-	npoints = "%(A)i"; #def: 25
-	frq_interval = "(%(B)f,%(C)f)"; #Def:(0.0001, 1)
+loadMeasConfig_amplitude_sweep {
+	npoints = "%(A)i"; # def 25;
+	frq_interval = "(%(B)f,%(C)f)"; #Def:(0.0001, 1);
 	frq_dist = "LOG";
-	period = "%(D)f"; #def: 1.591549431	
-	out = ":PROG[\"Test\",TEST[(PART[(NUMB["$npoints",LAST]),(),(),(),(STRA[1,OSCI[FUNC["$frq_dist","$frq_interval"],"$period",SIN]]),(),(),VALF[STRA[1,?&]],(VALF[STRA[1,?&]],DAPT[TEMP[2,??T]],COMP[MODU[1,??F],1,PHAS],COMP[TORQ[1,??F],0,CABS],COMP[TORQ[1,??F],1,CABS],DAPT[KFAC[1,??T]],COMP[SPEE[1,??F],0,CABS],COMP[EXCU[1,??F],0,CABS],COMP[EXCU[1,??F],1,CABS],COMP[FORC[1,??F],0,REAL],DAPT[DIST[1,??T]],GSTR[STAT[1,??T]],DAPT[VELO[1,??T]],DAPT[DGAP[1,??T]],DAPT[TIMA[1,??T]],DAPT[TIMP[1,??T]],COMP[EXCE[1,??F],0,CABS],COMP[EXCE[1,??F],1,CABS],COMP[ETRQ[1,??F],0,CABS],COMP[ETRQ[1,??F],1,CABS]),(GENP[0,(IFST[IN,(17)])],SETV[0,(IFST[IN,(16)])]),()])],EXIT[()],CANC[()]]"; 
+	period = "%(D)f"; #def: 1.591549431;	
+	out ":PROG[\"Test\",TEST[(PART[(NUMB["$npoints",LAST]),(),(),(),(STRA[1,OSCI[FUNC["$frq_dist","$frq_interval"],"$period",SIN]]),(),(),VALF[STRA[1,?&]],(VALF[STRA[1,?&]],DAPT[TEMP[2,??T]],COMP[MODU[1,??F],1,PHAS],COMP[TORQ[1,??F],0,CABS],COMP[TORQ[1,??F],1,CABS],DAPT[KFAC[1,??T]],COMP[SPEE[1,??F],0,CABS],COMP[EXCU[1,??F],0,CABS],COMP[EXCU[1,??F],1,CABS],COMP[FORC[1,??F],0,REAL],DAPT[DIST[1,??T]],GSTR[STAT[1,??T]],DAPT[VELO[1,??T]],DAPT[DGAP[1,??T]],DAPT[TIMA[1,??T]],DAPT[TIMP[1,??T]],COMP[EXCE[1,??F],0,CABS],COMP[EXCE[1,??F],1,CABS],COMP[ETRQ[1,??F],0,CABS],COMP[ETRQ[1,??F],1,CABS]),(GENP[0,(IFST[IN,(17)])],SETV[0,(IFST[IN,(16)])]),()])],EXIT[()],CANC[()]]"; 
+
+	in "%(\$1)s"; 
 }
 
 
@@ -127,6 +129,10 @@ Kconfig_amp_sweep {
 getMeasurementValues {
 	in ":MEAS[%(\$4)i,%*i,%*f,%*f,%*i,(),(%(\$1)f,%(\$2)f,%(\$3)f,%*f,%*f,%*f,%*s,%*i,%*f,%*f,%*f,%*f)]";	
 }
+
+getMeasurementValues_amp_sweep {
+	in ":MEAS[%(\$1)i,%*i,%*f,%*f,%*i,(),(%*f,%(\$2)f,%(\$3)f,%*f,%(\$4),%*f,%*f,%*f,%(\$5),%*f,%*f,%*#s,%*f,%*f,%*f,%*f,%*f,%(\$6),%*f,%*f)]";
+}
 	
 debugMeasVal {
 	in "MEAS[%s]";