3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-15 18:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'grindylow:main' into main

Browse source
This commit is contained in:
Andreas Schiffler 2022-08-11 15:21:52 +02:00 • committed by GitHub
commit c9f0e99baf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/esp8266/README.md
View file

@ -66,7 +66,7 @@ For now the following inverters should work out of the box:
- `Ticker` 1.0 - `Ticker` 1.0
- `ESP8266HTTPUpdateServer` 1.0 - `ESP8266HTTPUpdateServer` 1.0
- `Time` 1.6.1 - `Time` 1.6.1
- `RF24` 1.4.2 - `RF24` 1.4.5
- `PubSubClient` 2.8 - `PubSubClient` 2.8
- `ArduinoJson` 6.19.4 - `ArduinoJson` 6.19.4

2
tools/esp8266/defines.h
View file

@ -21,7 +21,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 5 #define VERSION_MINOR 5
#define VERSION_PATCH 5 #define VERSION_PATCH 6
//------------------------------------- //-------------------------------------

4
tools/esp8266/scripts/auto_firmware_version.py
View file

@ -16,7 +16,11 @@ if missing_pkgs:
from dulwich import porcelain from dulwich import porcelain
def get_firmware_specifier_build_flag(): def get_firmware_specifier_build_flag():
try:
build_version = porcelain.describe('../../') # refers to the repository root dir build_version = porcelain.describe('../../') # refers to the repository root dir
except:
build_version = "g0000000"
build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\"" build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\""
print ("Firmware Revision: " + build_version) print ("Firmware Revision: " + build_version)
return (build_flag) return (build_flag)