diff --git a/platformio.ini b/platformio.ini index 461cc403..f8aa7392 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,366 +1,366 @@ -; PlatformIO Project Configuration File -; -; Please visit documentation for the other options and examples -; http://docs.platformio.org/page/projectconf.html - - -; ---> SELECT TARGET PLATFORM HERE! <--- -[platformio] -env_default = generic -;env_default = ebox -;env_default = eboxtube -;env_default = heltec -;env_default = heltecv2 -;env_default = ttgov1 -;env_default = ttgov2 -;env_default = ttgov21old -;env_default = ttgov21new -;env_default = ttgobeam_old -;env_default = ttgobeam_new -;env_default = lopy -;env_default = lopy4 -;env_default = fipy -;env_default = lolin32litelora -;env_default = lolin32lora -;env_default = lolin32lite -;env_default = octopus32 -;env_default = ebox, eboxtube, heltec, ttgobeam, lopy4, lopy, ttgov21old, ttgov21new -; -description = Paxcounter is a proof-of-concept ESP32 device for metering passenger flows in realtime. It counts how many mobile devices are around. - -[common] -; for release_version use max. 10 chars total, use any decimal format like "a.b.c" -release_version = 1.7.01 -; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! -; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose -debug_level = 0 -; UPLOAD MODE: select esptool to flash via USB/UART, select custom to upload to cloud for OTA -upload_protocol = esptool -;upload_protocol = custom -extra_scripts = pre:build.py -keyfile = ota.conf -;platform_espressif32 = espressif32@1.5.0 -platform_espressif32 = https://github.com/platformio/platform-espressif32.git#feature/stage -board_build.partitions = min_spiffs.csv -monitor_speed = 115200 -lib_deps_lora = - MCCI LoRaWAN LMIC library@^2.3.1 -lib_deps_display = - U8g2@>=2.25.0 -lib_deps_rgbled = - SmartLeds@>=1.1.3 -lib_deps_gps = - TinyGPSPlus@>=1.0.2 -lib_deps_basic = - ArduinoJson@^5.13.1 - Time@>=1.5 -lib_deps_all = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_display} - ${common.lib_deps_rgbled} - ${common.lib_deps_gps} -build_flags_basic = - -include "src/hal/${PIOENV}.h" - -include "src/paxcounter.conf" - -w - '-DARDUINO_LMIC_PROJECT_CONFIG_H=../../../src/lmic_config.h' - '-DCORE_DEBUG_LEVEL=${common.debug_level}' - '-DLOG_LOCAL_LEVEL=${common.debug_level}' - '-DBINTRAY_PACKAGE="${PIOENV}"' - '-DPROGVERSION="${common.release_version}"' -build_flags_sensors = - -Llib/Bosch-BSEC - -llibalgobsec.a -build_flags_all = - ${common.build_flags_basic} - ${common.build_flags_sensors} - -[env:ebox] -platform = ${common.platform_espressif32} -framework = arduino -board = esp32dev -board_build.partitions = ${common.board_build.partitions} -upload_speed = 115200 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:eboxtube] -platform = ${common.platform_espressif32} -framework = arduino -board = esp32dev -board_build.partitions = ${common.board_build.partitions} -upload_speed = 115200 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_rgbled} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:heltec] -platform = ${common.platform_espressif32} -framework = arduino -board = heltec_wifi_lora_32 -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_display} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:heltecv2] -platform = ${common.platform_espressif32} -framework = arduino -board = heltec_wifi_lora_32 -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_display} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:ttgov1] -platform = ${common.platform_espressif32} -framework = arduino -board = ttgo-lora32-v1 -board_build.partitions = ${common.board_build.partitions} -upload_speed = 115200 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_display} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:ttgov2] -platform = ${common.platform_espressif32} -framework = arduino -board = ttgo-lora32-v1 -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_display} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:ttgov21old] -platform = ${common.platform_espressif32} -framework = arduino -board = esp32dev -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_display} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:ttgov21new] -platform = ${common.platform_espressif32} -framework = arduino -board = esp32dev -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_display} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:ttgobeam_old] -platform = ${common.platform_espressif32} -framework = arduino -board = esp32dev -;board = ttgo-t-beam -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_gps} -build_flags = - ${common.build_flags_all} - -mfix-esp32-psram-cache-issue - -DBOARD_HAS_PSRAM -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:ttgobeam_new] -platform = ${common.platform_espressif32} -framework = arduino -board = esp32dev -;board = ttgo-t-beam -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_gps} -build_flags = - ${common.build_flags_all} - -mfix-esp32-psram-cache-issue - -DBOARD_HAS_PSRAM -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - - -[env:fipy] -platform = ${common.platform_espressif32} -framework = arduino -board = esp32dev -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_rgbled} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:lopy] -platform = ${common.platform_espressif32} -framework = arduino -board = lopy -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_rgbled} - ${common.lib_deps_gps} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:lopy4] -platform = ${common.platform_espressif32} -framework = arduino -board = lopy4 -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_rgbled} - ${common.lib_deps_gps} -build_flags = - ${common.build_flags_basic} - -mfix-esp32-psram-cache-issue - -DBOARD_HAS_PSRAM -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:lolin32litelora] -platform = ${common.platform_espressif32} -framework = arduino -board = lolin32 -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_rgbled} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:lolin32lora] -platform = ${common.platform_espressif32} -framework = arduino -board = lolin32 -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_lora} - ${common.lib_deps_rgbled} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:lolin32lite] -platform = ${common.platform_espressif32} -framework = arduino -board = lolin32 -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = - ${common.lib_deps_basic} - ${common.lib_deps_rgbled} -build_flags = - ${common.build_flags_basic} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:octopus32] -platform = ${common.platform_espressif32} -framework = arduino -board = featheresp32 -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = ${common.lib_deps_all} -build_flags = ${common.build_flags_all} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} - -[env:generic] -platform = ${common.platform_espressif32} -framework = arduino -board = esp32dev -board_build.partitions = ${common.board_build.partitions} -upload_speed = 921600 -lib_deps = ${common.lib_deps_all} -build_flags = ${common.build_flags_all} -upload_protocol = ${common.upload_protocol} -extra_scripts = ${common.extra_scripts} -monitor_speed = ${common.monitor_speed} \ No newline at end of file +; PlatformIO Project Configuration File +; +; Please visit documentation for the other options and examples +; http://docs.platformio.org/page/projectconf.html + + +; ---> SELECT TARGET PLATFORM HERE! <--- +[platformio] +env_default = generic +;env_default = ebox +;env_default = eboxtube +;env_default = heltec +;env_default = heltecv2 +;env_default = ttgov1 +;env_default = ttgov2 +;env_default = ttgov21old +;env_default = ttgov21new +;env_default = ttgobeam_old +;env_default = ttgobeam_new +;env_default = lopy +;env_default = lopy4 +;env_default = fipy +;env_default = lolin32litelora +;env_default = lolin32lora +;env_default = lolin32lite +;env_default = octopus32 +;env_default = ebox, eboxtube, heltec, ttgobeam, lopy4, lopy, ttgov21old, ttgov21new +; +description = Paxcounter is a proof-of-concept ESP32 device for metering passenger flows in realtime. It counts how many mobile devices are around. + +[common] +; for release_version use max. 10 chars total, use any decimal format like "a.b.c" +release_version = 1.7.01 +; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! +; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose +debug_level = 0 +; UPLOAD MODE: select esptool to flash via USB/UART, select custom to upload to cloud for OTA +upload_protocol = esptool +;upload_protocol = custom +extra_scripts = pre:build.py +keyfile = ota.conf +;platform_espressif32 = espressif32@1.5.0 +platform_espressif32 = https://github.com/platformio/platform-espressif32.git#feature/stage +board_build.partitions = min_spiffs.csv +monitor_speed = 115200 +lib_deps_lora = + MCCI LoRaWAN LMIC library@^2.3.1 +lib_deps_display = + U8g2@>=2.25.0 +lib_deps_rgbled = + SmartLeds@>=1.1.3 +lib_deps_gps = + TinyGPSPlus@>=1.0.2 +lib_deps_basic = + ArduinoJson@^5.13.1 + Time@>=1.5 +lib_deps_all = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_display} + ${common.lib_deps_rgbled} + ${common.lib_deps_gps} +build_flags_basic = + -include "src/hal/${PIOENV}.h" + -include "src/paxcounter.conf" + -w + '-DARDUINO_LMIC_PROJECT_CONFIG_H=../../../src/lmic_config.h' + '-DCORE_DEBUG_LEVEL=${common.debug_level}' + '-DLOG_LOCAL_LEVEL=${common.debug_level}' + '-DBINTRAY_PACKAGE="${PIOENV}"' + '-DPROGVERSION="${common.release_version}"' +build_flags_sensors = + -Llib/Bosch-BSEC + -llibalgobsec.a +build_flags_all = + ${common.build_flags_basic} + ${common.build_flags_sensors} + +[env:ebox] +platform = ${common.platform_espressif32} +framework = arduino +board = esp32dev +board_build.partitions = ${common.board_build.partitions} +upload_speed = 115200 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:eboxtube] +platform = ${common.platform_espressif32} +framework = arduino +board = esp32dev +board_build.partitions = ${common.board_build.partitions} +upload_speed = 115200 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_rgbled} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:heltec] +platform = ${common.platform_espressif32} +framework = arduino +board = heltec_wifi_lora_32 +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_display} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:heltecv2] +platform = ${common.platform_espressif32} +framework = arduino +board = heltec_wifi_lora_32 +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_display} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:ttgov1] +platform = ${common.platform_espressif32} +framework = arduino +board = ttgo-lora32-v1 +board_build.partitions = ${common.board_build.partitions} +upload_speed = 115200 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_display} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:ttgov2] +platform = ${common.platform_espressif32} +framework = arduino +board = ttgo-lora32-v1 +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_display} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:ttgov21old] +platform = ${common.platform_espressif32} +framework = arduino +board = esp32dev +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_display} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:ttgov21new] +platform = ${common.platform_espressif32} +framework = arduino +board = esp32dev +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_display} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:ttgobeam_old] +platform = ${common.platform_espressif32} +framework = arduino +board = esp32dev +;board = ttgo-t-beam +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_gps} +build_flags = + ${common.build_flags_all} + -mfix-esp32-psram-cache-issue + -DBOARD_HAS_PSRAM +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:ttgobeam_new] +platform = ${common.platform_espressif32} +framework = arduino +board = esp32dev +;board = ttgo-t-beam +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_gps} +build_flags = + ${common.build_flags_all} + -mfix-esp32-psram-cache-issue + -DBOARD_HAS_PSRAM +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + + +[env:fipy] +platform = ${common.platform_espressif32} +framework = arduino +board = esp32dev +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_rgbled} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:lopy] +platform = ${common.platform_espressif32} +framework = arduino +board = lopy +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_rgbled} + ${common.lib_deps_gps} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:lopy4] +platform = ${common.platform_espressif32} +framework = arduino +board = lopy4 +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_rgbled} + ${common.lib_deps_gps} +build_flags = + ${common.build_flags_basic} + -mfix-esp32-psram-cache-issue + -DBOARD_HAS_PSRAM +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:lolin32litelora] +platform = ${common.platform_espressif32} +framework = arduino +board = lolin32 +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_rgbled} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:lolin32lora] +platform = ${common.platform_espressif32} +framework = arduino +board = lolin32 +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_rgbled} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:lolin32lite] +platform = ${common.platform_espressif32} +framework = arduino +board = lolin32 +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = + ${common.lib_deps_basic} + ${common.lib_deps_rgbled} +build_flags = + ${common.build_flags_basic} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:octopus32] +platform = ${common.platform_espressif32} +framework = arduino +board = featheresp32 +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = ${common.lib_deps_all} +build_flags = ${common.build_flags_all} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} + +[env:generic] +platform = ${common.platform_espressif32} +framework = arduino +board = esp32dev +board_build.partitions = ${common.board_build.partitions} +upload_speed = 921600 +lib_deps = ${common.lib_deps_all} +build_flags = ${common.build_flags_all} +upload_protocol = ${common.upload_protocol} +extra_scripts = ${common.extra_scripts} +monitor_speed = ${common.monitor_speed} diff --git a/src/hal/heltecv2.h b/src/hal/heltecv2.h index 30e47847..a07147e2 100644 --- a/src/hal/heltecv2.h +++ b/src/hal/heltecv2.h @@ -27,4 +27,4 @@ #define LORA_IO1 (35) #define LORA_IO2 (34) -#endif \ No newline at end of file +#endif diff --git a/src/hal/octopus32.h b/src/hal/octopus32.h index 6d8ffdc0..a63b399b 100644 --- a/src/hal/octopus32.h +++ b/src/hal/octopus32.h @@ -2,7 +2,6 @@ #ifndef _OCTOPUS_H #define _OCTOPUS_H - #include // Hardware related definitions for #IoT Octopus32 with the Adafruit LoRaWAN Wing @@ -14,14 +13,15 @@ // enable only if device has these sensors, otherwise comment these lines // BME680 sensor on I2C bus -// don't forget to connect SDIO of BME680 to GND for selecting i2c addr 0x76 -#define HAS_BME GPIO_NUM_21, GPIO_NUM_22 // SDA, SCL +// Octopus32 has a pre-populated BME680 on i2c addr 0x76 +#define HAS_BME GPIO_NUM_23, GPIO_NUM_22 // SDA, SCL +//#define HAS_BME 0x76 // user defined sensors //#define HAS_SENSORS 1 // comment out if device has user defined sensors #define HAS_LED 13 // ESP32 GPIO12 (pin22) On Board LED -#define LED_ACTIVE_LOW 1 // Onboard LED is active when pin is LOW +//#define LED_ACTIVE_LOW 1 // Onboard LED is active when pin is LOW //#define HAS_RGB_LED 13 // ESP32 GPIO13 (pin13) On Board Shield WS2812B RGB LED //#define HAS_BUTTON 15 // ESP32 GPIO15 (pin15) Button is on the LoraNode32 shield //#define BUTTON_PULLUP 1 // Button need pullup instead of default pulldown diff --git a/src/paxcounter.conf b/src/paxcounter.conf index 370a5ce3..2254533a 100644 --- a/src/paxcounter.conf +++ b/src/paxcounter.conf @@ -84,4 +84,4 @@ //#define TIME_SYNC_INTERVAL 60 // sync time each ... minutes [default = 60], comment out means off // LMIC settings -// moved to src/lmic_config.h \ No newline at end of file +// moved to src/lmic_config.h