From 11b146c2d164eac61434c835917d04f5a251930c Mon Sep 17 00:00:00 2001 From: willem Date: Mon, 26 Jul 2021 18:54:25 +0200 Subject: [PATCH] updated sensors --- .DS_Store | Bin 0 -> 6148 bytes .vscode/c_cpp_properties.json | 418 +++++++++++++++++----------------- .vscode/launch.json | 8 +- CO2_sensor.cpp | 2 +- config.h | 18 +- lcd.cpp | 13 +- main.cpp | 4 +- sensor.cpp | 2 + sensor.h | 14 +- 9 files changed, 239 insertions(+), 240 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1ccb73a554b886679c79ff0196dafda7c4b51f3f GIT binary patch literal 6148 zcmeHK%}N6?5Kh`^Q$*-NL2m)C1-l{@@v^q-3%FtrDz)pDc5%BY{jrBq*n>BHAp z58*R-aFR^@q3ThK%)sPJCNtUOOGtJYW4t;F9ma}`F#)PEQ-IXzhQDcAD9F7Ln zX8%mLPLzs+S-lyYMy+w9xK>liuo)$-z6prJ7Py?(qa;-0sv0HXz{L8tLli`zQQVwN z9H(58JC)sONlu*do>P+hPGveRi1n@QgX6|^+)dP-<&eX1GqQ>}gL|mpa^kk*U#afL zgNQv{<#~8eMe{vzyI|kQg8ah=B!T0Iw;r zvS9O~=@0|Nz~3{V?*|F0(M3!xnyUi}lL7$dz-$ESI+xHf646CWEkX|nx1oSGlw*p) zZ8+E^`niayMH|jICLbKX%rQgZ=Ib!NH13SM7O5l#h=I=xWNovk-~XfU^Z(C5)FK9m zfq%sS&w0LAg(czJI=49e)=JPzP%YXowfGhS74sB>uYQU*K#hQ1>I$HXm|6r22>l2c L8mJ%!ewBe&R>fff literal 0 HcmV?d00001 diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 5c74e25..df2386a 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -8,217 +8,219 @@ { "name": "PlatformIO", "includePath": [ - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/include", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit SGP30 Sensor", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit SCD30", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit BusIO", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/TJpg_Decoder/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SD/src", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/RunningMedian", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/PubSubClient/src", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit Unified Sensor", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/TFT_eSPI", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SPI/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SPIFFS/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/config", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_trace", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_update", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/asio", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bootloader_support", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bt", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/coap", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/console", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/driver", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/efuse", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-tls", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_adc_cal", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_event", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_client", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_server", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_ota", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_server", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_ringbuf", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_websocket_client", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/espcoredump", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ethernet", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/expat", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fatfs", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freemodbus", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freertos", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/heap", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/idf_test", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/jsmn", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/json", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/libsodium", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/log", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/lwip", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mbedtls", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mdns", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/micro-ecc", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mqtt", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/newlib", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nghttp", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nvs_flash", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/openssl", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protobuf-c", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protocomm", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/pthread", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/sdmmc", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/smartconfig_ack", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/soc", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spi_flash", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spiffs", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcp_transport", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcpip_adapter", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ulp", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/unity", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/vfs", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wear_levelling", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wifi_provisioning", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wpa_supplicant", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/xtensa-debug-module", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-face", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32-camera", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fb_gfx", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/cores/esp32", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/variants/esp32", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit GFX Library", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/ArduinoOTA/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/AsyncUDP/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/AzureIoT/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/BLE/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/DNSServer/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/EEPROM/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/ESP32/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/FFat/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/HTTPClient/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdate/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdateServer/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/NetBIOS/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/Preferences/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SD_MMC/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SimpleBLE/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/Ticker/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/Update/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/WebServer/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/WiFiClientSecure/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/WiFiProv/src", - "/Users/willemoldemans/.platformio/packages/tool-unity", + "/Users/willem/Documents/PROJECTS/AQS-FW/include", + "/Users/willem/Documents/PROJECTS/AQS-FW", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit SGP30 Sensor", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit SCD30", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit BusIO", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/TJpg_Decoder/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SD/src", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/RunningMedian", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/PubSubClient/src", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit Unified Sensor", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/TFT_eSPI", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SPI/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SPIFFS/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/config", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_trace", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_update", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/asio", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bootloader_support", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bt", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/coap", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/console", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/driver", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/efuse", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-tls", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_adc_cal", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_event", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_client", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_server", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_ota", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_server", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_ringbuf", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_websocket_client", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/espcoredump", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ethernet", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/expat", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fatfs", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freemodbus", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freertos", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/heap", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/idf_test", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/jsmn", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/json", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/libsodium", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/log", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/lwip", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mbedtls", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mdns", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/micro-ecc", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mqtt", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/newlib", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nghttp", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nvs_flash", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/openssl", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protobuf-c", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protocomm", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/pthread", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/sdmmc", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/smartconfig_ack", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/soc", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spi_flash", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spiffs", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcp_transport", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcpip_adapter", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ulp", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/unity", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/vfs", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wear_levelling", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wifi_provisioning", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wpa_supplicant", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/xtensa-debug-module", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-face", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32-camera", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fb_gfx", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/cores/esp32", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/variants/esp32", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit GFX Library", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit SSD1306", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/ArduinoOTA/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/AsyncUDP/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/AzureIoT/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/BLE/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/DNSServer/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/EEPROM/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/ESP32/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/FFat/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/HTTPClient/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdate/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdateServer/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/NetBIOS/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/Preferences/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SD_MMC/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SimpleBLE/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/Ticker/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/Update/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/WebServer/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/WiFiClientSecure/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/WiFiProv/src", + "/Users/willem/.platformio/packages/tool-unity", "" ], "browse": { "limitSymbolsToIncludedHeaders": true, "path": [ - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/include", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit SGP30 Sensor", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit SCD30", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit BusIO", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/TJpg_Decoder/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SD/src", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/RunningMedian", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/PubSubClient/src", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit Unified Sensor", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/TFT_eSPI", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SPI/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SPIFFS/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/config", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_trace", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_update", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/asio", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bootloader_support", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bt", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/coap", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/console", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/driver", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/efuse", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-tls", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_adc_cal", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_event", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_client", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_server", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_ota", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_server", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_ringbuf", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_websocket_client", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/espcoredump", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ethernet", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/expat", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fatfs", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freemodbus", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freertos", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/heap", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/idf_test", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/jsmn", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/json", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/libsodium", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/log", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/lwip", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mbedtls", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mdns", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/micro-ecc", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mqtt", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/newlib", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nghttp", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nvs_flash", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/openssl", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protobuf-c", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protocomm", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/pthread", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/sdmmc", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/smartconfig_ack", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/soc", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spi_flash", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spiffs", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcp_transport", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcpip_adapter", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ulp", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/unity", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/vfs", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wear_levelling", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wifi_provisioning", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wpa_supplicant", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/xtensa-debug-module", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-face", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32-camera", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fb_gfx", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/cores/esp32", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/variants/esp32", - "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/libdeps/esp32/Adafruit GFX Library", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/ArduinoOTA/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/AsyncUDP/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/AzureIoT/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/BLE/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/DNSServer/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/EEPROM/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/ESP32/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/FFat/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/HTTPClient/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdate/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdateServer/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/NetBIOS/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/Preferences/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SD_MMC/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/SimpleBLE/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/Ticker/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/Update/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/WebServer/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/WiFiClientSecure/src", - "/Users/willemoldemans/.platformio/packages/framework-arduinoespressif32/libraries/WiFiProv/src", - "/Users/willemoldemans/.platformio/packages/tool-unity", + "/Users/willem/Documents/PROJECTS/AQS-FW/include", + "/Users/willem/Documents/PROJECTS/AQS-FW", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit SGP30 Sensor", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit SCD30", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit BusIO", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/TJpg_Decoder/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SD/src", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/RunningMedian", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/PubSubClient/src", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit Unified Sensor", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/TFT_eSPI", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SPI/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SPIFFS/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/config", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_trace", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_update", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/asio", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bootloader_support", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bt", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/coap", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/console", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/driver", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/efuse", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-tls", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_adc_cal", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_event", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_client", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_server", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_ota", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_server", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_ringbuf", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_websocket_client", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/espcoredump", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ethernet", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/expat", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fatfs", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freemodbus", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freertos", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/heap", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/idf_test", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/jsmn", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/json", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/libsodium", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/log", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/lwip", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mbedtls", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mdns", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/micro-ecc", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mqtt", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/newlib", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nghttp", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nvs_flash", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/openssl", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protobuf-c", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protocomm", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/pthread", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/sdmmc", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/smartconfig_ack", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/soc", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spi_flash", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spiffs", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcp_transport", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcpip_adapter", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ulp", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/unity", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/vfs", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wear_levelling", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wifi_provisioning", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wpa_supplicant", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/xtensa-debug-module", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-face", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32-camera", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fb_gfx", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/cores/esp32", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/variants/esp32", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit GFX Library", + "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/libdeps/esp32/Adafruit SSD1306", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/ArduinoOTA/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/AsyncUDP/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/AzureIoT/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/BLE/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/DNSServer/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/EEPROM/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/ESP32/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/FFat/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/HTTPClient/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdate/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdateServer/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/NetBIOS/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/Preferences/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SD_MMC/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/SimpleBLE/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/Ticker/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/Update/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/WebServer/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/WiFiClientSecure/src", + "/Users/willem/.platformio/packages/framework-arduinoespressif32/libraries/WiFiProv/src", + "/Users/willem/.platformio/packages/tool-unity", "" ] }, @@ -238,7 +240,7 @@ ], "cStandard": "c99", "cppStandard": "c++11", - "compilerPath": "/Users/willemoldemans/.platformio/packages/toolchain-xtensa32/bin/xtensa-esp32-elf-gcc", + "compilerPath": "/Users/willem/.platformio/packages/toolchain-xtensa32/bin/xtensa-esp32-elf-gcc", "compilerArgs": [ "-mlongcalls", "" @@ -246,4 +248,4 @@ } ], "version": 4 -} +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index c5e8bc1..559d695 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,9 +12,9 @@ "type": "platformio-debug", "request": "launch", "name": "PIO Debug", - "executable": "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/build/esp32/firmware.elf", + "executable": "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/build/esp32/firmware.elf", "projectEnvName": "esp32", - "toolchainBinDir": "/Users/willemoldemans/.platformio/packages/toolchain-xtensa32/bin", + "toolchainBinDir": "/Users/willem/.platformio/packages/toolchain-xtensa32/bin", "internalConsoleOptions": "openOnSessionStart", "preLaunchTask": { "type": "PlatformIO", @@ -25,9 +25,9 @@ "type": "platformio-debug", "request": "launch", "name": "PIO Debug (skip Pre-Debug)", - "executable": "/Users/willemoldemans/Documents/PROJECTEN/AQS-main/Firmware/PM25SensorESP32/.pio/build/esp32/firmware.elf", + "executable": "/Users/willem/Documents/PROJECTS/AQS-FW/.pio/build/esp32/firmware.elf", "projectEnvName": "esp32", - "toolchainBinDir": "/Users/willemoldemans/.platformio/packages/toolchain-xtensa32/bin", + "toolchainBinDir": "/Users/willem/.platformio/packages/toolchain-xtensa32/bin", "internalConsoleOptions": "openOnSessionStart" } ] diff --git a/CO2_sensor.cpp b/CO2_sensor.cpp index 94db54a..bb21c8b 100644 --- a/CO2_sensor.cpp +++ b/CO2_sensor.cpp @@ -8,7 +8,7 @@ Adafruit_SCD30 scd30; #define SCD30CO2MAX 20000 #define SCD30MIN 0 -uint8_t CO2_samples = 3600 / g_pms_report_period; +uint8_t CO2_samples = 3600 / 30; AQSSensor SCD30_temperature("Temperature", SCD30_temp, "degC", device_name, CO2_samples, SCD30MIN, SCD30TEMPMAX); AQSSensor SCD30_Humidity("Humidity", SCD30_hum, "%RH", device_name, CO2_samples, SCD30MIN, SDC30HUMMAX); diff --git a/config.h b/config.h index 58b696d..60de90f 100644 --- a/config.h +++ b/config.h @@ -29,18 +29,6 @@ /* Mode button connection (momentary between this pin and GND) */ #define MODE_BUTTON_PIN 0 -/* RGB LEDs */ -#define WS2812B_PIN 13 -#define NUM_RGB_LEDS 0 - -/* LCD */ -// #define TFT_DC_PIN 2 -// #define TFT_RST_PIN 4 -// #define TFT_CS_PIN 26 -// #define TFT_SCLK_PIN 18 -// #define TFT_MISO_PIN 19 -// #define TFT_MOSI_PIN 23 - /* I2C */ #define I2C_SDA_PIN 21 #define I2C_SCL_PIN 22 @@ -48,7 +36,5 @@ /* Particulate Matter Sensor */ #define PMS_BAUD_RATE 9600 -#define PMS_SET_PIN 19 -#define PMS_RESET_PIN 26 -#define PMS_RX_PIN 4 // Tx to the PMS SHOULD BE 16 -#define PMS_TX_PIN 14 // Rx from the PMS SHOULD BE 17 +#define PMS_RX_PIN 19 // Tx to the PMS SHOULD BE 16 +#define PMS_TX_PIN 26 // Rx from the PMS SHOULD BE 17 diff --git a/lcd.cpp b/lcd.cpp index fb2cce1..0412d9e 100644 --- a/lcd.cpp +++ b/lcd.cpp @@ -85,6 +85,8 @@ void initLCD() tft.setRotation(0); tft.fillScreen(TFT_BLACK); + pinMode(TFT_BL, OUTPUT); + // Draw the dial TJpgDec.drawJpg(0, 0, dial, sizeof(dial)); tft.drawCircle(DIAL_CENTRE_X, DIAL_CENTRE_Y, NEEDLE_RADIUS - NEEDLE_LENGTH, TFT_DARKGREY); @@ -102,8 +104,8 @@ void initLCD() spr.pushSprite(DIAL_CENTRE_X - spr_width / 2, DIAL_CENTRE_Y - spr.fontHeight() / 2); // Plot the label text - nameSpr.setTextFont(3); - name_spr_width = nameSpr.textWidth("Temperature"); + nameSpr.setTextFont(2); + name_spr_width = nameSpr.textWidth("---Sensor Name---"); nameSpr.createSprite(name_spr_width, nameSpr.fontHeight() * 2 + 2); nameSpr.fillSprite(bg_color); nameSpr.setTextColor(TFT_WHITE, bg_color); @@ -146,11 +148,10 @@ uint32_t display_last_update = 0; #define MAXGUAGE 240 #define MINGUAGE 0 -#define DISPLAY_ROTATE 10 //sec +#define DISPLAY_ROTATE 15 //sec void handleLCD() { - static uint32_t value; static uint16_t angle; DISPLAY_STATE displaystate_next = DISPLAY_PM1P0; sensor_e nextSensor = AE_1P0; @@ -218,9 +219,9 @@ void handleLCD() return; } - angle = map(value, sensor->getMin(), sensor->getMax(), MINGUAGE, MAXGUAGE); + angle = map(sensor->value(), sensor->getMin(), sensor->getMax(), MINGUAGE, MAXGUAGE); - plotNeedle(angle, 15, value); + plotNeedle(angle, 15, sensor->value()); nameSpr.drawString(sensor->getName().c_str(), name_spr_width / 2, nameSpr.fontHeight() / 2); nameSpr.drawString(sensor->getUnit().c_str(), name_spr_width / 2, nameSpr.fontHeight() / 2 * 3 + 2); diff --git a/main.cpp b/main.cpp index f27e2a3..9c8e6f8 100644 --- a/main.cpp +++ b/main.cpp @@ -61,7 +61,7 @@ void setup() initParticles(); initCO2sensor(); initVOCsensor(); - //initLCD(); + initLCD(); initButtons(); } @@ -75,6 +75,6 @@ void loop() handleVOCsensor(); handleButtons(); handleSensor(); - //handleLCD(); + handleLCD(); handleMQTT(); } diff --git a/sensor.cpp b/sensor.cpp index 52aed15..1a412d3 100644 --- a/sensor.cpp +++ b/sensor.cpp @@ -39,6 +39,8 @@ void initSensor(void) void handleSensor(void) { publishAll(); + + } AQSSensor* getSensor(sensor_e sensor) diff --git a/sensor.h b/sensor.h index 86615f2..7573315 100644 --- a/sensor.h +++ b/sensor.h @@ -88,9 +88,17 @@ public: virtual void set(uint32_t value) { - _value = value; - _average1h.add(_value); - _average24h.add(_value); + if((value > _scaleMin) && (value < _scaleMax)) + { + _value = value; + _average1h.add(_value); + _average24h.add(_value); + } + else + { + Serial.printf("Sensor %s: value out of bounds (%d)\n", _name.c_str(), value); + } + } uint32_t value() { return _value; }