Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #39 resolved #41

Closed
wants to merge 22 commits into from
Closed

Issue #39 resolved #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a3912ad
fw version setup is now windows compatible
denxhun Nov 2, 2018
5e14e00
Merge branch 'master' of https://github.com/denxhun/MQTT433gateway
denxhun Nov 2, 2018
5ef1e6e
Update scripts/fw_version.py
puuu Nov 6, 2018
bd0061c
You are right, agree.
puuu Nov 6, 2018
cc04ab0
Correct py indentation
denxhun Nov 6, 2018
fd0afed
platformio.ini: replace deprecated board_f_cpu with board_build.f_cpu
puuu Sep 3, 2018
0c40f06
lib/Settings/Settings.h: replace deprecated BUILTIN_LED with LED_BUILTIN
puuu Sep 3, 2018
5ea3113
platformio.ini: add missing extra_scripts to nodemcu
puuu Sep 3, 2018
39ae69b
web/package.json: upgrade to gulp 4.0.0
puuu Sep 3, 2018
cb4f3fb
web/gulpfile.js: upgrade to gulb 4 style
puuu Sep 3, 2018
f43ddaf
Frontend: update precompiled header
puuu Sep 3, 2018
03b25ec
web/gulpfile.js: create more pretty C header files
puuu Oct 12, 2018
4950c69
Frontend: update npm dependencies
puuu Oct 12, 2018
aff831b
Frontend: update precompiled header
puuu Oct 12, 2018
8dd2aea
WebServer: use Logger.info as target for Update.printError()
puuu Oct 12, 2018
eab13cd
lib/Settings/Settings.h: fix missing FPSTR()
puuu Nov 2, 2018
616ea76
Settings: Do not let JsonKey be in PROGMEM
puuu Nov 2, 2018
18cf6c5
lib/RfHandler/RfHandler.cpp: remove superfluous space in log message
puuu Nov 2, 2018
9c9b82a
Update scripts/fw_version.py
puuu Nov 6, 2018
861f12b
You are right, agree.
puuu Nov 6, 2018
7a20bee
Correct py indentation
denxhun Nov 6, 2018
73dc4d2
Merge branch 'master' of https://github.com/denxhun/MQTT433gateway
denxhun Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
platform = espressif8266
framework = arduino
board_build.f_cpu = 80000000L
build_flags = !echo "-DFIRMWARE_VERSION=$(git describe --abbrev=8 --dirty --always --tags)" -Wall
build_flags = -Wall
extra_scripts =
pre:scripts/fw_version.py
pre:scripts/build_web.py
lib_deps =
ArduinoSimpleLogging
Expand Down
14 changes: 14 additions & 0 deletions scripts/fw_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
"""MQTT433gateway git firmware extractor

Project home: https://github.com/puuu/MQTT433gateway/
"""
import subprocess
denxhun marked this conversation as resolved.
Show resolved Hide resolved
Import("env")

framework_version = '-DFIRMWARE_VERSION="' + subprocess.check_output(['git', 'describe', '--abbrev=8', '--dirty', '--always', '--tags']).strip() + '"'

env.Append(
BUILD_FLAGS=[
framework_version
]
)