Generate an ID according to the dip switches

The ID is used as the last byte of the RX address. It is also sent as a
part of the data packet to allow assigning the sending station to a
packet.

weather-sensor/firmware/main.c

@@ -14,10 +14,11 @@
 #include "nrf24l01_definitions.h"
 #include "bme280_interface.h"
 #include "bme280_defs.h"
+#include "pin_programming.h"
 
 
 
-
+uint8_t ownId;
 
 char bool_case = 0;
 int timer = 0;
@@ -63,6 +64,7 @@ ISR(PCINT2_vect)
 int main (void)
 {
 	struct bme280_data sensorData;
+	struct DATA_PACKET dataPacket;
 //	uint8_t testRegisterContent = 0x0A;
 //	uint8_t registerContent[5];
 //	char registerContentString[30];
@@ -71,6 +73,10 @@ int main (void)
 	/* Enable the debug LED */
 	LED_DDR |= (1 << LED_PIN);
 
+	/* Get the own ID */
+	Configure_Pin_Programming_Pins();
+	ownId = Get_Own_Identifier();
+
 	/* Initialize the SPI */
 	Initialize_SPI();
 
@@ -79,7 +85,7 @@ int main (void)
 	// The NRF24L01 is now in the mode Standby-I.
 
 	/* Configure the transmission parameters (Enhanced ShockBurst)*/
-	Configure_Transmission();
+	Configure_Transmission(ownId);
 
 	/* Initialize the BME280 */
 	Initialize_BME280();
@@ -105,7 +111,12 @@ int main (void)
 
 			/* Get measurement and send it */
 			BME280_Get_Measurement(&sensorData);
-			NRF24L01_Send_Message((uint8_t*)&sensorData, sizeof(sensorData));
+
+			dataPacket.senderId = ownId;
+			dataPacket.temperature = sensorData.temperature;
+			dataPacket.pressure = sensorData.pressure;
+			dataPacket.humidity = sensorData.humidity;
+			NRF24L01_Send_Message((uint8_t*)&dataPacket, sizeof(dataPacket));
 
 			_delay_ms(100); /* TODO: only for debugging, remove this later! */
 			LED_PORT &= ~(1 << LED_PIN);

weather-sensor/firmware/makefile

@@ -7,8 +7,8 @@ clean:
 flash: main.hex
 	sudo avrdude -c buspirate -b 115200 -P /dev/ttyUSB1 -p m88p -v -U flash:w:main.hex
 
-main: main.c spi.c spi.h nrf24l01.c nrf24l01.h nrf24l01_definitions.h bme280_interface.c bme280_interface.h BME280_driver/bme280.c BME280_driver/bme280.h led.h
-	avr-gcc main.c spi.c nrf24l01.c bme280_interface.c BME280_driver/bme280.c -I BME280_driver -o main -mmcu=atmega88p -Os -Wall -Wextra -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -DF_CPU=1000000UL -D BME280_32BIT_ENABLE
+main: main.c spi.c spi.h nrf24l01.c nrf24l01.h nrf24l01_definitions.h bme280_interface.c bme280_interface.h BME280_driver/bme280.c BME280_driver/bme280.h led.h pin_programming.c pin_programming.h
+	avr-gcc main.c spi.c nrf24l01.c bme280_interface.c BME280_driver/bme280.c pin_programming.c -I BME280_driver -o main -mmcu=atmega88p -Os -Wall -Wextra -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -DF_CPU=1000000UL -D BME280_32BIT_ENABLE
 
 main.hex: main
 	avr-objcopy -O ihex -R .eeprom main main.hex

weather-sensor/firmware/nrf24l01.c

@@ -59,7 +59,7 @@ void Set_NRF24L01_Pins(void)
 	NRF_IRQ_PORT |= (1 << NRF_IRQ_PORT); // Enable the pullup for the pin
 }
 
-void Configure_Transmission(void)
+void Configure_Transmission(uint8_t moduleId)
 {
 	FEATURE_REGISTER featureRegisterContents = {.byte = 0x0};
 	DYNPD_REGISTER dyndpRegisterContents = {.byte = 0x0};
@@ -102,7 +102,7 @@ void Configure_Transmission(void)
 	setupRetrRegisterContents.bits.ARD = 0xF;
 	Write_NRF_Register(SETUP_RETR_ADDRESS, setupRetrRegisterContents.byte);
 
-	/* set dynamic payload length for all data pipes */
+	/* set dynamic payload length for all data pipes */ // TODO: only pipe 0 is currently in use -> don't set the other values
 	dyndpRegisterContents.bits.DPL_P0 = 1;
 	dyndpRegisterContents.bits.DPL_P1 = 1;
 	dyndpRegisterContents.bits.DPL_P2 = 1;
@@ -114,6 +114,7 @@ void Configure_Transmission(void)
 	/* Set the TX address */
 	Set_TX_Address(txAddress, MAX_ADDRESS_LENGTH);
 
+	rx0Address[4] = moduleId; // The last byte of the address corresponds to the Id set by the pin programming
 	Set_RX_P0_Address(rx0Address, MAX_ADDRESS_LENGTH);
 
 

weather-sensor/firmware/nrf24l01.h

@@ -19,7 +19,7 @@
 
 void Initialize_NRF24L01(void);
 void Set_NRF24L01_Pins(void);
-void Configure_Transmission(void);
+void Configure_Transmission(uint8_t moduleId);
 uint8_t Read_NRF_Status_Register(void);
 uint8_t Read_NRF_Register(uint8_t address, uint8_t * registerContents);
 void Write_NRF_Register(uint8_t address, uint8_t registerContents);
@@ -30,4 +30,12 @@ void Write_Message_To_TX_FIFO(uint8_t length, uint8_t * buffer);
 void Set_TX_Address(uint8_t * txAddress, uint8_t length);
 void Set_RX_P0_Address(uint8_t * rxAddress, uint8_t length);
 
+typedef struct __attribute__ ((packed)) DATA_PACKET
+{
+	uint8_t senderId;
+	uint32_t pressure;
+	int32_t temperature;
+	uint32_t humidity;
+} DATA_PACKET;
+
 #endif

weather-sensor/firmware/pin_programming.c

@@ -0,0 +1,54 @@
+#include <avr/io.h>
+#include <stdint.h>
+
+#include "pin_programming.h"
+
+/* Pin definitions */
+
+
+#define PIN_PROG_1_DDR     DDRB
+#define PIN_PROG_1_PORT    PORTB
+#define PIN_PROG_1_PIN     PB6
+#define PIN_PROG_1_PORTIN  PINB
+
+#define PIN_PROG_2_DDR     DDRB
+#define PIN_PROG_2_PORT    PORTB
+#define PIN_PROG_2_PIN     PB7
+#define PIN_PROG_2_PORTIN  PINB
+
+#define PIN_PROG_3_DDR     DDRD
+#define PIN_PROG_3_PORT    PORTD
+#define PIN_PROG_3_PIN     PD4
+#define PIN_PROG_3_PORTIN  PIND
+
+
+
+void Configure_Pin_Programming_Pins(void)
+{
+	/* Set pins as input */
+	PIN_PROG_1_DDR &= ~(1 << PIN_PROG_1_PIN);
+	PIN_PROG_2_DDR &= ~(1 << PIN_PROG_2_PIN);
+	PIN_PROG_3_DDR &= ~(1 << PIN_PROG_3_PIN);
+
+	/* Enable pull-ups */ // TODO: enable once the boards have been fixed!
+	PIN_PROG_1_PORT |= (1 << PIN_PROG_1_PIN);
+	PIN_PROG_2_PORT |= (1 << PIN_PROG_2_PIN);
+	PIN_PROG_3_PORT |= (1 << PIN_PROG_3_PIN);
+}
+
+uint8_t Get_Own_Identifier(void)
+{
+	/* The upper four bits of the ID are the module ID while the lower four bits are the serial
+	 * number set by the pin programming.
+	 * Switch 3 corresponds to bit 0
+	 * Switch 2 corresponds to bit 1
+	 * Switch 1 corresponds to bit 2
+	 */
+	uint8_t id = (MODULE_ID_SENSOR << 4);
+
+	id |= ((((PIN_PROG_3_PORTIN & (1 << PIN_PROG_3_PIN)) == 0) << 0) | \
+	       (((PIN_PROG_2_PORTIN & (1 << PIN_PROG_2_PIN)) == 0) << 1) | \
+	       (((PIN_PROG_1_PORTIN & (1 << PIN_PROG_1_PIN)) == 0) << 2));
+
+	return id;
+}

weather-sensor/firmware/pin_programming.h

@@ -0,0 +1,13 @@
+#ifndef PIN_PROGRAMMING_H
+#define PIN_PROGRAMMING_H
+
+typedef enum
+{
+	MODULE_ID_BASE_STATION = 1,
+	MODULE_ID_DISPLAY      = 2,
+	MODULE_ID_SENSOR       = 3
+} MODULE_ID;
+
+void Configure_Pin_Programming_Pins(void);
+uint8_t Get_Own_Identifier(void);
+#endif