Fix order of the bit fields of the register definitions

weather-sensor/firmware/main.c

@@ -77,8 +77,6 @@ int main (void)
 	while(1)
 	{
 		Send_Test_Message();
-		sprintf(debugString, "%s\r\n", "test message");
-		Print_Debug_String(debugString);
 		_delay_ms(1000);
 	}
 }

weather-sensor/firmware/nrf24l01.c

@@ -102,9 +102,7 @@ void Send_Test_Message(void)
 {
 	uint8_t buffer[4] = {0xDE, 0xAD, 0xBE, 0xEF};
 	bool transmissionFinished = false;
-	uint8_t statusContent = 0;
 
-	uint8_t registerContent[5];
 	STATUS_REGISTER statusRegisterContents = {.byte = 0x0};
 	uint8_t lengthRead;
 	char debugString[50] = "";
@@ -136,21 +134,21 @@ void Send_Test_Message(void)
 			Print_Debug_String(debugString);
 		}
 
-		if (statusRegisterContent.bits.TX_DS == true)
+		if (statusRegisterContents.bits.TX_DS == 1)
 		{
 			transmissionFinished = true;
 			sprintf(debugString, "%s\r\n", "TX fin");
 			Print_Debug_String(debugString);
 		}
 
-		if (statusRegisterContent.bits.MAX_RT == true)
+		if (statusRegisterContents.bits.MAX_RT == 1)
 		{
-			transmissionFinished = true;
+			transmissionFinished = true; //TODO: indicate failure
 			sprintf(debugString, "%s\r\n", "max ret");
 			Print_Debug_String(debugString);
 		}
 		
-		timeout ++;
+		timeout ++; // TODO: this should work without the time out, as MAX_RT should be triggered if no ACK is received
 	} while ((transmissionFinished == false) && (timeout < 0xFF));
 
 	if (timeout >= 0xFF)
@@ -160,12 +158,10 @@ void Send_Test_Message(void)
 	}
 
 	/* Reset the interrupts */
-	lengthRead = Read_NRF_Register(STATUS_ADDRESS, statusRegisterContents); /* TODO: use status register read function */
-	statusContent = registerContent[0] & 0x0F;
-	statusRegisterContents.bits.RX_DR = false;
-	statusRegisterContents.bits.TX_DS = false;
-	statusRegisterContents.bits.MAX_RT = false;
-	Write_NRF_Register(STATUS_ADDRESS, statusContent);
+	lengthRead = Read_NRF_Register(STATUS_ADDRESS, &(statusRegisterContents.byte)); /* TODO: use status register read function */
+	statusRegisterContents.bits.TX_DS = 1;
+	statusRegisterContents.bits.MAX_RT = 1;
+	Write_NRF_Register(STATUS_ADDRESS, statusRegisterContents.byte);
 
 	// TODO: flush FIFO if an error occured
 }

weather-sensor/firmware/nrf24l01_definitions.h

@@ -139,18 +139,20 @@ typedef union
 #define RF_OUTPUT_POWER_MINUS_16DBM
 #define RF_OUTPUT_POWER_0DBM
 
+// TODO: change order of all bit fields!!!
+
 /* STATUS */
 typedef union
 {
 	uint8_t byte;
 	struct
 	{
-		 uint8_t RESERVED : 1;
-		 uint8_t TX_DR    : 1;
-		 uint8_t TX_DS    : 1;
-		 uint8_t MAX_RT   : 1;
-		 uint8_t RX_P_NO  : 3;
 		 uint8_t TX_FULL  : 1;
+		 uint8_t RX_P_NO  : 3;
+		 uint8_t MAX_RT   : 1;
+		 uint8_t TX_DS    : 1;
+		 uint8_t RX_DR    : 1;
+		 uint8_t RESERVED : 1;
 	}bits;
 }STATUS_REGISTER;
 
@@ -162,8 +164,8 @@ typedef union
 	uint8_t byte;
 	struct
 	{
-		 uint8_t PLOS_CNT : 4;
 		 uint8_t ARC_CNT  : 4;
+		 uint8_t PLOS_CNT : 4;
 	}bits;
 }OBSERVE_TX_REGISTER;
 
@@ -173,8 +175,8 @@ typedef union
 	uint8_t byte;
 	struct
 	{
-		 uint8_t RESERVED : 7;
 		 uint8_t CD : 1;
+		 uint8_t RESERVED : 7;
 	}bits;
 }CD_REGISTER;
 
@@ -195,13 +197,13 @@ typedef union
 	uint8_t byte;
 	struct
 	{
-		 uint8_t RESERVED0 : 1;
-		 uint8_t TX_REUSE : 1;
-		 uint8_t TX_FULL  : 1;
-		 uint8_t TX_EMPTY : 1;
-		 uint8_t RESERVED1 : 2;
-		 uint8_t RX_FULL  : 1;
 		 uint8_t RX_EMPTY : 1;
+		 uint8_t RX_FULL  : 1;
+		 uint8_t RESERVED1 : 2;
+		 uint8_t TX_EMPTY : 1;
+		 uint8_t TX_FULL  : 1;
+		 uint8_t TX_REUSE : 1;
+		 uint8_t RESERVED0 : 1;
 	}bits;
 }FIFO_STATUS_REGISTER;
 
@@ -211,13 +213,13 @@ typedef union
 	uint8_t byte;
 	struct
 	{
-		 uint8_t RESERVED : 2;
-		 uint8_t DPL_P5   : 1;
-		 uint8_t DPL_P4   : 1;
-		 uint8_t DPL_P3   : 1;
-		 uint8_t DPL_P2   : 1;
-		 uint8_t DPL_P1   : 1;
 		 uint8_t DPL_P0   : 1;
+		 uint8_t DPL_P1   : 1;
+		 uint8_t DPL_P2   : 1;
+		 uint8_t DPL_P3   : 1;
+		 uint8_t DPL_P4   : 1;
+		 uint8_t DPL_P5   : 1;
+		 uint8_t RESERVED : 2;
 	}bits;
 }DYNPD_REGISTER;
 
@@ -227,10 +229,10 @@ typedef union
 	uint8_t byte;
 	struct
 	{
-		 uint8_t RESERVED   : 5;
-		 uint8_t EN_DPL     : 1;
-		 uint8_t EN_ACK_PAY : 1;
 		 uint8_t EN_DYN_ACK : 1;
+		 uint8_t EN_ACK_PAY : 1;
+		 uint8_t EN_DPL     : 1;
+		 uint8_t RESERVED   : 5;
 	}bits;
 }FEATURE_REGISTER;