Diff: lifiReceiver.cpp

Revision:

19:a7e295b496a8

Parent:

18:2f7b820324c3

Child:

20:6a8e86d7d504

--- a/lifiReceiver.cpp	Mon Apr 08 04:25:57 2019 +0000
+++ b/lifiReceiver.cpp	Mon Apr 08 04:35:18 2019 +0000
@@ -79,10 +79,10 @@
 	// no auxiliary security header
 	int rx_frame_index;
 	int rx_frame_size;
-	uint16_t length;
-	uint16_t received_data_count;
-	uint16_t length_save;
-	uint16_t received_data_count_save;
+	uint16_t pdu_length;
+	uint16_t pdu_length_count;
+	uint16_t pdu_length_save;
+	uint16_t pdu_length_count_save;
 };
 // __attribute__((packed));
 
@@ -333,17 +333,17 @@
 
 		} else if ((*frame_state) == START_STATE) {
 			(*frame_state) = LENGTH_LSB_STATE;
-			rx_vars[channel].length = data;
+			rx_vars[channel].pdu_length = data;
 #if RX_DEBUG_FRAME
 			printf("%dLENGTH_LSB(%d) ",channel+1,data);
 #endif
 		} else if ((*frame_state) == LENGTH_LSB_STATE) {
 
 			(*frame_state) = LENGTH_MSB_STATE;
-			rx_vars[channel].length = rx_vars[channel].length + (data << 8);
-			rx_vars[channel].received_data_count = 0;
+			rx_vars[channel].pdu_length = rx_vars[channel].pdu_length + (data << 8);
+			rx_vars[channel].pdu_length_count = 0;
 #if RX_DEBUG_FRAME
-			printf("%dLENGTH_MSB(%d) length=%d ",channel+1,data, rx_vars[channel].length);
+			printf("%dLENGTH_MSB(%d) length=%d ",channel+1,data, rx_vars[channel].pdu_length);
 #endif
 
 		} else if ((*frame_state) == LENGTH_MSB_STATE) {
@@ -352,17 +352,17 @@
 			printf("%dD=%c[%x] ",channel+1,data,data);
 #endif
 			(*frame_state) = DATA_STATE;
-			rx_vars[channel].received_data_count++;
+			rx_vars[channel].pdu_length_count++;
 
 		} else if ((*frame_state) == DATA_STATE) {
-			rx_vars[channel].received_data_count++;
+			rx_vars[channel].pdu_length_count++;
 			// when ETX
-			if (rx_vars[channel].received_data_count
-					> rx_vars[channel].length) {
+			if (rx_vars[channel].pdu_length_count
+					> rx_vars[channel].pdu_length) {
 				
-				rx_vars[channel].received_data_count--; // ETX is not included on data length
-				rx_vars[channel].received_data_count_save = rx_vars[channel].received_data_count;
-				rx_vars[channel].length_save = rx_vars[channel].length;
+				rx_vars[channel].pdu_length_count--; // ETX is not included on data length
+				rx_vars[channel].pdu_length_count_save = rx_vars[channel].pdu_length_count;
+				rx_vars[channel].pdu_length_save = rx_vars[channel].pdu_length;
 						
 				if (data == ETX) {
 #if RX_DEBUG_FRAME
@@ -540,12 +540,12 @@
 	printf("\n{{{");
 	printf("\nMSG valid=%d, (ch_%d)[len:%d/%d] Adc[Max=%d Min=%d Gap=%d]",
 			rx_vars[channel].is_valid,
-			rx_vars[channel].received_data_count,
-			rx_vars[channel].length, channel,
+			rx_vars[channel].pdu_length_count,
+			rx_vars[channel].pdu_length, channel,
 			rx_vars[channel].probe_adc_high_received,
 			rx_vars[channel].probe_adc_low_received,
 			rx_vars[channel].probe_adc_gap_received);
-	print_frame_data(rx_vars[channel].rx_frame_buffer_save,rx_vars[channel].length);
+	print_frame_data(rx_vars[channel].rx_frame_buffer_save,rx_vars[channel].pdu_length);
 	
 #endif    
 }