ENGO150/RadiationMapping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serializing data in json

Browse Source
This commit is contained in:
Václav Šmejkal 2025-01-01 14:11:29 +01:00 committed by GitHub
parent 0a762ade5d
commit e73f6f5e6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
RadiationMapper.ino
View File

@ -18,13 +18,20 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include <list> #include <list>
#include <DHT.h>
#include <DHT_U.h>
#include <ArduinoJson.h>
#include "display.hpp" #include "display.hpp"
#define INPUT_PIN 10 //VIN PIN FOR GEIGER COUNTER #define INPUT_PIN 10 //VIN PIN FOR GEIGER COUNTER
#define MEASUREMENT_TIME_MS 60000 //MINUTE #define MEASUREMENT_TIME_MS 60000 //MINUTE
#define CALIBRATION_FACTOR 0.00332 //CONSTANT FOR CONVERTING J305 CPM TO uSv/h #define SEND_TIME_MS 1000 //HOW OFTEN TO SEND DATA
//#define CALIBRATION_FACTOR 0.00332 //CONSTANT FOR CONVERTING J305 CPM TO uSv/h
std::list<unsigned long> counts; //COUNTS IN LAST MINUTE (OR MEASUREMENT_TIME_MS IF MODIFIED) std::list<unsigned long> counts; //COUNTS IN LAST MINUTE (OR MEASUREMENT_TIME_MS IF MODIFIED)
unsigned long last_send_time = 0;
//CALLBACK WHEN RADIATION PARTICLE IS DETECTED //CALLBACK WHEN RADIATION PARTICLE IS DETECTED
void IRAM_ATTR increment_counts() //TODO: Possible noise void IRAM_ATTR increment_counts() //TODO: Possible noise
@ -32,10 +39,20 @@ void IRAM_ATTR increment_counts() //TODO: Possible noise
counts.push_back(millis()); //APPEND CURRENT TIME TO LIST counts counts.push_back(millis()); //APPEND CURRENT TIME TO LIST counts
} }
DHT_Unified dht(9, DHT11);
void setup() void setup()
{ {
//INIT LCD Serial.begin(9600);
display::begin();
//INIT DHT11
dht.begin();
sensor_t sensor;
dht.temperature().getSensor(&sensor);
dht.humidity().getSensor(&sensor);
/*//INIT LCD
display::begin();*/
//INIT PINS //INIT PINS
pinMode(INPUT_PIN, INPUT); pinMode(INPUT_PIN, INPUT);
@ -46,7 +63,7 @@ int last_counts = -1;
void loop() void loop()
{ {
unsigned long current_millis = millis(); //CURRENT TIME unsigned long current_millis = millis(); //CURRENT TIME
int current_counts = 0; //int current_counts = 0;
//REMOVE COUNTS OLDER THAN MEASUREMENT_TIME_MS //REMOVE COUNTS OLDER THAN MEASUREMENT_TIME_MS
counts.remove_if([current_millis](unsigned long particle) //haha, *lambda* (cries in pure-C) counts.remove_if([current_millis](unsigned long particle) //haha, *lambda* (cries in pure-C)
@ -54,12 +71,33 @@ void loop()
return (current_millis - particle >= MEASUREMENT_TIME_MS); return (current_millis - particle >= MEASUREMENT_TIME_MS);
}); });
//COUNT RECENT /*//COUNT RECENT
current_counts = counts.size(); current_counts = counts.size();
if (last_counts != current_counts) //PRINT CPM IF CHANGED if (last_counts != current_counts) //PRINT CPM IF CHANGED
{ {
last_counts = current_counts; last_counts = current_counts;
display::print(String(current_counts) + " CPM", String(current_counts * CALIBRATION_FACTOR) + " uSv/h"); //TODO: Replace with OLED display::print(String(current_counts) + " CPM", String(current_counts * CALIBRATION_FACTOR) + " uSv/h"); //TODO: Replace with OLED
}*/
//SEND CURRENT STATE IN JSON
if (current_millis - last_send_time >= SEND_TIME_MS)
{
JsonDocument doc;
sensors_event_t event;
//SERIALIZE
doc["cpm"] = counts.size();
dht.temperature().getEvent(&event);
doc["temperature"] = event.temperature;
dht.humidity().getEvent(&event);
doc["humidity"] = event.relative_humidity;
serializeJson(doc, Serial); //SEND
Serial.println(); //TODO: Implement WiFi
last_send_time = current_millis;
} }
} }