Put send functions into a separate file

weather-sensor/firmware/main.c

@@ -15,13 +15,11 @@
 #include "bme280_interface.h"
 #include "bme280_defs.h"
 #include "pin_programming.h"
-#include "crc.h"
-#include "encryption.h"
+#include "radio.h"
 
 
 
 uint8_t ownId;
-const uint8_t encryptionKey[16] = {0x9e, 0x37, 0x79, 0xb9, 0x9b, 0x97, 0x73, 0xe9, 0xb9, 0x79, 0x37, 0x9e, 0x6b, 0x69, 0x51, 0x56}; /* TODO: use exernal file with the keys */
 uint64_t salt;
 
 char bool_case = 0;
@@ -44,8 +42,6 @@ void Enter_Power_Save_Mode(void);
 void Exit_Power_Save_Mode(void);
 
 
-bool Send_Get_Salt_Message(PACKET * packet, uint64_t salt); //TODO: put into own file
-bool Read_Salt_Message(PACKET * packet, uint64_t * salt);
 
 void Set_Up_Power_Save_Mode(void);
 void Enter_Power_Save_Mode(void);
@@ -64,7 +60,6 @@ ISR(PCINT2_vect)
 int main (void)
 {
 	struct bme280_data sensorData;
-	uint16_t crc;
 	bool saltReceived = false;
 
 	/* Enable the debug LED */
@@ -93,17 +88,11 @@ int main (void)
 	salt |= ownId;
 
 
-	/* TODO: Request a salt from the base station:
-	 * - loop as long as no reply from the base station was received:
-	 *   - send the packet that requests the salt
-	 *   - if no ack is received for the packet go direclty to sleep for 100 ms
-	 *   - if no salt is received within 100 ms send the message again
-	 *   - keep the LED on for the duration to allow the user to see that the device is ready for operation.
-	 */
+	/* Request a salt from the base station */
 	LED_PORT |= (1 << LED_PIN);
 	do
 	{
-		if (Send_Get_Salt_Message(packet, salt) == true)
+		if (Send_Get_Salt_Message(packet, &salt) == true)
 		{
 			memset(messageBuffer, 0x0F, 32);
 			if (NRF24L01_Receive_Message(messageBuffer, 100 /*ms*/) == true)
@@ -144,40 +133,8 @@ int main (void)
 			/* Get measurement and send it */
 			BME280_Get_Measurement(&sensorData);
 
-
-			/* TODO: put the following into a Send_Report function */
-			memset((uint8_t*)packet, 0, PACKET_LENGTH); //Reinitialize the buffer with zeros
-
-			salt &= ~(1ull<<63);
-			packet->salt = salt;
-			packet->payload.reportData.packetIdentifier.elementCount = 3;
-			packet->payload.reportData.packetIdentifier.packetType = PACKET_TYPE_REPORT;
-
-			/* Fill in the payload */
-			packet->payload.reportData.valueTypeTemperature = VALUE_TYPE_TEMPERATURE;
-			packet->payload.reportData.temperature = sensorData.temperature/10;
-			packet->payload.reportData.valueTypePressure = VALUE_TYPE_PRESSURE;
-			packet->payload.reportData.pressure = sensorData.pressure;
-			packet->payload.reportData.valueTypeHumidity = VALUE_TYPE_HUMIDITY;
-			packet->payload.reportData.humidity = sensorData.humidity * 100/1024;
-
-			/* Calculate the CRC */
-			crc = Calculate_Crc(packet->payload.buffer, PACKET_PAYLOAD_BUFFER_LENGTH);
-			packet->crc = crc;
-
-			/* Encrypt the packet */
-			/* TODO: 
-			 * - increment the salt for every packet
-			 * - Receive salt from the base station
-			 */
-			Encrypt((uint32_t*) packet->payload.buffer,
-			        PACKET_PAYLOAD_BUFFER_LENGTH + sizeof(crc),
-			        salt, (uint32_t*) encryptionKey);
-
-			NRF24L01_Send_Message((uint8_t*)packet, PACKET_LENGTH);
-
-			/* Increment salt */
-			salt += (1 << 8);
+			/* Send the report */
+			Send_Report_Message(packet, &salt, &sensorData);
 
 			LED_PORT |= (1 << LED_PIN);
 			_delay_ms(100); /* TODO: only for debugging, remove this later! */
@@ -256,63 +213,3 @@ void Exit_Power_Save_Mode(void)
 	Initialize_SPI(); // reinitalize SPI
 }
 
-bool Send_Get_Salt_Message(PACKET * packet, uint64_t salt) //TODO: put into own file
-{
-	bool success = false;
-	uint16_t crc;
-
-	memset((uint8_t*)packet, 0, PACKET_LENGTH); //Reinitialize the buffer with zeros
-
-	salt &= ~(1ull<<63); /* Set the most significant bit to 0 to indicate a packet from the device to the base station */
-
-	packet->salt = salt;
-	packet->payload.reportData.packetIdentifier.elementCount = 0;
-	packet->payload.reportData.packetIdentifier.packetType = PACKET_TYPE_GET_SALT;
-
-	/* Calculate the CRC */
-	crc = Calculate_Crc(packet->payload.buffer, PACKET_PAYLOAD_BUFFER_LENGTH);
-	packet->crc = crc;
-
-	Encrypt((uint32_t*) packet->payload.buffer,
-	        PACKET_PAYLOAD_BUFFER_LENGTH + sizeof(crc),
-	        salt,
-	        (uint32_t*) encryptionKey);
-
-	success = NRF24L01_Send_Message((uint8_t*)packet, PACKET_LENGTH);
-
-
-	return success;
-}
-
-bool Read_Salt_Message(PACKET * packet, uint64_t * salt)
-{
-	uint16_t crcRemainder = 0xFFFF;
-	uint64_t baseStationSalt = 0x0;
-
-
-	/* TODO: check that the packet originated from the base station by checking the id */
-
-	baseStationSalt = packet->salt;
-	Decrypt((uint32_t*)packet->payload.buffer,
-	        PACKET_PAYLOAD_BUFFER_LENGTH + sizeof(packet->crc),
-	        baseStationSalt,
-	        (uint32_t*) encryptionKey);
-
-	crcRemainder = Calculate_Crc(packet->payload.buffer,
-	                             PACKET_PAYLOAD_BUFFER_LENGTH + sizeof(packet->crc));
-	if (crcRemainder != 0)
-	{
-		return false;
-	}
-
-	if ((packet->payload.saltData.packetIdentifier.packetType != PACKET_TYPE_SALT) ||
-	    (packet->payload.saltData.packetIdentifier.elementCount != 0))
-	{
-		return false;
-	}
-
-	memcpy((uint8_t*)salt, packet->payload.saltData.salt, 7);
-	*salt = (*salt) << 8;
-
-	return true;
-}

weather-sensor/firmware/makefile

@@ -1,5 +1,5 @@
 CFLAGS = -DF_CPU=1000000UL -D BME280_32BIT_ENABLE -I BME280_driver -mmcu=atmega88p -Os -flto -Wall -Wextra -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
-DEPS = spi.h nrf24l01.h nrf24l01_definitions.h bme280_interface.h BME280_driver/bme280.h led.h pin_programming.h crc.h encryption.h
+DEPS = spi.h nrf24l01.h nrf24l01_definitions.h bme280_interface.h BME280_driver/bme280.h led.h pin_programming.h crc.h encryption.h radio.h
 
 all: main.hex
 
@@ -9,7 +9,7 @@ clean:
 	rm -f obj/*.o
 
 flash: main.hex
-	sudo avrdude -c buspirate -b 115200 -P /dev/ttyUSB1 -p m88p -v -U flash:w:main.hex
+	sudo avrdude -c buspirate -b 115200 -P /dev/ttyUSB0 -p m88p -v -U flash:w:main.hex
 
 obj/%.o: %.c $(DEPS)
 	avr-gcc -c $< -o $@ $(CFLAGS)
@@ -17,7 +17,7 @@ obj/%.o: %.c $(DEPS)
 obj/%.o: BME280_driver/%.c $(DEPS)
 	avr-gcc -c $< -o $@ $(CFLAGS)
 
-main: obj/main.o obj/spi.o obj/nrf24l01.o obj/bme280_interface.o obj/bme280.o obj/pin_programming.o obj/crc.o obj/encryption.o
+main: obj/main.o obj/spi.o obj/nrf24l01.o obj/bme280_interface.o obj/bme280.o obj/pin_programming.o obj/crc.o obj/encryption.o obj/radio.o
 	avr-gcc $^ -o $@ $(CFLAGS)
 
 main.hex: main

weather-sensor/firmware/radio.c

@@ -0,0 +1,93 @@
+#include <string.h>
+#include "radio.h"
+#include "encryption.h"
+#include "crc.h"
+
+const uint8_t encryptionKey[16] = {0x9e, 0x37, 0x79, 0xb9, 0x9b, 0x97, 0x73, 0xe9, 0xb9, 0x79, 0x37, 0x9e, 0x6b, 0x69, 0x51, 0x56}; /* TODO: use exernal file with the keys */
+
+bool Send_Message(PACKET * packet, uint64_t * salt);
+
+bool Send_Get_Salt_Message(PACKET * packet, uint64_t * salt) //TODO: put into own file
+{
+	memset((uint8_t*)packet, 0, PACKET_LENGTH); //Reinitialize the buffer with zeros
+
+	packet->payload.reportData.packetIdentifier.elementCount = 0;
+	packet->payload.reportData.packetIdentifier.packetType = PACKET_TYPE_GET_SALT;
+
+	return Send_Message(packet, salt);
+}
+
+bool Send_Report_Message(PACKET * packet, uint64_t * salt, struct bme280_data * sensorData)
+{
+	packet->payload.reportData.packetIdentifier.elementCount = 3;
+	packet->payload.reportData.packetIdentifier.packetType = PACKET_TYPE_REPORT;
+
+	/* Fill in the payload */
+	packet->payload.reportData.valueTypeTemperature = VALUE_TYPE_TEMPERATURE;
+	packet->payload.reportData.temperature = sensorData->temperature/10;
+	packet->payload.reportData.valueTypePressure = VALUE_TYPE_PRESSURE;
+	packet->payload.reportData.pressure = sensorData->pressure;
+	packet->payload.reportData.valueTypeHumidity = VALUE_TYPE_HUMIDITY;
+	packet->payload.reportData.humidity = sensorData->humidity * 100/1024;
+
+	return Send_Message(packet, salt);
+}
+
+bool Send_Message(PACKET * packet, uint64_t * salt)
+{
+	bool success;
+
+	uint16_t crc;
+	(*salt) &= ~(1ull<<63); /* Set the most significant bit to 0 to indicate a packet from the device to the base station */
+
+	packet->salt = *salt;
+
+	/* Calculate the CRC */
+	crc = Calculate_Crc(packet->payload.buffer, PACKET_PAYLOAD_BUFFER_LENGTH);
+	packet->crc = crc;
+
+	Encrypt((uint32_t*) packet->payload.buffer,
+	        PACKET_PAYLOAD_BUFFER_LENGTH + sizeof(crc),
+	        *salt,
+	        (uint32_t*) encryptionKey);
+
+	success = NRF24L01_Send_Message((uint8_t*)packet, PACKET_LENGTH);
+
+	/* Increment salt */
+	(*salt) += (1 << 8);
+
+	return success;
+}
+
+bool Read_Salt_Message(PACKET * packet, uint64_t * salt)
+{
+	uint16_t crcRemainder = 0xFFFF;
+	uint64_t baseStationSalt = 0x0;
+
+
+	/* TODO: check that the packet originated from the base station by checking the id */
+
+	baseStationSalt = packet->salt;
+	Decrypt((uint32_t*)packet->payload.buffer,
+	        PACKET_PAYLOAD_BUFFER_LENGTH + sizeof(packet->crc),
+	        baseStationSalt,
+	        (uint32_t*) encryptionKey);
+
+	crcRemainder = Calculate_Crc(packet->payload.buffer,
+	                             PACKET_PAYLOAD_BUFFER_LENGTH + sizeof(packet->crc));
+	if (crcRemainder != 0)
+	{
+		return false;
+	}
+
+	if ((packet->payload.saltData.packetIdentifier.packetType != PACKET_TYPE_SALT) ||
+	    (packet->payload.saltData.packetIdentifier.elementCount != 0))
+	{
+		return false;
+	}
+
+	memcpy((uint8_t*)salt, packet->payload.saltData.salt, 7);
+	*salt = (*salt) << 8;
+
+	return true;
+}

weather-sensor/firmware/radio.h

@@ -0,0 +1,13 @@
+#ifndef RADIO_H
+#define RADIO_H
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "bme280_defs.h"
+#include "nrf24l01.h"
+
+bool Send_Get_Salt_Message(PACKET * packet, uint64_t * salt); //TODO: put into own file
+bool Read_Salt_Message(PACKET * packet, uint64_t * salt);
+bool Send_Report_Message(PACKET * packet, uint64_t * salt, struct bme280_data * sensorData);
+
+#endif