Skip to content

Commit 7f5afaf

Browse files
BitMaker-hubBitMaker-hub
authored
Merge pull request #460 from valerio-vaccaro/240812-automagik_versioning
add automagic firmware version name
2 parents 9b07356 + 7678c3d commit 7f5afaf

File tree

3 files changed

+73
-2
lines changed

3 files changed

+73
-2
lines changed

‎auto_firmware_version.py

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import subprocess
2+
3+
Import("env")
4+
5+
def get_firmware_specifier_build_flag():
6+
ret = subprocess.run(["git", "describe"], stdout=subprocess.PIPE, text=True) #Uses only annotated tags
7+
#ret = subprocess.run(["git", "describe", "--tags"], stdout=subprocess.PIPE, text=True) #Uses any tags
8+
build_version = ret.stdout.strip()
9+
# fix unwanted and verbose tags
10+
build_version = build_version.replace('Release', '')
11+
build_flag = "-D AUTO_VERSION=\\\"" + build_version + "\\\""
12+
print ("Firmware Revision: " + build_version)
13+
return (build_flag)
14+
15+
env.Append(
16+
BUILD_FLAGS=[get_firmware_specifier_build_flag()]
17+
)

‎platformio.ini

+52
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ default_envs = NerdminerV2-T-HMI, wt32-sc01, wt32-sc01-plus, han_m5stack, M5Stic
1717
platform = espressif32@6.6.0
1818
board = m5stick-c
1919
framework = arduino
20+
extra_scripts =
21+
pre:auto_firmware_version.py
2022
monitor_filters =
2123
esp32_exception_decoder
2224
time
@@ -48,6 +50,8 @@ lib_ignore =
4850
platform = espressif32@6.6.0
4951
board = esp-wrover-kit
5052
framework = arduino
53+
extra_scripts =
54+
pre:auto_firmware_version.py
5155
monitor_filters =
5256
esp32_exception_decoder
5357
time
@@ -80,6 +84,8 @@ lib_ignore =
8084
platform = espressif32@6.6.0
8185
board = esp32-s3-devkitc-1
8286
framework = arduino
87+
extra_scripts =
88+
pre:auto_firmware_version.py
8389
monitor_filters =
8490
esp32_exception_decoder
8591
time
@@ -115,6 +121,8 @@ lib_ignore =
115121
platform = espressif32@6.6.0
116122
board = lolin_s3_mini
117123
framework = arduino
124+
extra_scripts =
125+
pre:auto_firmware_version.py
118126
monitor_filters =
119127
esp32_exception_decoder
120128
time
@@ -147,6 +155,8 @@ lib_ignore =
147155
platform = espressif32@6.6.0
148156
board = m5stack-core-esp32
149157
framework = arduino
158+
extra_scripts =
159+
pre:auto_firmware_version.py
150160
monitor_filters =
151161
esp32_exception_decoder
152162
time
@@ -177,6 +187,8 @@ lib_ignore =
177187
platform = espressif32@6.6.0
178188
board = lolin_s2_mini
179189
framework = arduino
190+
extra_scripts =
191+
pre:auto_firmware_version.py
180192
monitor_filters =
181193
esp32_exception_decoder
182194
time
@@ -206,6 +218,8 @@ lib_ignore =
206218
platform = espressif32@6.6.0
207219
board = lolin_s3_mini
208220
framework = arduino
221+
extra_scripts =
222+
pre:auto_firmware_version.py
209223
monitor_filters =
210224
esp32_exception_decoder
211225
time
@@ -241,6 +255,8 @@ lib_ignore =
241255
platform = espressif32@6.6.0
242256
board = esp32dev
243257
framework = arduino
258+
extra_scripts =
259+
pre:auto_firmware_version.py
244260
monitor_filters =
245261
esp32_exception_decoder
246262
time
@@ -270,6 +286,8 @@ lib_ignore =
270286
platform = espressif32@6.6.0
271287
board = seeed_xiao_esp32c3
272288
framework = arduino
289+
extra_scripts =
290+
pre:auto_firmware_version.py
273291
monitor_filters =
274292
esp32_exception_decoder
275293
time
@@ -300,6 +318,8 @@ lib_ignore =
300318
platform = espressif32@6.6.0
301319
board = esp32-c3-devkitm-1
302320
framework = arduino
321+
extra_scripts =
322+
pre:auto_firmware_version.py
303323
monitor_filters =
304324
esp32_exception_decoder
305325
time
@@ -331,6 +351,8 @@ lib_ignore =
331351
platform = espressif32@6.6.0
332352
board = esp32-s3-devkitc-1
333353
framework = arduino
354+
extra_scripts =
355+
pre:auto_firmware_version.py
334356
monitor_filters =
335357
esp32_exception_decoder
336358
time
@@ -363,6 +385,8 @@ lib_ignore =
363385
platform = espressif32@6.6.0
364386
board = esp32-s3-devkitc-1
365387
framework = arduino
388+
extra_scripts =
389+
pre:auto_firmware_version.py
366390
monitor_filters =
367391
esp32_exception_decoder
368392
time
@@ -397,6 +421,8 @@ lib_ignore =
397421
platform = espressif32@6.6.0
398422
board = esp32-s3-devkitc-1
399423
framework = arduino
424+
extra_scripts =
425+
pre:auto_firmware_version.py
400426
monitor_filters =
401427
esp32_exception_decoder
402428
time
@@ -431,6 +457,8 @@ lib_ignore =
431457
platform = espressif32@6.6.0
432458
board = esp32dev
433459
framework = arduino
460+
extra_scripts =
461+
pre:auto_firmware_version.py
434462
monitor_filters =
435463
esp32_exception_decoder
436464
time
@@ -458,6 +486,8 @@ lib_ignore =
458486
platform = espressif32@6.6.0
459487
board = esp32dev ;esp-wrover-kit
460488
framework = arduino
489+
extra_scripts =
490+
pre:auto_firmware_version.py
461491
monitor_filters =
462492
esp32_exception_decoder
463493
time
@@ -488,6 +518,8 @@ lib_ignore =
488518
platform = espressif32@6.6.0
489519
board = lilygo-t-amoled
490520
framework = arduino
521+
extra_scripts =
522+
pre:auto_firmware_version.py
491523
board_build.partitions = huge_app.csv
492524
build_flags =
493525
-DNERDMINER_S3_AMOLED
@@ -510,6 +542,8 @@ lib_ignore =
510542
platform = espressif32@6.6.0
511543
board = lilygo-t-amoled
512544
framework = arduino
545+
extra_scripts =
546+
pre:auto_firmware_version.py
513547
board_build.partitions = huge_app.csv
514548
build_flags =
515549
-DNERDMINER_S3_AMOLED
@@ -532,6 +566,8 @@ lib_ignore =
532566
platform = espressif32@6.6.0
533567
board = esp32-s3-devkitc-1
534568
framework = arduino
569+
extra_scripts =
570+
pre:auto_firmware_version.py
535571
board_build.partitions = huge_app.csv
536572
build_flags =
537573
-DNERDMINER_S3_DONGLE
@@ -555,6 +591,8 @@ lib_ignore =
555591
platform = espressif32@6.6.0
556592
board = esp32-s3-devkitc-1
557593
framework = arduino
594+
extra_scripts =
595+
pre:auto_firmware_version.py
558596
board_build.partitions = huge_app.csv
559597
build_flags =
560598
-DNERDMINER_S3_GEEK
@@ -581,6 +619,8 @@ lib_ignore =
581619
platform = espressif32@6.6.0 ;(ESP32-D0WD-V3)
582620
board = esp32cam
583621
framework = arduino
622+
extra_scripts =
623+
pre:auto_firmware_version.py
584624
monitor_filters =
585625
esp32_exception_decoder
586626
time
@@ -610,6 +650,8 @@ lib_ignore =
610650
platform = espressif32@6.6.0
611651
board = esp32-s3-t-qt-pro
612652
framework = arduino
653+
extra_scripts =
654+
pre:auto_firmware_version.py
613655
monitor_filters =
614656
esp32_exception_decoder
615657
time
@@ -639,6 +681,8 @@ lib_ignore =
639681
platform = espressif32@6.6.0
640682
board = esp32dev
641683
framework = arduino
684+
extra_scripts =
685+
pre:auto_firmware_version.py
642686
monitor_speed = 115200
643687
upload_speed = 921600
644688
;build_type = debug
@@ -687,6 +731,8 @@ lib_ignore =
687731
platform = espressif32@6.6.0
688732
board = esp32dev
689733
framework = arduino
734+
extra_scripts =
735+
pre:auto_firmware_version.py
690736
monitor_speed = 115200
691737
monitor_filters =
692738
esp32_exception_decoder
@@ -740,6 +786,8 @@ lib_ignore =
740786
platform = espressif32@6.6.0
741787
board = lilygo-t-hmi
742788
framework = arduino
789+
extra_scripts =
790+
pre:auto_firmware_version.py
743791
board_build.partitions = default_16MB.csv
744792
monitor_filters =
745793
esp32_exception_decoder
@@ -777,6 +825,8 @@ lib_ignore =
777825
platform = espressif32@6.6.0
778826
board = ttgo-lora32-v1
779827
framework = arduino
828+
extra_scripts =
829+
pre:auto_firmware_version.py
780830
monitor_speed = 115200
781831
upload_speed = 115200
782832
board_build.partitions = huge_app.csv
@@ -798,6 +848,8 @@ lib_ignore =
798848
platform = espressif32@6.6.0
799849
board = m5stack-stamps3
800850
framework = arduino
851+
extra_scripts =
852+
pre:auto_firmware_version.py
801853
monitor_filters =
802854
esp32_exception_decoder
803855
time

‎src/drivers/displays/wt32DisplayDriver.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,12 @@ void wt32Display_NoScreen(unsigned long mElapsed)
323323
void wt32Display_LoadingScreen(void)
324324
{
325325
Serial.println("Initializing...");
326+
Serial.print("Firmware Version: ");
327+
Serial.println(AUTO_VERSION);
326328
lv_label_set_text(ui_lblssid, "SSID HanSoloAP");
327329
lv_label_set_text(ui_lblpassword, "Password MineYourCoins");
328-
lv_label_set_text(ui_lblversion, "Version 1.6.4 (RC1)");
329-
_ui_screen_change(&ui_HomeScreen, LV_SCR_LOAD_ANIM_FADE_ON, 500, 0, &ui_HomeScreen_screen_init);
330+
lv_label_set_text(ui_lblversion, AUTO_VERSION);
331+
_ui_screen_change(&ui_HomeScreen, LV_SCR_LOAD_ANIM_FADE_ON, 2000, 0, &ui_HomeScreen_screen_init);
330332
}
331333

332334
void wt32Display_SetupScreen(void)

0 commit comments

Comments
 (0)