WIP: use register definitions to access them

weather-sensor/firmware/nrf24l01.c

@@ -5,6 +5,7 @@
 #include <stdbool.h>
 
 #include "nrf24l01.h"
+#include "nrf24l01_definitions.h"
 #include "uart_debug.h"
 
 /* TODO
@@ -19,6 +20,8 @@ void Print_Register_Contents(uint8_t address);
 /* Startup and initial configuration of the NRF24L01 */
 void Initialize_NRF24L01(void)
 {
+	CONFIG_REGISTER configRegisterContents = {.byte = 0x0};
+
 	/* Configure the AVR pins for the nrf24l01 */
 	/* Set up the NRF24L01 */
 	NRF_CE_DDR |= (1 << NRF_CE_PIN);
@@ -33,7 +36,9 @@ void Initialize_NRF24L01(void)
 	_delay_ms(11);
 
 	/* Write the PWR_UP bit of the CONFIG register (EN_CRC is also set) */
-	Write_NRF_Register(0x0, 0xA);
+	configRegisterContents.bits.EN_CRC = 0x1;
+	configRegisterContents.bits.PWR_UP = 0x1;
+	Write_NRF_Register(CONFIG_ADDRESS, configRegisterContents.byte);
 
 	/* Wait more than 1.5 ms for the change to take effect */
 	_delay_ms(2);
@@ -43,6 +48,8 @@ void Initialize_NRF24L01(void)
 
 void Configure_Transmission(void)
 {
+	FEATURE_REGISTER featureRegisterContents = {.byte = 0x0};
+	DYNPD_REGISTER dyndpRegisterContents = {.byte = 0x0};
 	/* 
 	 * - Length of CRC (CRCO in CONFIG)
 	 * - Enable auto acknowledgment (EN_AA)
@@ -66,15 +73,23 @@ void Configure_Transmission(void)
 	//Write_NRF_Register(0x03, 0x1);
 
 	/* Set the frequency to 1450 MHz */
-	Write_NRF_Register(0x05, 0x32);
+	Write_NRF_Register(RF_CH_ADDRESS, 0x32);
 
 	/* Enable dynamic payload length */
 	Send_Activate_Command();
-	Write_NRF_Register(0x1D, 0x4); // enable dynamic payload length
-	Write_NRF_Register(0X1C, 0X3F); // set dynamic payload length for all data pipes
+	featureRegisterContents.bits.EN_DPL = 1; // enable dynamic payload length
+	Write_NRF_Register(FEATURE_ADDRESS, featureRegisterContents.byte);
+
+	/* set dynamic payload length for all data pipes */
+	dyndpRegisterContents.bits.DPL_P0 = 1;
+	dyndpRegisterContents.bits.DPL_P1 = 1;
+	dyndpRegisterContents.bits.DPL_P2 = 1;
+	dyndpRegisterContents.bits.DPL_P3 = 1;
+	dyndpRegisterContents.bits.DPL_P4 = 1;
+	dyndpRegisterContents.bits.DPL_P5 = 1;
+	Write_NRF_Register(DYNPD_ADDRESS, dyndpRegisterContents.byte);
 
 	/* Set the TX address */
-	//Set_TX_Address(0x563412);
 	Set_TX_Address(0x123456);
 
 	Set_RX_P0_Address(0x123456);
@@ -90,6 +105,7 @@ void Send_Test_Message(void)
 	uint8_t statusContent = 0;
 
 	uint8_t registerContent[5];
+	STATUS_REGISTER statusRegisterContents = {.byte = 0x0};
 	uint8_t lengthRead;
 	char debugString[50] = "";
 	uint32_t timeout = 0;
@@ -112,22 +128,22 @@ void Send_Test_Message(void)
 	do
 	{
 		_delay_ms(1);
-		lengthRead = Read_NRF_Register(0x07, registerContent);
+		lengthRead = Read_NRF_Register(STATUS_ADDRESS, &(statusRegisterContents.byte)); /* TODO: use funtion to read status register -> no overflow possible, only one NOP transfer needed, not two */
 
 		if (lengthRead > 1)
 		{
-			sprintf(debugString, "%s\r\n", "read error");
+			sprintf(debugString, "%s\r\n", "Read error");
 			Print_Debug_String(debugString);
 		}
 
-		if ((registerContent[0] & (1<<5)) != 0)
+		if (statusRegisterContent.bits.TX_DS == true)
 		{
 			transmissionFinished = true;
 			sprintf(debugString, "%s\r\n", "TX fin");
 			Print_Debug_String(debugString);
 		}
 
-		if ((registerContent[0] & (1<<4)) != 0)
+		if (statusRegisterContent.bits.MAX_RT == true)
 		{
 			transmissionFinished = true;
 			sprintf(debugString, "%s\r\n", "max ret");
@@ -144,9 +160,12 @@ void Send_Test_Message(void)
 	}
 
 	/* Reset the interrupts */
-	lengthRead = Read_NRF_Register(0x07, registerContent);
+	lengthRead = Read_NRF_Register(STATUS_ADDRESS, statusRegisterContents); /* TODO: use status register read function */
 	statusContent = registerContent[0] & 0x0F;
-	Write_NRF_Register(0x07, statusContent);
+	statusRegisterContents.bits.RX_DR = false;
+	statusRegisterContents.bits.TX_DS = false;
+	statusRegisterContents.bits.MAX_RT = false;
+	Write_NRF_Register(STATUS_ADDRESS, statusContent);
 
 	// TODO: flush FIFO if an error occured
 }