Browse Source

Merge branch 'grindylow:main' into main

pull/157/head
Andreas Schiffler 2 years ago
committed by GitHub
parent
commit
c9f0e99baf
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      tools/esp8266/README.md
  2. 2
      tools/esp8266/defines.h
  3. 6
      tools/esp8266/scripts/auto_firmware_version.py

2
tools/esp8266/README.md

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

2
tools/esp8266/defines.h

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

6
tools/esp8266/scripts/auto_firmware_version.py

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

Loading…
Cancel
Save