diff --git a/Software/ChainLube/git_rev_macro.py b/Software/ChainLube/git_rev_macro.py new file mode 100644 index 0000000..27728af --- /dev/null +++ b/Software/ChainLube/git_rev_macro.py @@ -0,0 +1,8 @@ +import subprocess + +revision = ( + subprocess.check_output(["git", "rev-parse", "--short=10", "HEAD"]) + .strip() + .decode("utf-8") +) +print("-DGIT_REV='\"%s\"'" % revision) \ No newline at end of file diff --git a/Software/ChainLube/platformio.ini b/Software/ChainLube/platformio.ini index 80ff1b8..e5e5e23 100644 --- a/Software/ChainLube/platformio.ini +++ b/Software/ChainLube/platformio.ini @@ -17,14 +17,17 @@ platform = espressif8266 board = d1_mini framework = arduino - -;upload_port = 192.168.0.20 -;upload_protocol = espota -;upload_flags = -; --auth="chainlube" -upload_protocol=esptool +upload_port = 10.0.1.90 +upload_protocol = espota +upload_flags = + --auth = ${wifi_cred.admin_pass} build_flags = + !python git_rev_macro.py + -DWIFI_SSID=${wifi_cred.wifi_ssid} + -DWIFI_PASSWORD=${wifi_cred.wifi_password} + -DADMIN_PASS=${wifi_cred.admin_pass} + ;-DDEBUG -fexceptions diff --git a/Software/ChainLube/wifi_credentials.example.ini b/Software/ChainLube/wifi_credentials.example.ini index 02982d7..4af929c 100644 --- a/Software/ChainLube/wifi_credentials.example.ini +++ b/Software/ChainLube/wifi_credentials.example.ini @@ -1,5 +1,4 @@ -[common] -build_flags = - -DWIFI_SSID='"Wifi-SSID"' - -DWIFI_PASSWORD='"Wifi-Password"' - -DADMIN_PASS='"adminpass"' \ No newline at end of file +[wifi_cred] +admin_pass = 'adminpass' +wifi_ssid = 'wifi-ssid' +wifi_password = 'wifi-pass' \ No newline at end of file