Skip to content

Commit 0ae17f4

Browse files
committed
Add support for filesystem.bin in firmware zips. Bump version. Add to version checking logic.
1 parent 0ce9414 commit 0ae17f4

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

esphomeflasher/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def run_esphomeflasher_args(args):
144144
addr_filename.append((offset, file_obj))
145145
if file_name.split(".", 1)[0].lower() == 'firmware':
146146
firmware = file_obj
147-
if file_name.split(".", 1)[0].lower() == 'spiffs' or file_name.split(".", 1)[0].lower() == 'littlefs':
147+
if file_name.split(".", 1)[0].lower() == 'spiffs' or file_name.split(".", 1)[0].lower() == 'littlefs' or file_name.split(".", 1)[0].lower() == 'filesystem':
148148
spiffs_start = offset
149149
filecount += 1
150150
print("File {}: {}, Offset: 0x{:04X}".format(filecount, file_name, offset))

esphomeflasher/const.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import re
22

3-
__version__ = "1.4.2"
3+
__version__ = "1.4.3"
44

55
FUJINET_FLASHER_VERSION_URL = "https://fujinet.online/firmware/flasher-current-ver.txt"
66

esphomeflasher/gui.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -383,13 +383,15 @@ def on_pick_file(event):
383383
def version_check():
384384
try:
385385
f = urllib.request.urlopen(FUJINET_FLASHER_VERSION_URL)
386-
current_ver = f.read().decode('utf-8').strip()
386+
latest_ver = f.read().decode('utf-8').strip()
387387
except urllib.error.URLError as e:
388388
print("Error getting version: {}".format(e))
389-
current_ver = __version__ # Fallback to current version if there is an error
389+
latest_ver = __version__ # Fallback to current version if there is an error
390390

391-
if __version__ != current_ver:
392-
self.flasher_ver_text.SetLabel("This version of FujiNet-Flasher is old, Please Update ({}->{})\n at https://fujinet.online/download".format(__version__, current_ver))
391+
if __version__ < latest_ver:
392+
self.flasher_ver_text.SetLabel("This version of FujiNet-Flasher is old, Please Update ({}->{})\n at https://fujinet.online/download".format(__version__, latest_ver))
393+
elif __version__ > latest_ver:
394+
self.flasher_ver_text.SetLabel("FujiNet-Flasher Version {} (pre-release)".format(__version__))
393395
else:
394396
self.flasher_ver_text.SetLabel("FujiNet-Flasher Version {}".format(__version__))
395397

0 commit comments

Comments
 (0)