diff --git a/platformio_orig.ini b/platformio_orig.ini index 80087854..4dd2263d 100644 --- a/platformio_orig.ini +++ b/platformio_orig.ini @@ -46,7 +46,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I [common] ; for release_version use max. 10 chars total, use any decimal format like "a.b.c" -release_version = 2.0.16 +release_version = 2.0.17 ; 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 = 3 diff --git a/src/configmanager.cpp b/src/configmanager.cpp index d75bc8bd..51ccae59 100644 --- a/src/configmanager.cpp +++ b/src/configmanager.cpp @@ -24,7 +24,8 @@ static uint8_t buffer[cfgLen + cfgLen2]; // // configuration frame structure in NVRAM; // 1. version header [10 bytes, containing version string] -// 2. user settings [cfgLen bytes, containing default runtime settings (configData_t cfg)] +// 2. user settings [cfgLen bytes, containing default runtime settings +// (configData_t cfg)] // 3. magicByte [cfgLen2 bytes, containing a fixed identifier] static void defaultConfig(configData_t *myconfig) { @@ -61,9 +62,7 @@ static void defaultConfig(configData_t *myconfig) { // migrate runtime configuration from earlier to current version static void migrateConfig(void) { - // currently no migration rules are implemented, we just reset config to - // factory settings - eraseConfig(); + // currently no configuration migration rules are implemented } // save current configuration from RAM to NVRAM diff --git a/src/platformio_orig.ini b/src/platformio_orig.ini new file mode 100644 index 00000000..80087854 --- /dev/null +++ b/src/platformio_orig.ini @@ -0,0 +1,135 @@ +; PlatformIO Project Configuration File +; NOTE: PlatformIO v4 is needed! +; +; Please visit documentation for the other options and examples +; http://docs.platformio.org/page/projectconf.html + + +; ---> SELECT THE TARGET PLATFORM HERE! <--- +[board] +halfile = generic.h +;halfile = ebox.h +;halfile = eboxtube.h +;halfile = ecopower.h +;halfile = heltec.h +;halfile = heltecv2.h +;halfile = ttgov1.h +;halfile = ttgov2.h +;halfile = ttgov21old.h +;halfile = ttgov21new.h +;halfile = ttgofox.h +;halfile = ttgobeam.h +;halfile = ttgobeam10.h +;halfile = fipy.h +;halfile = lopy.h +;halfile = lopy4.h +;halfile = lolin32litelora.h +;halfile = lolin32lora.h +;halfile = lolin32lite.h +;halfile = wemos32oled.h +;halfile = wemos32matrix.h +;halfile = octopus32.h +;halfile = tinypico.h +;halfile = tinypicomatrix.h +;halfile = m5core.h +;halfile = m5fire.h +;halfile = olimexpoeiso.h + +[platformio] +; upload firmware to board with usb cable +default_envs = usb +; upload firmware to a jfrog bintray repository +;default_envs = ota +; use latest versions of libraries +;default_envs = dev +description = Paxcounter is a 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 = 2.0.16 +; 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 = 3 +extra_scripts = pre:build.py +otakeyfile = ota.conf +lorakeyfile = loraconf.h +lmicconfigfile = lmic_config.h +platform_espressif32 = espressif32@2.0.0 +monitor_speed = 115200 +upload_speed = 115200 ; set by build.py and taken from hal file +display_library = ; set by build.py and taken from hal file +lib_deps_lora = + mcci-catena/MCCI LoRaWAN LMIC library @ ^3.2.0 +lib_deps_display = + bitbank2/OneBitDisplay @ 1.7.2 + ricmoo/QRCode @ ^0.0.1 + bodmer/TFT_eSPI @ ^2.2.20 +lib_deps_ledmatrix = + seeed-studio/Ultrathin_LED_Matrix @ ^1.0.0 +lib_deps_rgbled = + roboticsbrno/SmartLeds @ ^1.2.1 +lib_deps_gps = + mikalhart/TinyGPSPlus @ ^1.0.2 +lib_deps_sensors = + adafruit/Adafruit Unified Sensor @ ^1.1.4 + adafruit/Adafruit BME280 Library @ ^2.1.1 + adafruit/Adafruit BMP085 Library @ ^1.1.0 + boschsensortec/BSEC Software Library @ 1.5.1474 + https://github.com/ricki-z/SDS011.git +lib_deps_basic = + bblanchon/ArduinoJson @ <6 + jchristensen/Timezone @ ^1.2.4 + makuna/RTC @ ^2.3.5 + spacehuhn/SimpleButton + lewisxhe/AXP202X_Library @ ^1.1.2 + geeksville/esp32-micro-sdcard @ ^0.1.1 + 256dpi/MQTT @ ^2.4.7 +lib_deps_all = + ${common.lib_deps_basic} + ${common.lib_deps_lora} + ${common.lib_deps_display} + ${common.lib_deps_rgbled} + ${common.lib_deps_gps} + ${common.lib_deps_sensors} + ${common.lib_deps_ledmatrix} +build_flags_basic = + -include "src/hal/${board.halfile}" + -include "src/paxcounter.conf" + -w + '-DCORE_DEBUG_LEVEL=${common.debug_level}' + '-DLOG_LOCAL_LEVEL=${common.debug_level}' + '-DPROGVERSION="${common.release_version}"' +build_flags_sensors = + -Llib/Bosch-BSEC/src/esp32/ + -lalgobsec +build_flags_all = + ${common.build_flags_basic} + ${common.build_flags_sensors} + -mfix-esp32-psram-cache-issue + +[env] +lib_ldf_mode = deep ; #632 Fixes compiler error with OneBitDisplay library +framework = arduino +board = esp32dev +board_build.partitions = min_spiffs.csv +upload_speed = ${common.upload_speed} +;upload_port = COM8 +platform = ${common.platform_espressif32} +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} +monitor_filters = time, esp32_exception_decoder, default + +[env:ota] +upload_protocol = custom + +[env:usb] +upload_protocol = esptool + +[env:dev] +upload_protocol = esptool +build_type = debug +platform = https://github.com/platformio/platform-espressif32.git#develop +platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git