ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-02-16 10:58:32 -05:00
Code Issues 9 Packages Projects Releases Wiki Activity

- Add GPS support

Browse Source 
- Reduce memory size of sketch
This commit is contained in:
Chris Kaczor
2021-01-22 23:04:55 +00:00
parent 3206ef4ee7
commit a61032f756
2 changed files with 122 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Weather/Arduino/SwitchDoc/.vscode/c_cpp_properties.json vendored
View File

@@ -17,6 +17,7 @@
"/home/ckaczor/Arduino/libraries/Adafruit_BMP280_Library", "/home/ckaczor/Arduino/libraries/Adafruit_BMP280_Library",
"/home/ckaczor/Arduino/libraries/Adafruit_TSL2591_Library", "/home/ckaczor/Arduino/libraries/Adafruit_TSL2591_Library",
"/home/ckaczor/Arduino/libraries/Adafruit_SHT31", "/home/ckaczor/Arduino/libraries/Adafruit_SHT31",
"/home/ckaczor/Arduino/libraries/Adafruit_GPS_Library/src",
"/home/ckaczor/Arduino/libraries/SparkFun_AS3935_Lightning_Detector_Arduino_Library/src" "/home/ckaczor/Arduino/libraries/SparkFun_AS3935_Lightning_Detector_Arduino_Library/src"
], ],
"browse": { "browse": {

155
Weather/Arduino/SwitchDoc/SwitchDoc.ino
View File

@@ -20,10 +20,15 @@ Adafruit_BMP280 bmp280;
#include "Adafruit_TSL2591.h" #include "Adafruit_TSL2591.h"
Adafruit_TSL2591 tsl2591 = Adafruit_TSL2591(); Adafruit_TSL2591 tsl2591 = Adafruit_TSL2591();
elapsedMillis timeElapsed; // SHT31 Temp/Humidity sensor
#include "Adafruit_SHT31.h"
Adafruit_SHT31 sht31 = Adafruit_SHT31();
bool bmp280_Found; // GPS board
bool tsl2591_Found; #include <Adafruit_GPS.h>
Adafruit_GPS GPS(&Wire);
elapsedMillis timeElapsed;
void setup() void setup()
{ {
@@ -31,9 +36,6 @@ void setup()
Serial.println("Board starting"); Serial.println("Board starting");
bmp280_Found = false;
tsl2591_Found = false;
randomSeed(analogRead(0)); randomSeed(analogRead(0));
weatherStation.setWindMode(SDL_MODE_SAMPLE, 5.0); weatherStation.setWindMode(SDL_MODE_SAMPLE, 5.0);
@@ -42,19 +44,26 @@ void setup()
char buffer[50]; char buffer[50];
bmp280_Found = bmp280.begin(); bmp280.begin();
sprintf(buffer, "BMP280 present: %s", bmp280_Found ? "true" : "false"); tsl2591.begin();
Serial.println(buffer); tsl2591.setGain(TSL2591_GAIN_LOW);
tsl2591.setTiming(TSL2591_INTEGRATIONTIME_100MS);
tsl2591_Found = tsl2591.begin(); sht31.begin(0x44);
sprintf(buffer, "TSL2591 present: %s", tsl2591_Found ? "true" : "false"); GPS.begin(0x10);
Serial.println(buffer); GPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCGGA);
GPS.sendCommand(PMTK_SET_NMEA_UPDATE_1HZ);
} }
void loop() void loop()
{ {
char c = GPS.read();
if (GPS.newNMEAreceived())
GPS.parse(GPS.lastNMEA());
if (timeElapsed > ReadInterval) if (timeElapsed > ReadInterval)
{ {
timeElapsed = 0; timeElapsed = 0;
@@ -66,22 +75,22 @@ void loop()
float bmp280_Temperature = 0.0; float bmp280_Temperature = 0.0;
float bmp280_Pressure = 0.0; float bmp280_Pressure = 0.0;
if (bmp280_Found) bmp280_Pressure = bmp280.readPressure();
{ bmp280_Temperature = bmp280.readTemperature();
bmp280_Pressure = bmp280.readPressure();
bmp280_Temperature = bmp280.readTemperature();
}
uint32_t tsl2591_Luminosity = 0; uint32_t tsl2591_Luminosity = 0;
uint16_t tsl2591_IR = 0; uint16_t tsl2591_IR = 0;
uint16_t tsl2591_Full = 0; uint16_t tsl2591_Full = 0;
if (tsl2591_Found) tsl2591_Luminosity = tsl2591.getFullLuminosity();
{ tsl2591_IR = tsl2591_Luminosity >> 16;
tsl2591_Luminosity = tsl2591.getFullLuminosity(); tsl2591_Full = tsl2591_Luminosity & 0xFFFF;
tsl2591_IR = tsl2591_Luminosity >> 16;
tsl2591_Full = tsl2591_Luminosity & 0xFFFF; float sht31_Temperature = 0.0;
} float sht31_Humidity = 0.0;
sht31_Temperature = sht31.readTemperature();
sht31_Humidity = sht31.readHumidity();
char returnString[200]; char returnString[200];
returnString[0] = '\0'; returnString[0] = '\0';
@@ -89,57 +98,135 @@ void loop()
char tempString[15]; char tempString[15];
tempString[0] = '\0'; tempString[0] = '\0';
strcat(returnString, "wind_speed="); strcat(returnString, "ws=");
dtostrf(currentWindSpeed, 0, 2, tempString); dtostrf(currentWindSpeed, 0, 2, tempString);
strcat(returnString, tempString); strcat(returnString, tempString);
strcat(returnString, ","); strcat(returnString, ",");
tempString[0] = '\0'; tempString[0] = '\0';
strcat(returnString, "wind_gust="); strcat(returnString, "wg=");
dtostrf(currentWindGust, 0, 2, tempString); dtostrf(currentWindGust, 0, 2, tempString);
strcat(returnString, tempString); strcat(returnString, tempString);
strcat(returnString, ","); strcat(returnString, ",");
tempString[0] = '\0'; tempString[0] = '\0';
strcat(returnString, "wind_dir="); strcat(returnString, "wd=");
dtostrf(weatherStation.current_wind_direction(), 0, 2, tempString); dtostrf(weatherStation.current_wind_direction(), 0, 2, tempString);
strcat(returnString, tempString); strcat(returnString, tempString);
strcat(returnString, ","); strcat(returnString, ",");
tempString[0] = '\0'; tempString[0] = '\0';
strcat(returnString, "rain="); strcat(returnString, "r=");
dtostrf(currentRain, 0, 2, tempString); dtostrf(currentRain, 0, 2, tempString);
strcat(returnString, tempString); strcat(returnString, tempString);
strcat(returnString, ","); strcat(returnString, ",");
tempString[0] = '\0'; tempString[0] = '\0';
strcat(returnString, "internal_temp="); strcat(returnString, "bt=");
dtostrf(bmp280_Temperature, 0, 2, tempString); dtostrf(bmp280_Temperature, 0, 2, tempString);
strcat(returnString, tempString); strcat(returnString, tempString);
strcat(returnString, ","); strcat(returnString, ",");
tempString[0] = '\0'; tempString[0] = '\0';
strcat(returnString, "pressure="); strcat(returnString, "bp=");
dtostrf(bmp280_Pressure / 100, 0, 2, tempString); dtostrf(bmp280_Pressure / 100, 0, 2, tempString);
strcat(returnString, tempString); strcat(returnString, tempString);
strcat(returnString, ","); strcat(returnString, ",");
tempString[0] = '\0'; tempString[0] = '\0';
strcat(returnString, "ir="); strcat(returnString, "ti=");
itoa(tsl2591_IR, tempString, 10); utoa(tsl2591_IR, tempString, 10);
strcat(returnString, tempString); strcat(returnString, tempString);
strcat(returnString, ","); strcat(returnString, ",");
tempString[0] = '\0'; tempString[0] = '\0';
strcat(returnString, "visible="); strcat(returnString, "tv=");
itoa(tsl2591_Full - tsl2591_IR, tempString, 10); utoa(tsl2591_Full - tsl2591_IR, tempString, 10);
strcat(returnString, tempString); strcat(returnString, tempString);
strcat(returnString, ","); strcat(returnString, ",");
tempString[0] = '\0'; tempString[0] = '\0';
strcat(returnString, "lux="); strcat(returnString, "tl=");
dtostrf(tsl2591.calculateLux(tsl2591_Full, tsl2591_IR), 0, 2, tempString); dtostrf(tsl2591.calculateLux(tsl2591_Full, tsl2591_IR), 0, 2, tempString);
strcat(returnString, tempString); strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "st=");
dtostrf(sht31_Temperature, 0, 2, tempString);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "sh=");
dtostrf(sht31_Humidity, 0, 2, tempString);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "gf=");
itoa(GPS.fix, tempString, 10);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "gs=");
itoa(GPS.satellites, tempString, 10);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "glt=");
dtostrf(GPS.latitudeDegrees, 0, 6, tempString);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "gln=");
dtostrf(GPS.longitudeDegrees, 0, 6, tempString);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "ga=");
dtostrf(GPS.altitude, 0, 2, tempString);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "gth=");
itoa(GPS.hour, tempString, 10);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "gtm=");
itoa(GPS.minute, tempString, 10);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "gts=");
itoa(GPS.seconds, tempString, 10);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "gdy=");
itoa(GPS.year, tempString, 10);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "gdm=");
itoa(GPS.month, tempString, 10);
strcat(returnString, tempString);
strcat(returnString, ",");
tempString[0] = '\0';
strcat(returnString, "gdd=");
itoa(GPS.day, tempString, 10);
strcat(returnString, tempString);
Serial.println(returnString); Serial.println(returnString);
} }