Browse Source

Merge branch 'lumapu:main' into nrf_info

pull/470/head
DanielR92 2 years ago
committed by GitHub
parent
commit
3cbf631a18
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 24
      .github/workflows/compile_release.yml
  2. 1
      README.md
  3. 13
      src/CHANGES.md
  4. 1
      src/app.cpp
  5. 2
      src/defines.h

24
.github/workflows/compile_esp8266.yml → .github/workflows/compile_release.yml

@ -4,10 +4,11 @@ on:
push:
branches: main
paths:
- 'tools/esp8266/**' # build only when changes occur here
- '!tools/esp8266/README.md'
- '!tools/esp8266/CHANGES.md'
- '!tools/esp8266/User_Manual.md'
- 'src/**' # build only when changes occur here
- '.github/workflows/compile_release.yml'
- '!README.md'
- '!CHANGES.md'
- '!User_Manual.md'
jobs:
build:
runs-on: ubuntu-latest
@ -48,8 +49,9 @@ jobs:
- name: Convert HTML files
working-directory: src/web/html
run: python convert.py
- name: Run PlatformIO
run: pio run -d tools/esp8266 --environment esp8266-release --environment esp8285-release --environment esp32-wroom32-release
run: pio run -d src --environment esp8266-release --environment esp8285-release --environment esp32-wroom32-release
- name: Rename Binary files
id: rename-binary-files
@ -64,17 +66,19 @@ jobs:
prerelease: false
release_name: ${{ steps.rename-binary-files.outputs.name }}
tag_name: ${{ steps.rename-binary-files.outputs.name }}
body_path: tools/esp8266/CHANGES.md
body_path: src/CHANGES.md
env:
GITHUB_TOKEN: ${{ github.token }}
- name: set-version
- name: Set Version
uses: cschleiden/replace-tokens@v1
with:
files: tools/esp8266/User_Manual.md
files: User_Manual.md
env:
VERSION: ${{ steps.rename-binary-files.outputs.name }}
- name: create-artifact
run: zip --junk-paths ${{ steps.rename-binary-files.outputs.name }}.zip tools/esp8266/.pio/build/out/* tools/esp8266/User_Manual.md
- name: Create Artifact
run: zip --junk-paths ${{ steps.rename-binary-files.outputs.name }}.zip src/firmware/* User_Manual.md
- name: Upload Release
id: upload-release

1
README.md

@ -14,6 +14,7 @@ List of approaches
## Quick Start with ESP8266
- [Go here ✨](Getting_Started.md#things-needed)
- [Our Website](https://ahoydtu.de)
## Success Stories

13
src/CHANGES.md

@ -0,0 +1,13 @@
# Changelog
* fix browser sync NTP button
* added login feature (protect web ui)
* added static IP option
* improved initial boot - don't connect to `YOUR_WIFI_SSID` any more, directly boot into AP mode
* added status LED support
* improved MQTT handling (boot, periodic updates, no zero values any more)
* replaced deprecated workflow functions
* refactored code to make it more clearly
* added scheduler to register functions which need to be run each second / minute / ...
* changed settings to littlefs (-> no currupt settings in future on memory layout changes)
* added a lot of system infos to `System` page for support

1
src/app.cpp

@ -237,7 +237,6 @@ void app::resetSystem(void) {
mRxTicker = 0;
mSendLastIvId = 0;
mShowRebootRequest = false;
memset(&mStat, 0, sizeof(statistics_t));

2
src/defines.h

@ -13,7 +13,7 @@
//-------------------------------------
#define VERSION_MAJOR 0
#define VERSION_MINOR 5
#define VERSION_PATCH 40
#define VERSION_PATCH 41
//-------------------------------------
typedef struct {

Loading…
Cancel
Save