Change the MCU to the Atmega88

The pin definitions are updated and the uart debug interface is removed
as it is not present on the actual board.

weather-sensor/firmware/bme280_interface.c

@@ -5,12 +5,6 @@
 #include "bme280.h"
 #include "bme280_interface.h"
 
-/* for debugging */
-#include "uart_debug.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
 
 void user_delay_ms(uint32_t period);
 int8_t user_spi_read(uint8_t dev_id, uint8_t reg_addr, uint8_t *reg_data, uint16_t len);
@@ -25,7 +19,6 @@ int8_t Initialize_BME280(void)
 {
 	int8_t rslt = BME280_OK;
 	uint8_t settings_sel;
-	char debugString[20] = "";
 
 
 	/* Setup the SPI interface */
@@ -55,9 +48,6 @@ int8_t Initialize_BME280(void)
 	/* calculate minimum delay required between consecutive measurments */
 	req_delay = bme280_cal_meas_delay(&deviceStructure.settings);
 
-	sprintf(debugString, "req delay: %ld\r\n", req_delay);
-	Print_Debug_String(debugString);
-
 	return rslt;
 }
 

weather-sensor/firmware/bme280_interface.h

@@ -7,7 +7,7 @@
 /* AVR I/O pin definionts */
 #define BME_CSN_DDR   DDRB
 #define BME_CSN_PORT  PORTB
-#define BME_CSN_PIN   PB6
+#define BME_CSN_PIN   PB2
 
 int8_t Initialize_BME280(void);
 void BME280_Get_Measurement(struct bme280_data * data);

weather-sensor/firmware/main.c

@@ -9,7 +9,6 @@
 #include "nrf24l01_definitions.h"
 #include "bme280_interface.h"
 #include "bme280_defs.h"
-#include "uart_debug.h"
 
 //#define LED_DDR     DDRB        //DDRA, DDRB...
 //#define LED_PORT    PORTB       //PORTA, PORTB...
@@ -17,20 +16,11 @@
 //#define time_off    8
 
 /* SPI: */
+/* TODO: move to spi.h */
 #define SPI_DDR       DDRB
-#define SPI_SCK_PIN   PB1
-#define SPI_MOSI_PIN  PB2
-#define SPI_MISO_PIN  PB3
-
-/* NRF24L01 */
-
-
-
-/*
- * CS: pin 9
- * CE: pin 8
- * IRQ: pin 7
- */
+#define SPI_SCK_PIN   PB5
+#define SPI_MOSI_PIN  PB3
+#define SPI_MISO_PIN  PB4
 
 
 
@@ -43,18 +33,12 @@ void Initialize_SPI(void);
 
 int main (void)
 {
-	char debugString[50] = "";
 	struct bme280_data sensorData;
 //	uint8_t testRegisterContent = 0x0A;
 //	uint8_t registerContent[5];
 //	char registerContentString[30];
 //	uint8_t lengthRead;
 
-	/* Set baud rate */
-	Initialize_UART(51);
-
-	sprintf(debugString, "%s\r\n", "Program start");
-	Print_Debug_String(debugString);
 
 	/* Initialize the SPI */
 	Initialize_SPI();
@@ -70,19 +54,6 @@ int main (void)
 	Initialize_BME280();
 
 
-#if 0
-	/* Test the BME280 by reading the ID */
-	uint8_t id = Read_BME280_Register(0xD0);
-	sprintf(debugString, "ID: 0x%x\r\n", id);
-	Print_Debug_String(debugString);
-#endif
-
-
-
-
-
-//	sprintf(debugString, "%s\r\n", "program end");
-//	Print_Debug_String(debugString);
 
 	while(1)
 	{

weather-sensor/firmware/makefile

@@ -5,10 +5,10 @@ clean:
 	rm -f main
 
 flash: main.hex
-	sudo avrdude -c avr109 -b 57600 -P /dev/ttyACM0 -p m32u4 -v -U flash:w:main.hex
+	sudo avrdude -c buspirate -b 115200 -P /dev/ttyUSB0 -p m88p -v -U flash:w:main.hex
 
-main: main.c spi.c spi.h nrf24l01.c nrf24l01.h nrf24l01_definitions.h uart_debug.c uart_debug.h bme280_interface.c bme280_interface.h BME280_driver/bme280.c BME280_driver/bme280.h
-	avr-gcc main.c spi.c nrf24l01.c bme280_interface.c BME280_driver/bme280.c uart_debug.c  -I BME280_driver -o main -mmcu=atmega32u4 -Os -Wall -Wextra -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -DF_CPU=8000000UL -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
+	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.hex: main
 	avr-objcopy -O ihex -R .eeprom main main.hex

weather-sensor/firmware/nrf24l01.c

@@ -7,7 +7,6 @@
 #include "spi.h"
 #include "nrf24l01.h"
 #include "nrf24l01_definitions.h"
-#include "uart_debug.h"
 
 /* TODO
  * - Build a state machine that tracks the mode the NRF is set to
@@ -112,7 +111,6 @@ void NRF24L01_Send_Message(uint8_t *buffer, uint8_t length)
 	bool transmissionFinished = false;
 
 	STATUS_REGISTER statusRegisterContents = {.byte = 0x0};
-	char debugString[50] = "";
 	uint32_t timeout = 0;
 	/* TODO:
 	 * - if needed: PRIM_RX = 0
@@ -137,8 +135,6 @@ void NRF24L01_Send_Message(uint8_t *buffer, uint8_t length)
 	NRF_CE_PORT &= ~(1 << NRF_CE_PIN);
 
 
-	sprintf(debugString, "-\r\n");
-	Print_Debug_String(debugString);
 	do
 	{
 		_delay_ms(1);
@@ -147,15 +143,11 @@ void NRF24L01_Send_Message(uint8_t *buffer, uint8_t length)
 		if (statusRegisterContents.bits.TX_DS == 1)
 		{
 			transmissionFinished = true;
-			sprintf(debugString, "%s\r\n", "TX fin");
-			Print_Debug_String(debugString);
 		}
 
 		if (statusRegisterContents.bits.MAX_RT == 1)
 		{
 			transmissionFinished = true; //TODO: indicate failure
-			sprintf(debugString, "%s\r\n", "max ret");
-			Print_Debug_String(debugString);
 
 			Send_TX_Flush_Command(); /* Remove the packet from the TX FIFO as it is not done automatically */
 		}
@@ -163,12 +155,6 @@ void NRF24L01_Send_Message(uint8_t *buffer, uint8_t length)
 		timeout ++; // TODO: this should work without the time out, as MAX_RT should be triggered if no ACK is received
 	} while ((transmissionFinished == false) && (timeout < 0xFF));
 
-	if (timeout >= 0xFF)
-	{
-			sprintf(debugString, "%s\r\n", "timeout");
-			Print_Debug_String(debugString);
-	}
-
 	/* Reset the interrupts */
 	statusRegisterContents.byte = Read_NRF_Status_Register();
 	statusRegisterContents.bits.TX_DS = 1;
@@ -180,7 +166,6 @@ void Print_Register_Contents(uint8_t address)
 {
 	uint8_t registerContent[5];
 	uint8_t lengthRead;
-	char debugString[50] = "";
 	char registerContentString[30];
 
 
@@ -191,8 +176,6 @@ void Print_Register_Contents(uint8_t address)
 	{
 		sprintf(registerContentString, "%s0x%x ", registerContentString, registerContent[i]);
 	}
-	sprintf(debugString, "%s\r\n", registerContentString);
-	Print_Debug_String(debugString);
 }
 
 

weather-sensor/firmware/nrf24l01.h

@@ -4,13 +4,13 @@
 
 
 /* AVR I/O pin definionts */
-#define NRF_CE_DDR   DDRB
-#define NRF_CE_PORT  PORTB
-#define NRF_CE_PIN   PB4
+#define NRF_CE_DDR   DDRD
+#define NRF_CE_PORT  PORTD
+#define NRF_CE_PIN   PB7
 
-#define NRF_CSN_DDR   DDRB
-#define NRF_CSN_PORT  PORTB
-#define NRF_CSN_PIN   PB5
+#define NRF_CSN_DDR   DDRD
+#define NRF_CSN_PORT  PORTD
+#define NRF_CSN_PIN   PB6
 
 void Initialize_NRF24L01(void);
 void Configure_Transmission(void);

weather-sensor/firmware/uart_debug.c

@@ -1,23 +0,0 @@
-#include <avr/io.h>
-#include <string.h>
-
-#include "uart_debug.h"
-
-void Initialize_UART(uint16_t baudRate)
-{
-	UBRR1H = (unsigned char)(baudRate>>8);
-	UBRR1L = (unsigned char)baudRate;
-	/* Enable receiver and transmitter */
-	UCSR1B = (1<<RXEN1)|(1<<TXEN1);
-	/* Set frame format: 8data, 2stop bit */
-	UCSR1C = (1<<USBS1)|(3<<UCSZ10);
-}
-
-void Print_Debug_String(char * debugString)
-{
-	for (uint8_t i = 0; i < strlen(debugString); i++)
-	{
-		while ( !( UCSR1A & (1<<UDRE1)));
-		UDR1 = debugString[i];
-	}
-}

weather-sensor/firmware/uart_debug.h

@@ -1,7 +0,0 @@
-#ifndef UART_DEBUG_C
-#define UART_DEBUG_C
-
-void Initialize_UART(uint16_t baudRate);
-void Print_Debug_String(char * debugString);
-
-#endif