forkd

Dependencies:   mbed

Fork of LGstaandart by Dmitry Kovalev

Revision:
232:130a2b5003e6
Parent:
231:079835d508ef
--- a/vibro.h	Thu Jan 25 13:59:43 2018 +0000
+++ b/vibro.h	Wed Jan 31 13:41:23 2018 +0000
@@ -139,22 +139,22 @@
 
 typedef struct {
 			    union {
-    			float StaticTermoCorr_Temp_Arr[14];
+    			int StaticTermoCorr_Temp_Arr[14];
    				struct  {
-					   	  float TermoTempStatic_0;
-						  float TermoTempStatic_1;
-					      float TermoTempStatic_2;
-					      float TermoTempStatic_3;
-					      float TermoTempStatic_4;
-					      float TermoTempStatic_5;
-					      float TermoTempStatic_6;
-					      float TermoTempStatic_7;
-					      float TermoTempStatic_8;
-					      float TermoTempStatic_9;
-					      float TermoTempStatic_10;
-					      float TermoTempStatic_11;
-					      float TermoTempStatic_12;
-					      float TermoTempStatic_13;
+					   	  int TermoTempStatic_0;
+						  int TermoTempStatic_1;
+					      int TermoTempStatic_2;
+					      int TermoTempStatic_3;
+					      int TermoTempStatic_4;
+					      int TermoTempStatic_5;
+					      int TermoTempStatic_6;
+					      int TermoTempStatic_7;
+					      int TermoTempStatic_8;
+					      int TermoTempStatic_9;
+					      int TermoTempStatic_10;
+					      int TermoTempStatic_11;
+					      int TermoTempStatic_12;
+					      int TermoTempStatic_13;
           				} Str;
           	}TermoTempStatic;
           	
@@ -260,7 +260,7 @@
 	          unsigned int ParamFlag;
 	      int DeltaT4;
 	      int DeltaT5;
-	       
+	      int DeltaTRate; 
 	      int TermoModT4;
 	      int  TermoModT5;
 	      int  TermoModSum;
@@ -324,7 +324,7 @@
 	      
 		   unsigned int TimeToJump;  	                     						            	//5
 		   unsigned int JumpDelta; 
-		   
+		    unsigned int step;
 		    unsigned int Termodata0;
 		    unsigned int Termodata1;
 		    unsigned int Termodata2;
@@ -358,7 +358,9 @@
 		   
 		   
 		   int CurTermoCompens;
+		   
 		   int AngelCompens;
+		   
 		   unsigned int ShowMod2;
 		   int Debag; 
 		   int Debag2; 
@@ -394,6 +396,7 @@
 		   int HFO_Min;
 		   int HFO_Max;
 		   unsigned int HFO_Gain;
+		   unsigned int HFO_Gain_Reset_PLC;
 		   unsigned int RgConA;														// 9 регистр управления ГЛД
 		   unsigned int RgConB;														//10 регистр управления ГЛД
 		   unsigned int RgConMod;
@@ -571,8 +574,8 @@
 unsigned int a27;  																//45
 unsigned int a28;  																//46
 					
-						unsigned int Tmp_OffsetT4;  							//47
-						unsigned int Tmp_OffsetT5;  							//48
+						int Tmp_OffsetT4;  							//47
+						int Tmp_OffsetT5;  							//48
 
 unsigned int a29;  																//49
 unsigned int a30;        								 						//61 0 - Mirror 1 - Prizm.
@@ -592,7 +595,7 @@
        	 			    
 						unsigned int PLC_Start;        	 						//61 0 - Mirror 1 - Prizm.
 
-						unsigned int TermoMode;									//62 серийный номер прибора	  
+						unsigned int TermoMode;									//62 термокомпенсация
 
 unsigned int TStatic_0;  														//63
 unsigned int TStatic_1;  																//64
@@ -609,34 +612,34 @@
 unsigned int TStatic_12;  																//75
 unsigned int TStatic_13;  																//76
 
-unsigned int TermoDeltaStatic_0;  																//77
-unsigned int TermoDeltaStatic_1;  																//78	
-unsigned int TermoDeltaStatic_2;  																//79
-unsigned int TermoDeltaStatic_3;  																//80
-unsigned int TermoDeltaStatic_4;  																//81
-unsigned int TermoDeltaStatic_5;																//82 
-unsigned int TermoDeltaStatic_6;  																//83
-unsigned int TermoDeltaStatic_7;  																//84
-unsigned int TermoDeltaStatic_8;  																//85
-unsigned int TermoDeltaStatic_9;  																//86
-unsigned int TermoDeltaStatic_10;  																//87
-unsigned int TermoDeltaStatic_11;  																//88
-unsigned int TermoDeltaStatic_12;  																//89
-unsigned int TermoDeltaStatic_13;  																//90
-unsigned int TermoDeltaStatic_14;  																//91
-unsigned int TermoDeltaStatic_15;  																//92
-unsigned int TermoDeltaStatic_16;  																//93
-unsigned int TermoDeltaStatic_17;  																//94
-unsigned int TermoDeltaStatic_18;  																//95
-unsigned int TermoDeltaStatic_19;  																//96
-unsigned int TermoDeltaStatic_20;  																//97
-unsigned int TermoDeltaStatic_21;  																//98	
-unsigned int TermoDeltaStatic_22;  																//99
-unsigned int TermoDeltaStatic_23;  																//100
-unsigned int TermoDeltaStatic_24;  																//101
-unsigned int TermoDeltaStatic_25; 																//102
-unsigned int TermoDeltaStatic_26;  																//103
-unsigned int TermoDeltaStatic_27; 																//104
+unsigned int aTermoDeltaStatic_0;  																//77
+unsigned int aTermoDeltaStatic_1;  																//78	
+unsigned int aTermoDeltaStatic_2;  																//79
+unsigned int aTermoDeltaStatic_3;  																//80
+unsigned int aTermoDeltaStatic_4;  																//81
+unsigned int aTermoDeltaStatic_5;																//82 
+unsigned int aTermoDeltaStatic_6;  																//83
+unsigned int aTermoDeltaStatic_7;  																//84
+unsigned int aTermoDeltaStatic_8;  																//85
+unsigned int aTermoDeltaStatic_9;  																//86
+unsigned int aTermoDeltaStatic_10;  																//87
+unsigned int aTermoDeltaStatic_11;  																//88
+unsigned int aTermoDeltaStatic_12;  																//89
+unsigned int aTermoDeltaStatic_13;  																//90
+unsigned int aTermoDeltaStatic_14;  																//91
+unsigned int aTermoDeltaStatic_15;  																//92
+unsigned int aTermoDeltaStatic_16;  																//93
+unsigned int aTermoDeltaStatic_17;  																//94
+unsigned int aTermoDeltaStatic_18;  																//95
+unsigned int aTermoDeltaStatic_19;  																//96
+unsigned int aTermoDeltaStatic_20;  																//97
+unsigned int aTermoDeltaStatic_21;  																//98	
+unsigned int aTermoDeltaStatic_22;  																//99
+unsigned int aTermoDeltaStatic_23;  																//100
+unsigned int aTermoDeltaStatic_24;  																//101
+unsigned int aTermoDeltaStatic_25; 																//102
+unsigned int aTermoDeltaStatic_26;  																//103
+unsigned int aTermoDeltaStatic_27; 																//104
 
 unsigned	 int /*RLC;*/ResetLevelCool;  										//105 временно должен быть на 39
 
@@ -651,7 +654,7 @@
 unsigned int a86;  																//113
 unsigned int a87; 																//114
 unsigned int FlashMod;  														//115
-unsigned int a89; 																//116
+unsigned int HFO_Gain_Reset_PLC;												//116
 
 unsigned int TSHeat0;  															//117
 unsigned int TSHeat1;  															//118	
@@ -668,80 +671,80 @@
 unsigned int TSHeat12;  														//129
 unsigned int TSHeat13;  														//130
 
-unsigned int TermoDynamicDataHeat0;  													//131
-unsigned int TermoDynamicDataHeat1;  													//132	
-unsigned int TermoDynamicDataHeat2;  													//133
-unsigned int TermoDynamicDataHeat3;  													//134
-unsigned int TermoDynamicDataHeat4;  													//135
-unsigned int TermoDynamicDataHeat5; 													//136
-unsigned int TermoDynamicDataHeat6;  													//137
-unsigned int TermoDynamicDataHeat7; 													//138
-unsigned int TermoDynamicDataHeat8; 													//139
-unsigned int TermoDynamicDataHeat9; 													//140
-unsigned int TermoDynamicDataHeat10; 													//141
-unsigned int TermoDynamicDataHeat11;  													//142	
-unsigned int TermoDynamicDataHeat12;  													//143
-unsigned int TermoDynamicDataHeat13;  													//144
-unsigned int TermoDynamicDataHeat14;  													//145
-unsigned int TermoDynamicDataHeat15; 													//146
-unsigned int TermoDynamicDataHeat16;  													//147
-unsigned int TermoDynamicDataHeat17; 													//148
-unsigned int TermoDynamicDataHeat18; 													//149
-unsigned int TermoDynamicDataHeat19; 													//150
-unsigned int TermoDynamicDataHeat20; 													//151
-unsigned int TermoDynamicDataHeat21;  													//152	
-unsigned int TermoDynamicDataHeat22;  													//153
-unsigned int TermoDynamicDataHeat23;  													//154
-unsigned int TermoDynamicDataHeat24;  													//155
-unsigned int TermoDynamicDataHeat25; 													//156
-unsigned int TermoDynamicDataHeat26;  													//157
-unsigned int TermoDynamicDataHeat27; 													//158
+unsigned int TermoDeltaStatic_0;  													//131
+unsigned int TermoDeltaStatic_1;  													//132	
+unsigned int TermoDeltaStatic_2;  													//133
+unsigned int TermoDeltaStatic_3;  													//134
+unsigned int TermoDeltaStatic_4;  													//135
+unsigned int TermoDeltaStatic_5; 													//136
+unsigned int TermoDeltaStatic_6;  													//137
+unsigned int TermoDeltaStatic_7; 													//138
+unsigned int TermoDeltaStatic_8; 													//139
+unsigned int TermoDeltaStatic_9; 													//140
+unsigned int TermoDeltaStatic_10; 													//141
+unsigned int TermoDeltaStatic_11;  													//142	
+unsigned int TermoDeltaStatic_12;  													//143
+unsigned int TermoDeltaStatic_13;  													//144
+unsigned int TermoDeltaStatic_14;  													//145
+unsigned int TermoDeltaStatic_15; 													//146
+unsigned int TermoDeltaStatic_16;  													//147
+unsigned int TermoDeltaStatic_17; 													//148
+unsigned int TermoDeltaStatic_18; 													//149
+unsigned int TermoDeltaStatic_19; 													//150
+unsigned int TermoDeltaStatic_20; 													//151
+unsigned int TermoDeltaStatic_21;  													//152	
+unsigned int TermoDeltaStatic_22;  													//153
+unsigned int TermoDeltaStatic_23;  													//154
+unsigned int TermoDeltaStatic_24;  													//155
+unsigned int TermoDeltaStatic_25; 													//156
+unsigned int TermoDeltaStatic_26;  													//157
+unsigned int TermoDeltaStatic_27; 													//158
 
 unsigned int Step; 																//159
 
-unsigned int TDCool_0;  															//160
-unsigned int TDCool_1;  															//161	
-unsigned int TDCool_2;  															//162
-unsigned int TDCool_3;  															//163
-unsigned int TDCool_4;  															//164
+unsigned int TDCool_0;  														//160
+unsigned int TDCool_1;  														//161	
+unsigned int TDCool_2;  														//162
+unsigned int TDCool_3;  														//163
+unsigned int TDCool_4;  														//164
 unsigned int TDCool_5; 															//165
-unsigned int TDCool_6;  															//166
+unsigned int TDCool_6;  														//166
 unsigned int TDCool_7; 															//167
 unsigned int TDCool_8; 															//168
 unsigned int TDCool_9; 															//169
-unsigned int TDCool_10; 															//170
+unsigned int TDCool_10; 														//170
 unsigned int TDCool_11;  														//171	
 unsigned int TDCool_12;  														//172
 unsigned int TDCool_13;  														//173
 
-unsigned int TermoDataCool0;  													//174
-unsigned int TermoDataCool1;  													//175	
-unsigned int TermoDataCool2;  													//176
-unsigned int TermoDataCool3;  													//177
-unsigned int TermoDataCool4;  													//178
-unsigned int TermoDataCool5; 													//179
-unsigned int TermoDataCool6;  													//180
-unsigned int TermoDataCool7; 													//181
-unsigned int TermoDataCool8; 													//182
-unsigned int TermoDataCool9; 													//183
-unsigned int TermoDataCool10; 													//184
-unsigned int TermoDataCool11;  													//185	
-unsigned int TermoDataCool12;  													//186
-unsigned int TermoDataCool13;  													//187
-unsigned int TermoDataCool14;  													//188
-unsigned int TermoDataCool15; 													//189
-unsigned int TermoDataCool16;  													//190
-unsigned int TermoDataCool17; 													//191
-unsigned int TermoDataCool18; 													//192
-unsigned int TermoDataCool19; 													//193
-unsigned int TermoDataCool20; 													//194
-unsigned int TermoDataCool21;  													//195	
-unsigned int TermoDataCool22;  													//196
-unsigned int TermoDataCool23;  													//197
-unsigned int TermoDataCool24;  													//198
-unsigned int TermoDataCool25; 													//199
-unsigned int TermoDataCool26;  													//200
-unsigned int TermoDataCool27; 													//201
+unsigned int TermoDynamicData_0;  											//174
+unsigned int TermoDynamicData_1;  													//175	
+unsigned int TermoDynamicData_2;  													//176
+unsigned int TermoDynamicData_3;  													//177
+unsigned int TermoDynamicData_4;  													//178
+unsigned int TermoDynamicData_5; 													//179
+unsigned int TermoDynamicData_6;  													//180
+unsigned int TermoDynamicData_7; 													//181
+unsigned int TermoDynamicData_8; 													//182
+unsigned int TermoDynamicData_9; 													//183
+unsigned int TermoDynamicData_10; 													//184
+unsigned int TermoDynamicData_11;  													//185	
+unsigned int TermoDynamicData_12;  													//186
+unsigned int TermoDynamicData_13;  													//187
+unsigned int TermoDynamicData_14;  													//188
+unsigned int TermoDynamicData_15; 													//189
+unsigned int TermoDynamicData_16;  													//190
+unsigned int TermoDynamicData_17; 													//191
+unsigned int TermoDynamicData_18; 													//192
+unsigned int TermoDynamicData_19; 													//193
+unsigned int TermoDynamicData_20; 													//194
+unsigned int TermoDynamicData_21;  													//195	
+unsigned int TermoDynamicData_22;  													//196
+unsigned int TermoDynamicData_23;  													//197
+unsigned int TermoDynamicData_24;  													//198
+unsigned int TermoDynamicData_25; 													//199
+unsigned int TermoDynamicData_26;  													//200
+unsigned int TermoDynamicData_27; 													//201
 
    } Str;
 } GyroParam;