Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Av/i116 kelvin support #259

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Av/i116 kelvin support #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2929759
added new CLI preset for temperature unit (C,K or F)
hpsaturn Sep 21, 2023
54cd473
v0.6.1 New temperature units supported Fahrenheit and Kelvin
hpsaturn Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/configlib/ConfigApp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ typedef enum {
X(KBI2COLY, "i2conly", BOOL) \
X(KFALTFST, "altoffset", FLOAT) \
X(KFTOFFST, "toffset", FLOAT) \
X(KTEMPUNT, "tunit", INT) \
X(KBASIC, "-----", UNKNOWN) \
X(KDEBUG, "debugEnable", BOOL) \
X(KFLIPV, "flipVEnable", BOOL) \
Expand Down
6 changes: 3 additions & 3 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ platform = espressif32 @ 4.4.0
framework = arduino
upload_speed = 1500000
monitor_speed = 115200
version = 0.6.0
revision = 961
version = 0.6.1
revision = 963
# OTA remote update target (change it to none, if you want prevent CanAirIO updates)
target = dev
monitor_filters =
Expand All @@ -42,7 +42,7 @@ lib_deps =
https://github.com/256dpi/arduino-mqtt.git#7afcfb1
https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino.git#8e5f051

hpsaturn/CanAirIO Air Quality Sensors Library @ 0.7.0
hpsaturn/CanAirIO Air Quality Sensors Library @ 0.7.1
; ${commonlibs.lib_deps} ; only for local tests of sensorslib

[esp32_common]
Expand Down
2 changes: 2 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ void startingSensors() {
Serial.println("-->[INFO] config UART sensor\t: "+sensors.getSensorName((SENSORS)cfg.stype));
gui.welcomeAddMessage("Init sensors..");
int geigerPin = cfg.getInt(CONFKEYS::KGEIGERP, -1); // Geiger sensor pin (config it via CLI)
int tunit = cfg.getInt(CONFKEYS::KTEMPUNT, 0); // Temperature unit (defaulut celsius)
sensors.setOnDataCallBack(&onSensorDataOk); // all data read callback
sensors.setOnErrorCallBack(&onSensorDataError); // on data error callback
sensors.setDebugMode(cfg.devmode); // debugging mode
Expand All @@ -197,6 +198,7 @@ void startingSensors() {
sensors.setCO2AltitudeOffset(cfg.altoffset); // CO2 altitude compensation
sensors.detectI2COnly(cfg.i2conly); // force only i2c sensors
sensors.enableGeigerSensor(geigerPin); // Geiger sensor init
sensors.setTemperatureUnit((TEMPUNIT)tunit); // Config temperature unit (K,C or F)
int mUART = cfg.stype; // optional UART sensor choosed on the Android app
int mTX = cfg.sTX; // UART TX defined via setup
int mRX = cfg.sRX; // UART RX defined via setup
Expand Down