Move SPI initialization and pin definitions to spi.c

weather-sensor/firmware/main.c

@@ -7,18 +7,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "spi.h"
 #include "nrf24l01.h"
 #include "nrf24l01_definitions.h"
 #include "bme280_interface.h"
 #include "bme280_defs.h"
 
 
-/* SPI: */
-/* TODO: move to spi.h */
-#define SPI_DDR       DDRB
-#define SPI_SCK_PIN   PB5
-#define SPI_MOSI_PIN  PB3
-#define SPI_MISO_PIN  PB4
 
 /* Debug LED: */
 #define LED_DDR   DDRD
@@ -36,7 +31,6 @@ volatile uint8_t interruptCounter;
 volatile uint8_t executionFlag;
 
 
-void Initialize_SPI(void);
 void Enter_Power_Save_Mode(void);
 void Exit_Power_Save_Mode(void);
 
@@ -129,15 +123,6 @@ int main (void)
 	}
 }
 
-void Initialize_SPI(void)
-{
-	/* TODO: move to spi.h */
-	/* Set MOSI and SCK output, all others input */
-	SPI_DDR = (1<<SPI_MOSI_PIN)|(1<<SPI_SCK_PIN);
-	/* Enable SPI, Master, set clock rate fck/16 */
-	SPCR = (1<<SPE)|(1<<MSTR);
-}
-
 void Set_Up_Power_Save_Mode(void)
 {
 	// Disable Brown-Out-Detection by setting the BODLEVEL 2:0 Fuses to 0b111 (should be default)

weather-sensor/firmware/spi.c

@@ -1,5 +1,20 @@
 #include <avr/io.h>
 
+/* Pin Definitions: */
+#define SPI_DDR       DDRB
+#define SPI_SCK_PIN   PB5
+#define SPI_MOSI_PIN  PB3
+#define SPI_MISO_PIN  PB4
+
+
+void Initialize_SPI(void)
+{
+	/* Set MOSI and SCK output, all others input */
+	SPI_DDR = (1<<SPI_MOSI_PIN)|(1<<SPI_SCK_PIN);
+	/* Enable SPI, Master, set clock rate fck/16 */
+	SPCR = (1<<SPE)|(1<<MSTR);
+}
+
 void SPI_Start_Transmission(volatile uint8_t *port, uint8_t pinNumber)
 {
 	*port &= ~(1<<pinNumber);
@@ -14,5 +29,5 @@ uint8_t SPI_Transfer_Byte(uint8_t byteToSend)
 
 void SPI_Stop_Transmission(volatile uint8_t *port, uint8_t pinNumber)
 {
-	*port |= (1<<pinNumber); // Stop the transmission
+	*port |= (1<<pinNumber);
 }

weather-sensor/firmware/spi.h

@@ -1,6 +1,7 @@
 #ifndef SPI_H
 #define SPI_H
 
+void Initialize_SPI(void);
 void SPI_Start_Transmission(volatile uint8_t *port, uint8_t pinNumber);
 uint8_t SPI_Transfer_Byte(uint8_t byte);
 void SPI_Stop_Transmission(volatile uint8_t *port, uint8_t pinNumber);