Use spi functions

weather-sensor/firmware/nrf24l01.c

@@ -220,6 +220,7 @@ uint8_t Read_NRF_Status_Register(void)
 
 uint8_t Read_NRF_Register(uint8_t address, uint8_t * registerContents)
 {
+	/* TODO: simplify this function, as the registers with more than one byte are accessed with other functions */
 	uint8_t numberOfBytes = 0;
 
 	if ((address == 0x0A) ||
@@ -291,69 +292,53 @@ void Send_TX_Flush_Command(void)
 
 void Write_Message_To_TX_FIFO(uint8_t length, uint8_t * buffer)
 {
-	NRF_CSN_PORT &= ~(1 << NRF_CSN_PIN); // Start the transmission
+	SPI_Start_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 
 	/* Issue the write command: */
-	SPDR = 0xA0;
-
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+	SPI_Transfer_Byte(0xA0);
 
 	/* Write the data bytes */
 	for (uint8_t i = 0; i < length; i++)
 	{
-		SPDR = buffer[i];
-		while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+		SPI_Transfer_Byte(buffer[i]);
 	}
 
-	NRF_CSN_PORT |= (1 << NRF_CSN_PIN); // Stop the transmission
+	SPI_Stop_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 }
 
 void Set_TX_Address(uint32_t txAddress)
 {
 	uint8_t * buffer = (uint8_t*) &txAddress;
-	/* First write the write command with the address */
-	NRF_CSN_PORT &= ~(1 << NRF_CSN_PIN); // Start the transmission
-	SPDR = 0x10 | 0x20;
-	
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
 
+	SPI_Start_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
+
+	SPI_Transfer_Byte(TX_ADDR_ADDRESS | 0x20);
 	/* Write the data byte */
 	for (uint8_t i = 0; i < 4; i ++)
 	{
-		SPDR = buffer[i];
-
-		while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+		SPI_Transfer_Byte(buffer[i]);
 	}
+	SPI_Transfer_Byte(0x0);
 
-	SPDR = 0x0;
-
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
-
-	NRF_CSN_PORT |= (1 << NRF_CSN_PIN); // Stop the transmission
+	SPI_Stop_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 }
 
 void Set_RX_P0_Address(uint32_t rxAddress)
 {
 	uint8_t * buffer = (uint8_t*) &rxAddress;
-	/* First write the write command with the address */
-	NRF_CSN_PORT &= ~(1 << NRF_CSN_PIN); // Start the transmission
-	SPDR = 0x0A | 0x20;
-	
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+
+	SPI_Start_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
+
+	SPI_Transfer_Byte(RX_ADDR_P0_ADDRESS | 0x20);
 
 	/* Write the data byte */
 	for (uint8_t i = 0; i < 4; i ++)
 	{
-		SPDR = buffer[i];
-
-		while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+		SPI_Transfer_Byte(buffer[i]);
 	}
+	SPI_Transfer_Byte(0x0);
 
-	SPDR = 0x0;
-
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
-
-	NRF_CSN_PORT |= (1 << NRF_CSN_PIN); // Stop the transmission
+	SPI_Stop_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 }
 
-//TODO: only write the used bytes into the address registers
+//TODO: only write the used bytes into the address registers & add generic write functions