Изменены дефайны для заголовка SB_TMSG

Devices/tmsgheaders.c

@@ -98,7 +98,11 @@ void key_switch (void  *bar1, double freq, double lmx_freq) {
 			*ptr = SHIFT_REG_SW_MIXER_RF_1 | SHIFT_REG_GPIO_SW_015_RF_1  | SHIFT_REG_SW_RF_0;
 		}
 		// Header for GPIO_REG 1MOSI
-		*ptr = (0 << 23) | (DeviceIdGpio1 << 18) | (1 << 1) | 1;
+		*ptr = 	(SB_HEADER_SPI_MODE_1MOSI) | 
+				(DeviceIdGpio1 << SB_HEADER_1MOSI_DEVICE_ID_BITP) | 
+				(1 << SB_HEADER_1MOSI_WORD_NUM_BITP) | 
+				SB_HEADER_TERM_BIT_1;
+
 		// Data for GPIO_REG
 		SET_REGISTER_PARAM(tmsgGpioReg, RF_SW1_BITM, RF_SW1_BITP, RF_SW1_0);
 		SET_REGISTER_PARAM(tmsgGpioReg, RF_SW2_BITM, RF_SW2_BITP, RF_SW2_0);
@@ -142,7 +146,11 @@ void key_switch (void  *bar1, double freq, double lmx_freq) {
 		}
 	
 		// Header for GPIO_REG 1MOSI
-		*ptr = (0 << 23) | (DeviceIdGpio1 << 18) | (1 << 1) | 1;
+		*ptr = 	(SB_HEADER_SPI_MODE_1MOSI) | 
+				(DeviceIdGpio1 << SB_HEADER_1MOSI_DEVICE_ID_BITP) | 
+				(1 << SB_HEADER_1MOSI_WORD_NUM_BITP) | 
+				SB_HEADER_TERM_BIT_1;
+
 		// Data for GPIO_REG
 		SET_REGISTER_PARAM(tmsgGpioReg, RF_SW1_BITM, RF_SW1_BITP, RF_SW1_0);
 		SET_REGISTER_PARAM(tmsgGpioReg, RF_SW2_BITM, RF_SW2_BITP, RF_SW2_0);
@@ -180,7 +188,11 @@ void key_switch (void  *bar1, double freq, double lmx_freq) {
 		}
 		
 		// Header for GPIO_REG 1MOSI
-		*ptr = (0 << 23) | (DeviceIdGpio1 << 18) | (1 << 1) | 1;
+		*ptr = 	(SB_HEADER_SPI_MODE_1MOSI) | 
+				(DeviceIdGpio1 << SB_HEADER_1MOSI_DEVICE_ID_BITP) | 
+				(1 << SB_HEADER_1MOSI_WORD_NUM_BITP) | 
+				SB_HEADER_TERM_BIT_1;
+
 		// Data for GPIO_REG
 		SET_REGISTER_PARAM(tmsgGpioReg, RF_SW1_BITM, RF_SW1_BITP, RF_SW1_0);
 		SET_REGISTER_PARAM(tmsgGpioReg, RF_SW2_BITM, RF_SW2_BITP, RF_SW2_1);
@@ -212,7 +224,11 @@ void key_switch (void  *bar1, double freq, double lmx_freq) {
 		}
 
 		// Header for GPIO_REG 1MOSI
-		*ptr = (0 << SPI_MODE_BITP) | (DeviceIdGpio1 << DEVICE_ID_BITP) | (1 << WORD_NUM_BITP) | 1;
+		*ptr = 	(SB_HEADER_SPI_MODE_1MOSI) | 
+				(DeviceIdGpio1 << SB_HEADER_1MOSI_DEVICE_ID_BITP) | 
+				(1 << SB_HEADER_1MOSI_WORD_NUM_BITP) | 
+				SB_HEADER_TERM_BIT_1;
+		
 		// Data for GPIO_REG
 		SET_REGISTER_PARAM(tmsgGpioReg, RF_SW1_BITM, RF_SW1_BITP, RF_SW1_1);
 		SET_REGISTER_PARAM(tmsgGpioReg, RF_SW2_BITM, RF_SW2_BITP, RF_SW2_0);

Devices/tmsgheaders.h

@@ -15,9 +15,16 @@
 #define DeviceIdTemp                    0x8
 #define DeviceIdGpio2                   0x9
 
-#define WORD_NUM_BITP					1
-#define DEVICE_ID_BITP					18
-#define SPI_MODE_BITP					23				
+#define SB_HEADER_TERM_BIT_BITP			0
+#define SB_HEADER_1MOSI_WORD_NUM_BITP	1
+#define SB_HEADER_1MOSI_DEVICE_ID_BITP	18
+#define SB_HEADER_SPI_MODE_BITP			23
+
+#define SB_HEADER_TERM_BIT_0			(0x0 << SB_HEADER_TERM_BIT_BITP)
+#define SB_HEADER_TERM_BIT_1			(0x1 << SB_HEADER_TERM_BIT_BITP)
+
+#define SB_HEADER_SPI_MODE_1MOSI		(0x0 << SB_HEADER_SPI_MODE_BITP)
+#define SB_HEADER_SPI_MODE_4MOSI		(0x1 << SB_HEADER_SPI_MODE_BITP)
 
 // Init Word Numbers 1 MOSI
 #define Gpio1InitWordNum                2
@@ -249,7 +256,6 @@
 #define SHIFT_REG_SW1_RF                    0x1
 #define SHIFT_REG_SW_MIXER_RF               0x0
 
-
 #define SHIFT_REG_GPIO_SW_X2_RF_BITP        0
 #define SHIFT_REG_SW_RF_BITP                1
 #define SHIFT_REG_SW4_RF_BITP               2