Compare commits

..

No commits in common. "2a822f5bceb702eeec12461116ef78014324a0f5" and "33160a93725f3af3dfd340459b8dbb1ca89b7e01" have entirely different histories.

2 changed files with 5 additions and 12 deletions

View File

@ -1,10 +1,3 @@
/**
* Author : Anatole SCHRAMM-HENRY
* Created the : 30/05/2021
* This is the source file containing the main app.
* It defines all the logic which make the weather station work.
*/
#include "definition.h" #include "definition.h"
#include "BoardConfig.h" #include "BoardConfig.h"
#include "WSPeripherals.h" #include "WSPeripherals.h"
@ -14,7 +7,7 @@ BoardConfig defaultBC;
WSPeripherals WSP(defaultBC); WSPeripherals WSP(defaultBC);
uint8_t sleepSlots(0), rCode(0); uint8_t sleepSlots(0), rCode(0);
WeatherStationDataPacket payload; DataPacket payload;
void setup() void setup()
{ {
@ -94,7 +87,7 @@ void loop()
sleepSlots++; sleepSlots++;
} }
void debugStruct(WeatherStationDataPacket *p) void debugStruct(DataPacket *p)
{ {
Serial.println("##############DATA##############"); Serial.println("##############DATA##############");
Serial.print("ID : "); Serial.print("ID : ");

View File

@ -19,9 +19,9 @@
#define VOLTAGE_DIV_COEFF 1.3125 //(R1 + R2)/R2 #define VOLTAGE_DIV_COEFF 1.3125 //(R1 + R2)/R2
//NRF Radio config part //NRF Radio config part
#define RADIO_CHANNEL 108 //0-125 #define RADIO_CHANNEL 108
#define RADIO_NODE_ADDRESS "WEST1" //Weather Station 1 #define RADIO_NODE_ADDRESS "WEST1" //Weather Station 1
#define RADIO_PA_LEVEL RF24_PA_HIGH //RF24_PA_MIN,RF24_PA_LOW,RF24_PA_HIGH,RF24_PA_MAX #define RADIO_PA_LEVEL RF24_PA_LOW //RF24_PA_MIN,RF24_PA_LOW,RF24_PA_HIGH,RF24_PA_MAX
#define ENABLE_LNA false //true or false #define ENABLE_LNA false //true or false
#define RADIO_DATARATE RF24_250KBPS #define RADIO_DATARATE RF24_250KBPS
@ -58,6 +58,6 @@ typedef struct
float humidity; float humidity;
float compensatedHumidity; float compensatedHumidity;
float htuTemp; float htuTemp;
} __attribute__((__packed__)) WeatherStationDataPacket; } DataPacket __attribute__((__packed__));
#endif //DEFINITION_H #endif //DEFINITION_H