Updated version timezonedb

rzeldent · Dec 20, 2023 · f584510 · f584510
1 parent 2c61ca2
commit f584510
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,23 +5,30 @@ jobs:
  name: Build
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
+ with:
+ submodules: 'true' 
+ - uses: actions/cache@v3
+ with:
+ path: |
+ ~/.cache/pip
+ ~/.platformio/.cache
+ key: ${{ runner.os }}-pio 
  - name: Set up python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
  with:
- python-version: '3.x'
- architecture: 'x64'
+ python-version: "3.9"
  - name: Generate image files
  run: |
  chmod +x ./generate_images.sh
  ./generate_images.sh
  shell: bash
- - name: Install PlatformIO
+ - name: Install PlatformIO Core
  run: python -m pip install platformio
  - name: Build firmware
  run: platformio run
- - name: Archive
- uses: actions/upload-artifact@v2
+ - name: Archive firmwares
+ uses: actions/upload-artifact@v3
  with:
- name: firmware.bin
- path: .pio/build/*/firmware.bin
+ name: firmwares.zip
+ path: .pio/build/*/*.bin
diff --git a/platformio.ini b/platformio.ini
@@ -68,7 +68,7 @@ lib_deps =
  prampec/IotWebConf@^3.2.1
  rzeldent/micro-http-status@^1.0.2
  rzeldent/micro-moustache@^1.0.0
- rzeldent/micro-timezonedb@^1.0.2
+ rzeldent/micro-timezonedb@^1.0.4
 
 board_build.embed_files =
  html/bootstrap.min.css.gz

diff --git a/src/main.cpp b/src/main.cpp
@@ -46,7 +46,7 @@ auto iotWebParamAirborne = iotwebconf::Builder<iotwebconf::CheckboxTParameter>("
 auto iotWebParamGrounded = iotwebconf::Builder<iotwebconf::CheckboxTParameter>("ground").label("Include grounded").defaultValue(DEFAULT_GROUND).build();
 auto iotWebParamGliders = iotwebconf::Builder<iotwebconf::CheckboxTParameter>("gliders").label("Include gliders").defaultValue(DEFAULT_GLIDERS).build();
 auto iotWebParamVehicles = iotwebconf::Builder<iotwebconf::CheckboxTParameter>("vehicles").label("Include vehicles").defaultValue(DEFAULT_VEHICLES).build();
-auto iotWebParamTimeZone = iotwebconf::Builder<iotwebconf::SelectTParameter<sizeof(posix_timezone_names[0])>>("timezone").label("Choose timezone").optionValues((const char *)&posix_timezone_names).optionNames((const char *)&posix_timezone_names).optionCount(sizeof(posix_timezone_names) / sizeof(posix_timezone_names[0])).nameLength(sizeof(posix_timezone_names[0])).defaultValue(DEFAULT_TIMEZONE).build();
+auto iotWebParamTimeZone = iotwebconf::Builder<iotwebconf::SelectTParameter<sizeof(posix_timezone_tz_t)>>("timezone").label("Choose timezone").optionValues(posix_timezone_tzs->zone_name).optionNames(posix_timezone_tzs->zone_name).optionCount(sizeof(posix_timezone_tzs) / sizeof(posix_timezone_tzs[0])).nameLength(sizeof(timezone_name)).defaultValue(DEFAULT_TIMEZONE).build();
 auto iotWebParamMetric = iotwebconf::Builder<iotwebconf::CheckboxTParameter>("metric").label("Use metric units").defaultValue(DEFAULT_METRIC).build();
 
 // Variables for flight info