Use spi functions

weather-sensor/firmware/nrf24l01.c

@@ -210,14 +210,12 @@ void Print_Register_Contents(uint8_t address)
 
 uint8_t Read_NRF_Status_Register(void)
 {
-	NRF_CSN_PORT &= ~(1 << NRF_CSN_PIN); // Start the transmission
-	SPDR = 0XFF;
-
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+	uint8_t registerContents;
 
-	NRF_CSN_PORT |= (1 << NRF_CSN_PIN); // Stop the transmission
-
-	return SPDR;
+	SPI_Start_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
+	registerContents = SPI_Transfer_Byte(0x00);
+	SPI_Stop_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
+	return registerContents;
 }
 
 uint8_t Read_NRF_Register(uint8_t address, uint8_t * registerContents)
@@ -236,68 +234,57 @@ uint8_t Read_NRF_Register(uint8_t address, uint8_t * registerContents)
 	}
 
 	/* First write the address */
-	NRF_CSN_PORT &= ~(1 << NRF_CSN_PIN); // Start the transmission
-	SPDR = address;
+	SPI_Start_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+
+	SPI_Transfer_Byte(address);
 
 	/* Read the register bytes */
 	for (uint8_t i = 0; i < numberOfBytes; i++)
 	{
 		/* Write dummy data to shift in the register content */
-		SPDR = 0x0;
-		while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
-		registerContents[i] = SPDR;
+		registerContents[i] = SPI_Transfer_Byte(0x0);
 	}
 
-	NRF_CSN_PORT |= (1 << NRF_CSN_PIN); // Stop the transmission
+	SPI_Stop_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 
-	// TODO: registers with more than one byte
 	return numberOfBytes;
 }
 
 void Write_NRF_Register(uint8_t address, uint8_t registerContents)
 {
 	/* First write the write command with the address */
-	NRF_CSN_PORT &= ~(1 << NRF_CSN_PIN); // Start the transmission
-	SPDR = address | 0x20;
-	
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+	SPI_Start_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 
-	/* Write the data byte */
-	SPDR = registerContents;
+	SPI_Transfer_Byte(address | 0x20);
 
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+	/* Write the data byte */
+	SPI_Transfer_Byte(registerContents);
 
-	NRF_CSN_PORT |= (1 << NRF_CSN_PIN); // Stop the transmission
+	SPI_Stop_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 }
 
 // TODO: clean up functions
 void Send_Activate_Command(void)
 {
 	/* First write the write command with the address */
-	NRF_CSN_PORT &= ~(1 << NRF_CSN_PIN); // Start the transmission
-	SPDR = 0x50;
-	
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+	SPI_Start_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
+	SPI_Transfer_Byte(0x50);
 
 	/* Write the data byte */
-	SPDR = 0x73;
-
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+	SPI_Transfer_Byte(0x73);
 
-	NRF_CSN_PORT |= (1 << NRF_CSN_PIN); // Stop the transmission
+	SPI_Stop_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 }
 
 void Send_TX_Flush_Command(void)
 {
 	/* First write the write command with the address */
-	NRF_CSN_PORT &= ~(1 << NRF_CSN_PIN); // Start the transmission
-	SPDR = 0xE1;
-	
-	while(!(SPSR & (1<<SPIF))); // Wait for transmission complete
+	SPI_Start_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 
-	NRF_CSN_PORT |= (1 << NRF_CSN_PIN); // Stop the transmission
+	SPI_Transfer_Byte(0xE1);
+
+	SPI_Stop_Transmission(&NRF_CSN_PORT, NRF_CSN_PIN);
 }