From 3a361920770748582c580d0c22fe109b56d9a14b Mon Sep 17 00:00:00 2001 From: Francis Duvivier Date: Tue, 13 Feb 2024 23:46:29 +0100 Subject: [PATCH 1/5] Fix woezel files in order to use consts.WOEZEL_WEB_SERVER instead of using badge.team hardcoded which is not correct anymore --- .../flipdotter/dashboard/resources/woezel_repo.py | 4 ++-- firmware/python_modules/flipdotter/woezel.py | 8 +++++--- firmware/python_modules/fri3d2018/woezel.py | 9 ++++++--- .../generic/dashboard/resources/woezel_repo.py | 4 ++-- .../hsnl/dashboard/resources/woezel_repo.py | 4 ++-- firmware/python_modules/hsnl/woezel.py | 6 +++--- .../m5stack_atom/dashboard/resources/woezel_repo.py | 4 ++-- .../newline2020/dashboard/resources/woezel_repo.py | 4 ++-- firmware/python_modules/ohs2018/woezel.py | 8 +++++--- .../openaars/dashboard/resources/woezel_repo.py | 4 ++-- firmware/python_modules/openaars/woezel.py | 9 +++++---- firmware/python_modules/pixel/installer_term.py | 2 +- .../renze_nfc/dashboard/resources/woezel_repo.py | 4 ++-- firmware/python_modules/renze_nfc/woezel.py | 9 +++++---- firmware/python_modules/sha2017/woezel.py | 6 +++--- firmware/python_modules/troopers2019/installer_term.py | 2 +- firmware/python_modules/troopers2019/woezel.py | 9 +++++---- .../ttgo-tdisplay/dashboard/resources/woezel_repo.py | 4 ++-- firmware/python_modules/ttgo/woezel.py | 9 +++++---- firmware/python_modules/wrover_kit/installer_term.py | 2 +- firmware/python_modules/wrover_kit/woezel.py | 9 +++++---- 21 files changed, 66 insertions(+), 54 deletions(-) diff --git a/firmware/python_modules/flipdotter/dashboard/resources/woezel_repo.py b/firmware/python_modules/flipdotter/dashboard/resources/woezel_repo.py index 2e10177a..a1cdcb49 100644 --- a/firmware/python_modules/flipdotter/dashboard/resources/woezel_repo.py +++ b/firmware/python_modules/flipdotter/dashboard/resources/woezel_repo.py @@ -33,7 +33,7 @@ def update(): return False _showProgress("Downloading categories...") try: - request = urequests.get("https://badge.team/eggs/categories/json", timeout=30) + request = urequests.get("https://%s/eggs/categories/json" % consts.WOEZEL_WEB_SERVER, timeout=30) _showProgress("Saving categories...") categories_file = open(path+'/categories.json', 'w') categories_file.write(request.text) @@ -44,7 +44,7 @@ def update(): gc.collect() slug = category["slug"] _showProgress("Downloading '"+category["name"]+"'...") - f = urequests.get("https://badge.team/basket/"+consts.INFO_HARDWARE_WOEZEL_NAME+"/category/%s/json" % slug, timeout=30) + f = urequests.get("https://%s/basket/%s/category/%s/json" % (consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, slug), timeout=30) f_file = open(path+'/'+slug+'.json', 'w') f_file.write(f.text) f_file.close() diff --git a/firmware/python_modules/flipdotter/woezel.py b/firmware/python_modules/flipdotter/woezel.py index 56dce32f..90e49603 100644 --- a/firmware/python_modules/flipdotter/woezel.py +++ b/firmware/python_modules/flipdotter/woezel.py @@ -5,6 +5,8 @@ import ujson as json import uzlib import upip_utarfile as tarfile +import consts + gc.collect() debug = False @@ -147,21 +149,21 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/%s/json" % name) + f = url_open("https://%s/eggs/get/%s/json" % (consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/hackerhotel2019/list/json") + f = url_open("https://%s/basket/hackerhotel2019/list/json" % (consts.WOEZEL_WEB_SERVER)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/hackerhotel2019/search/%s/json" % query) + f = url_open("https://%s/basket/hackerhotel2019/search/%s/json" % (consts.WOEZEL_WEB_SERVER, query)) try: return json.load(f) finally: diff --git a/firmware/python_modules/fri3d2018/woezel.py b/firmware/python_modules/fri3d2018/woezel.py index 56dce32f..725effa0 100644 --- a/firmware/python_modules/fri3d2018/woezel.py +++ b/firmware/python_modules/fri3d2018/woezel.py @@ -5,6 +5,8 @@ import ujson as json import uzlib import upip_utarfile as tarfile +import consts + gc.collect() debug = False @@ -146,22 +148,23 @@ def url_open(url): return s + def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/%s/json" % name) + f = url_open("https://{}/eggs/get/{}/json".format(consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/hackerhotel2019/list/json") + f = url_open("https://{}/basket/{}/list/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/hackerhotel2019/search/%s/json" % query) + f = url_open("https://{}/basket/{}/search/{}/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, query)) try: return json.load(f) finally: diff --git a/firmware/python_modules/generic/dashboard/resources/woezel_repo.py b/firmware/python_modules/generic/dashboard/resources/woezel_repo.py index 2e10177a..a1cdcb49 100644 --- a/firmware/python_modules/generic/dashboard/resources/woezel_repo.py +++ b/firmware/python_modules/generic/dashboard/resources/woezel_repo.py @@ -33,7 +33,7 @@ def update(): return False _showProgress("Downloading categories...") try: - request = urequests.get("https://badge.team/eggs/categories/json", timeout=30) + request = urequests.get("https://%s/eggs/categories/json" % consts.WOEZEL_WEB_SERVER, timeout=30) _showProgress("Saving categories...") categories_file = open(path+'/categories.json', 'w') categories_file.write(request.text) @@ -44,7 +44,7 @@ def update(): gc.collect() slug = category["slug"] _showProgress("Downloading '"+category["name"]+"'...") - f = urequests.get("https://badge.team/basket/"+consts.INFO_HARDWARE_WOEZEL_NAME+"/category/%s/json" % slug, timeout=30) + f = urequests.get("https://%s/basket/%s/category/%s/json" % (consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, slug), timeout=30) f_file = open(path+'/'+slug+'.json', 'w') f_file.write(f.text) f_file.close() diff --git a/firmware/python_modules/hsnl/dashboard/resources/woezel_repo.py b/firmware/python_modules/hsnl/dashboard/resources/woezel_repo.py index 2e10177a..a1cdcb49 100644 --- a/firmware/python_modules/hsnl/dashboard/resources/woezel_repo.py +++ b/firmware/python_modules/hsnl/dashboard/resources/woezel_repo.py @@ -33,7 +33,7 @@ def update(): return False _showProgress("Downloading categories...") try: - request = urequests.get("https://badge.team/eggs/categories/json", timeout=30) + request = urequests.get("https://%s/eggs/categories/json" % consts.WOEZEL_WEB_SERVER, timeout=30) _showProgress("Saving categories...") categories_file = open(path+'/categories.json', 'w') categories_file.write(request.text) @@ -44,7 +44,7 @@ def update(): gc.collect() slug = category["slug"] _showProgress("Downloading '"+category["name"]+"'...") - f = urequests.get("https://badge.team/basket/"+consts.INFO_HARDWARE_WOEZEL_NAME+"/category/%s/json" % slug, timeout=30) + f = urequests.get("https://%s/basket/%s/category/%s/json" % (consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, slug), timeout=30) f_file = open(path+'/'+slug+'.json', 'w') f_file.write(f.text) f_file.close() diff --git a/firmware/python_modules/hsnl/woezel.py b/firmware/python_modules/hsnl/woezel.py index 56dce32f..398c68df 100644 --- a/firmware/python_modules/hsnl/woezel.py +++ b/firmware/python_modules/hsnl/woezel.py @@ -147,21 +147,21 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/%s/json" % name) + f = url_open("https://{}/eggs/get/{}/json".format(consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/hackerhotel2019/list/json") + f = url_open("https://{}/basket/{}/list/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/hackerhotel2019/search/%s/json" % query) + f = url_open("https://{}/basket/{}/search/{}/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, query)) try: return json.load(f) finally: diff --git a/firmware/python_modules/m5stack_atom/dashboard/resources/woezel_repo.py b/firmware/python_modules/m5stack_atom/dashboard/resources/woezel_repo.py index 2e10177a..a1cdcb49 100644 --- a/firmware/python_modules/m5stack_atom/dashboard/resources/woezel_repo.py +++ b/firmware/python_modules/m5stack_atom/dashboard/resources/woezel_repo.py @@ -33,7 +33,7 @@ def update(): return False _showProgress("Downloading categories...") try: - request = urequests.get("https://badge.team/eggs/categories/json", timeout=30) + request = urequests.get("https://%s/eggs/categories/json" % consts.WOEZEL_WEB_SERVER, timeout=30) _showProgress("Saving categories...") categories_file = open(path+'/categories.json', 'w') categories_file.write(request.text) @@ -44,7 +44,7 @@ def update(): gc.collect() slug = category["slug"] _showProgress("Downloading '"+category["name"]+"'...") - f = urequests.get("https://badge.team/basket/"+consts.INFO_HARDWARE_WOEZEL_NAME+"/category/%s/json" % slug, timeout=30) + f = urequests.get("https://%s/basket/%s/category/%s/json" % (consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, slug), timeout=30) f_file = open(path+'/'+slug+'.json', 'w') f_file.write(f.text) f_file.close() diff --git a/firmware/python_modules/newline2020/dashboard/resources/woezel_repo.py b/firmware/python_modules/newline2020/dashboard/resources/woezel_repo.py index 2e10177a..a1cdcb49 100644 --- a/firmware/python_modules/newline2020/dashboard/resources/woezel_repo.py +++ b/firmware/python_modules/newline2020/dashboard/resources/woezel_repo.py @@ -33,7 +33,7 @@ def update(): return False _showProgress("Downloading categories...") try: - request = urequests.get("https://badge.team/eggs/categories/json", timeout=30) + request = urequests.get("https://%s/eggs/categories/json" % consts.WOEZEL_WEB_SERVER, timeout=30) _showProgress("Saving categories...") categories_file = open(path+'/categories.json', 'w') categories_file.write(request.text) @@ -44,7 +44,7 @@ def update(): gc.collect() slug = category["slug"] _showProgress("Downloading '"+category["name"]+"'...") - f = urequests.get("https://badge.team/basket/"+consts.INFO_HARDWARE_WOEZEL_NAME+"/category/%s/json" % slug, timeout=30) + f = urequests.get("https://%s/basket/%s/category/%s/json" % (consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, slug), timeout=30) f_file = open(path+'/'+slug+'.json', 'w') f_file.write(f.text) f_file.close() diff --git a/firmware/python_modules/ohs2018/woezel.py b/firmware/python_modules/ohs2018/woezel.py index 209516e2..a3958a62 100644 --- a/firmware/python_modules/ohs2018/woezel.py +++ b/firmware/python_modules/ohs2018/woezel.py @@ -5,6 +5,8 @@ import ujson as json import uzlib import upip_utarfile as tarfile +import consts + gc.collect() debug = False @@ -147,21 +149,21 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/%s/json" % name) + f = url_open("https://{}/eggs/get/{}/json".format(consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/sha2017/list/json") + f = url_open("https://{}/basket/{}/list/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/sha2017/search/%s/json" % query) + f = url_open("https://{}/basket/{}/search/{}/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, query)) try: return json.load(f) finally: diff --git a/firmware/python_modules/openaars/dashboard/resources/woezel_repo.py b/firmware/python_modules/openaars/dashboard/resources/woezel_repo.py index 2e10177a..a1cdcb49 100644 --- a/firmware/python_modules/openaars/dashboard/resources/woezel_repo.py +++ b/firmware/python_modules/openaars/dashboard/resources/woezel_repo.py @@ -33,7 +33,7 @@ def update(): return False _showProgress("Downloading categories...") try: - request = urequests.get("https://badge.team/eggs/categories/json", timeout=30) + request = urequests.get("https://%s/eggs/categories/json" % consts.WOEZEL_WEB_SERVER, timeout=30) _showProgress("Saving categories...") categories_file = open(path+'/categories.json', 'w') categories_file.write(request.text) @@ -44,7 +44,7 @@ def update(): gc.collect() slug = category["slug"] _showProgress("Downloading '"+category["name"]+"'...") - f = urequests.get("https://badge.team/basket/"+consts.INFO_HARDWARE_WOEZEL_NAME+"/category/%s/json" % slug, timeout=30) + f = urequests.get("https://%s/basket/%s/category/%s/json" % (consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, slug), timeout=30) f_file = open(path+'/'+slug+'.json', 'w') f_file.write(f.text) f_file.close() diff --git a/firmware/python_modules/openaars/woezel.py b/firmware/python_modules/openaars/woezel.py index 56dce32f..b35b7b4c 100644 --- a/firmware/python_modules/openaars/woezel.py +++ b/firmware/python_modules/openaars/woezel.py @@ -5,6 +5,8 @@ import ujson as json import uzlib import upip_utarfile as tarfile +import consts + gc.collect() debug = False @@ -147,26 +149,25 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/%s/json" % name) + f = url_open("https://{}/eggs/get/{}/json".format(consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/hackerhotel2019/list/json") + f = url_open("https://{}/basket/{}/list/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/hackerhotel2019/search/%s/json" % query) + f = url_open("https://{}/basket/{}/search/{}/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, query)) try: return json.load(f) finally: f.close() - def fatal(msg, exc=None): print("Error:", msg) if exc and debug: diff --git a/firmware/python_modules/pixel/installer_term.py b/firmware/python_modules/pixel/installer_term.py index 5ebcfdef..24aaf933 100644 --- a/firmware/python_modules/pixel/installer_term.py +++ b/firmware/python_modules/pixel/installer_term.py @@ -1,4 +1,4 @@ -import network, term, appglue, sys, badge, version, time,json, gc, urequests, easydraw +import network, term, appglue, sys, badge, version, time,json, gc, urequests, easydraw, consts easydraw.msg("This app can only be controlled using the USB-serial connection.", "Notice", True) diff --git a/firmware/python_modules/renze_nfc/dashboard/resources/woezel_repo.py b/firmware/python_modules/renze_nfc/dashboard/resources/woezel_repo.py index 2e10177a..a1cdcb49 100644 --- a/firmware/python_modules/renze_nfc/dashboard/resources/woezel_repo.py +++ b/firmware/python_modules/renze_nfc/dashboard/resources/woezel_repo.py @@ -33,7 +33,7 @@ def update(): return False _showProgress("Downloading categories...") try: - request = urequests.get("https://badge.team/eggs/categories/json", timeout=30) + request = urequests.get("https://%s/eggs/categories/json" % consts.WOEZEL_WEB_SERVER, timeout=30) _showProgress("Saving categories...") categories_file = open(path+'/categories.json', 'w') categories_file.write(request.text) @@ -44,7 +44,7 @@ def update(): gc.collect() slug = category["slug"] _showProgress("Downloading '"+category["name"]+"'...") - f = urequests.get("https://badge.team/basket/"+consts.INFO_HARDWARE_WOEZEL_NAME+"/category/%s/json" % slug, timeout=30) + f = urequests.get("https://%s/basket/%s/category/%s/json" % (consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, slug), timeout=30) f_file = open(path+'/'+slug+'.json', 'w') f_file.write(f.text) f_file.close() diff --git a/firmware/python_modules/renze_nfc/woezel.py b/firmware/python_modules/renze_nfc/woezel.py index 56dce32f..c65b5d1e 100644 --- a/firmware/python_modules/renze_nfc/woezel.py +++ b/firmware/python_modules/renze_nfc/woezel.py @@ -5,6 +5,8 @@ import ujson as json import uzlib import upip_utarfile as tarfile + +import consts gc.collect() debug = False @@ -147,26 +149,25 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/%s/json" % name) + f = url_open("https://{}/eggs/get/{}/json".format(consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/hackerhotel2019/list/json") + f = url_open("https://{}/basket/{}/list/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/hackerhotel2019/search/%s/json" % query) + f = url_open("https://{}/basket/{}/search/{}/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, query)) try: return json.load(f) finally: f.close() - def fatal(msg, exc=None): print("Error:", msg) if exc and debug: diff --git a/firmware/python_modules/sha2017/woezel.py b/firmware/python_modules/sha2017/woezel.py index c1105459..6376a653 100644 --- a/firmware/python_modules/sha2017/woezel.py +++ b/firmware/python_modules/sha2017/woezel.py @@ -148,21 +148,21 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/{}/json".format(name)) + f = url_open("https://{}/eggs/get/{}/json".format(consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/{}/list/json".format(consts.INFO_HARDWARE_WOEZEL_NAME)) + f = url_open("https://{}/basket/{}/list/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/{}/search/{}/json".format(consts.INFO_HARDWARE_WOEZEL_NAME, query)) + f = url_open("https://{}/basket/{}/search/{}/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, query)) try: return json.load(f) finally: diff --git a/firmware/python_modules/troopers2019/installer_term.py b/firmware/python_modules/troopers2019/installer_term.py index cc63394c..206ab405 100644 --- a/firmware/python_modules/troopers2019/installer_term.py +++ b/firmware/python_modules/troopers2019/installer_term.py @@ -1,4 +1,4 @@ -import network, term, appglue, sys, badge, version, time,json, gc, urequests, easydraw +import network, term, appglue, sys, badge, version, time,json, gc, urequests, easydraw, consts easydraw.msg("This app can only be controlled using the USB-serial connection.", "Notice", True) diff --git a/firmware/python_modules/troopers2019/woezel.py b/firmware/python_modules/troopers2019/woezel.py index 209516e2..b35b7b4c 100644 --- a/firmware/python_modules/troopers2019/woezel.py +++ b/firmware/python_modules/troopers2019/woezel.py @@ -5,6 +5,8 @@ import ujson as json import uzlib import upip_utarfile as tarfile +import consts + gc.collect() debug = False @@ -147,26 +149,25 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/%s/json" % name) + f = url_open("https://{}/eggs/get/{}/json".format(consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/sha2017/list/json") + f = url_open("https://{}/basket/{}/list/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/sha2017/search/%s/json" % query) + f = url_open("https://{}/basket/{}/search/{}/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, query)) try: return json.load(f) finally: f.close() - def fatal(msg, exc=None): print("Error:", msg) if exc and debug: diff --git a/firmware/python_modules/ttgo-tdisplay/dashboard/resources/woezel_repo.py b/firmware/python_modules/ttgo-tdisplay/dashboard/resources/woezel_repo.py index 2e10177a..a1cdcb49 100644 --- a/firmware/python_modules/ttgo-tdisplay/dashboard/resources/woezel_repo.py +++ b/firmware/python_modules/ttgo-tdisplay/dashboard/resources/woezel_repo.py @@ -33,7 +33,7 @@ def update(): return False _showProgress("Downloading categories...") try: - request = urequests.get("https://badge.team/eggs/categories/json", timeout=30) + request = urequests.get("https://%s/eggs/categories/json" % consts.WOEZEL_WEB_SERVER, timeout=30) _showProgress("Saving categories...") categories_file = open(path+'/categories.json', 'w') categories_file.write(request.text) @@ -44,7 +44,7 @@ def update(): gc.collect() slug = category["slug"] _showProgress("Downloading '"+category["name"]+"'...") - f = urequests.get("https://badge.team/basket/"+consts.INFO_HARDWARE_WOEZEL_NAME+"/category/%s/json" % slug, timeout=30) + f = urequests.get("https://%s/basket/%s/category/%s/json" % (consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, slug), timeout=30) f_file = open(path+'/'+slug+'.json', 'w') f_file.write(f.text) f_file.close() diff --git a/firmware/python_modules/ttgo/woezel.py b/firmware/python_modules/ttgo/woezel.py index 56dce32f..b35b7b4c 100644 --- a/firmware/python_modules/ttgo/woezel.py +++ b/firmware/python_modules/ttgo/woezel.py @@ -5,6 +5,8 @@ import ujson as json import uzlib import upip_utarfile as tarfile +import consts + gc.collect() debug = False @@ -147,26 +149,25 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/%s/json" % name) + f = url_open("https://{}/eggs/get/{}/json".format(consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/hackerhotel2019/list/json") + f = url_open("https://{}/basket/{}/list/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/hackerhotel2019/search/%s/json" % query) + f = url_open("https://{}/basket/{}/search/{}/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, query)) try: return json.load(f) finally: f.close() - def fatal(msg, exc=None): print("Error:", msg) if exc and debug: diff --git a/firmware/python_modules/wrover_kit/installer_term.py b/firmware/python_modules/wrover_kit/installer_term.py index 79d983e9..949881ba 100644 --- a/firmware/python_modules/wrover_kit/installer_term.py +++ b/firmware/python_modules/wrover_kit/installer_term.py @@ -1,4 +1,4 @@ -import network, term, appglue, sys, badge, version, time,json, gc, urequests, easydraw +import network, term, appglue, sys, badge, version, time,json, gc, urequests, easydraw, consts easydraw.msg("This app can only be controlled using the USB-serial connection.", "Notice", True) diff --git a/firmware/python_modules/wrover_kit/woezel.py b/firmware/python_modules/wrover_kit/woezel.py index 56dce32f..b35b7b4c 100644 --- a/firmware/python_modules/wrover_kit/woezel.py +++ b/firmware/python_modules/wrover_kit/woezel.py @@ -5,6 +5,8 @@ import ujson as json import uzlib import upip_utarfile as tarfile +import consts + gc.collect() debug = False @@ -147,26 +149,25 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.team/eggs/get/%s/json" % name) + f = url_open("https://{}/eggs/get/{}/json".format(consts.WOEZEL_WEB_SERVER, name)) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.team/basket/hackerhotel2019/list/json") + f = url_open("https://{}/basket/{}/list/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME)) try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.team/basket/hackerhotel2019/search/%s/json" % query) + f = url_open("https://{}/basket/{}/search/{}/json".format(consts.WOEZEL_WEB_SERVER, consts.INFO_HARDWARE_WOEZEL_NAME, query)) try: return json.load(f) finally: f.close() - def fatal(msg, exc=None): print("Error:", msg) if exc and debug: From 7cffd2e546e84339346cdf51e79fc9bf21e41ff9 Mon Sep 17 00:00:00 2001 From: Francis Duvivier Date: Tue, 13 Feb 2024 23:50:42 +0100 Subject: [PATCH 2/5] Fix using WOEZEL config in version.py for pixel and wrover_kit --- firmware/python_modules/pixel/version.py | 6 +++--- firmware/python_modules/wrover_kit/version.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/python_modules/pixel/version.py b/firmware/python_modules/pixel/version.py index 6cb91106..12f27f9d 100644 --- a/firmware/python_modules/pixel/version.py +++ b/firmware/python_modules/pixel/version.py @@ -1,4 +1,4 @@ -import defines +import defines,consts build = 1 name = "Harry Potter" @@ -8,5 +8,5 @@ btn_ok = defines.BTN_A btn_cancel = defines.BTN_B -hatcheryurl = "https://badge.team" -otacheckurl = "https://badge.team/version" +hatcheryurl = "https://"+consts.WOEZEL_WEB_SERVER +otacheckurl = consts.OTA_WEB_PROTOCOL+"://"+consts.OTA_WEB_SERVER+":"+consts.OTA_WEB_PORT+consts.OTA_WEB_VERSION_PATH diff --git a/firmware/python_modules/wrover_kit/version.py b/firmware/python_modules/wrover_kit/version.py index 89e594c3..a0a14e69 100644 --- a/firmware/python_modules/wrover_kit/version.py +++ b/firmware/python_modules/wrover_kit/version.py @@ -1,4 +1,4 @@ -import ugfx, badge +import ugfx, badge, consts build = 0 name = "FIXME" @@ -19,5 +19,5 @@ btn_ok = ugfx.BTN_START btn_cancel = ugfx.BTN_B -hatcheryurl = "https://badge.team" -otacheckurl = "https://badge.team/version-hackerhotel2019" +hatcheryurl = "https://"+consts.WOEZEL_WEB_SERVER +otacheckurl = consts.OTA_WEB_PROTOCOL+"://"+consts.OTA_WEB_SERVER+":"+consts.OTA_WEB_PORT+consts.OTA_WEB_VERSION_PATH From bc216ff28e972df03b6f3e2b07bb32528803f81e Mon Sep 17 00:00:00 2001 From: Francis Duvivier Date: Tue, 13 Feb 2024 23:51:44 +0100 Subject: [PATCH 3/5] Replace all CONFIG_OTA_WEB_SERVER="badge.team" with CONFIG_OTA_WEB_SERVER="ota.badge.team" --- firmware/configs/brucon2018_defconfig | 2 +- firmware/configs/brucon2019_defconfig | 2 +- firmware/configs/disobey2019_defconfig | 2 +- firmware/configs/flipdotter_defconfig | 2 +- firmware/configs/fri3d2018_defconfig | 2 +- firmware/configs/generic_defconfig | 2 +- firmware/configs/hsnl_defconfig | 2 +- firmware/configs/m5stack_atom_defconfig | 2 +- firmware/configs/odroidgo_defconfig | 2 +- firmware/configs/ohs2018_defconfig | 2 +- firmware/configs/openaars_defconfig | 2 +- firmware/configs/renze_nfc_defconfig | 2 +- firmware/configs/t8_defconfig | 2 +- firmware/configs/troopers2019_defconfig | 2 +- firmware/configs/ttgo_lora_defconfig | 2 +- firmware/configs/ttgo_t4_defconfig | 2 +- firmware/configs/ttgo_tm_music_defconfig | 2 +- firmware/configs/wrover_kit_defconfig | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/firmware/configs/brucon2018_defconfig b/firmware/configs/brucon2018_defconfig index 4dd7cfa8..bc9fd89a 100644 --- a/firmware/configs/brucon2018_defconfig +++ b/firmware/configs/brucon2018_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=19120801 CONFIG_INFO_HARDWARE_NAME="Generic ESP32" CONFIG_INFO_HARDWARE_FOLDER="generic" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" diff --git a/firmware/configs/brucon2019_defconfig b/firmware/configs/brucon2019_defconfig index cc45d804..536f3773 100644 --- a/firmware/configs/brucon2019_defconfig +++ b/firmware/configs/brucon2019_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=2019091401 CONFIG_INFO_HARDWARE_NAME="ESP32" CONFIG_INFO_HARDWARE_FOLDER="generic" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" diff --git a/firmware/configs/disobey2019_defconfig b/firmware/configs/disobey2019_defconfig index c431625c..1accea51 100644 --- a/firmware/configs/disobey2019_defconfig +++ b/firmware/configs/disobey2019_defconfig @@ -88,7 +88,7 @@ CONFIG_INFO_FIRMWARE_BUILD=21081401 CONFIG_INFO_HARDWARE_NAME="Disobey 2019" CONFIG_INFO_HARDWARE_FOLDER="disobey2019" CONFIG_INFO_HARDWARE_WOEZEL_NAME="disobey2019" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/disobey2019.bin" diff --git a/firmware/configs/flipdotter_defconfig b/firmware/configs/flipdotter_defconfig index 0851f909..34063a86 100644 --- a/firmware/configs/flipdotter_defconfig +++ b/firmware/configs/flipdotter_defconfig @@ -88,7 +88,7 @@ CONFIG_INFO_FIRMWARE_BUILD=20041001 CONFIG_INFO_HARDWARE_NAME="FlipDot" CONFIG_INFO_HARDWARE_FOLDER="flipdotter" CONFIG_INFO_HARDWARE_WOEZEL_NAME="flipdotter" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/flipdotter.bin" diff --git a/firmware/configs/fri3d2018_defconfig b/firmware/configs/fri3d2018_defconfig index 0c5eb3ce..fa0626df 100644 --- a/firmware/configs/fri3d2018_defconfig +++ b/firmware/configs/fri3d2018_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=2019091401 CONFIG_INFO_HARDWARE_NAME="Fri3d camp 2018" CONFIG_INFO_HARDWARE_FOLDER="fri3d2018" CONFIG_INFO_HARDWARE_WOEZEL_NAME="fri3d2018" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/fri3d2018.bin" diff --git a/firmware/configs/generic_defconfig b/firmware/configs/generic_defconfig index c9ebc913..2054be26 100644 --- a/firmware/configs/generic_defconfig +++ b/firmware/configs/generic_defconfig @@ -88,7 +88,7 @@ CONFIG_INFO_FIRMWARE_BUILD=19120801 CONFIG_INFO_HARDWARE_NAME="Generic ESP32" CONFIG_INFO_HARDWARE_FOLDER="generic" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" diff --git a/firmware/configs/hsnl_defconfig b/firmware/configs/hsnl_defconfig index dcd626e5..768f30e0 100644 --- a/firmware/configs/hsnl_defconfig +++ b/firmware/configs/hsnl_defconfig @@ -88,7 +88,7 @@ CONFIG_INFO_FIRMWARE_BUILD=20011101 CONFIG_INFO_HARDWARE_NAME="HSNL" CONFIG_INFO_HARDWARE_FOLDER="hsnl" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/hsnl.bin" diff --git a/firmware/configs/m5stack_atom_defconfig b/firmware/configs/m5stack_atom_defconfig index aea5ddc3..93570cdf 100644 --- a/firmware/configs/m5stack_atom_defconfig +++ b/firmware/configs/m5stack_atom_defconfig @@ -88,7 +88,7 @@ CONFIG_INFO_FIRMWARE_BUILD=20041701 CONFIG_INFO_HARDWARE_NAME="M5STACK ATOM Matrix" CONFIG_INFO_HARDWARE_FOLDER="m5stack_atom" CONFIG_INFO_HARDWARE_WOEZEL_NAME="m5stack_atom" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/m5stack_atom.bin" diff --git a/firmware/configs/odroidgo_defconfig b/firmware/configs/odroidgo_defconfig index e06b2659..f99bb172 100644 --- a/firmware/configs/odroidgo_defconfig +++ b/firmware/configs/odroidgo_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=0 CONFIG_INFO_HARDWARE_NAME="ODROID Go" CONFIG_INFO_HARDWARE_FOLDER="generic" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/odroidgo.bin" diff --git a/firmware/configs/ohs2018_defconfig b/firmware/configs/ohs2018_defconfig index 38dc007a..2cf67484 100644 --- a/firmware/configs/ohs2018_defconfig +++ b/firmware/configs/ohs2018_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=2019091401 CONFIG_INFO_HARDWARE_NAME="OHS2018" CONFIG_INFO_HARDWARE_FOLDER="ohs2018" CONFIG_INFO_HARDWARE_WOEZEL_NAME="ohs2018" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/ohs2018.bin" diff --git a/firmware/configs/openaars_defconfig b/firmware/configs/openaars_defconfig index d97c4ebf..b579cbb8 100644 --- a/firmware/configs/openaars_defconfig +++ b/firmware/configs/openaars_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=19121401 CONFIG_INFO_HARDWARE_NAME="OpenAARS" CONFIG_INFO_HARDWARE_FOLDER="openaars" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/openaars.bin" diff --git a/firmware/configs/renze_nfc_defconfig b/firmware/configs/renze_nfc_defconfig index 22a2725d..4472192e 100644 --- a/firmware/configs/renze_nfc_defconfig +++ b/firmware/configs/renze_nfc_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=2019091401 CONFIG_INFO_HARDWARE_NAME="ESP32" CONFIG_INFO_HARDWARE_FOLDER="renze_nfc" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" diff --git a/firmware/configs/t8_defconfig b/firmware/configs/t8_defconfig index 37905834..c0fb6c6d 100644 --- a/firmware/configs/t8_defconfig +++ b/firmware/configs/t8_defconfig @@ -88,7 +88,7 @@ CONFIG_INFO_FIRMWARE_BUILD=19120801 CONFIG_INFO_HARDWARE_NAME="Generic ESP32" CONFIG_INFO_HARDWARE_FOLDER="generic" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" diff --git a/firmware/configs/troopers2019_defconfig b/firmware/configs/troopers2019_defconfig index 4065be01..f18350f3 100644 --- a/firmware/configs/troopers2019_defconfig +++ b/firmware/configs/troopers2019_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=2019091401 CONFIG_INFO_HARDWARE_NAME="Troopers 2019" CONFIG_INFO_HARDWARE_FOLDER="troopers2019" CONFIG_INFO_HARDWARE_WOEZEL_NAME="troopers2019" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/troopers2019.bin" diff --git a/firmware/configs/ttgo_lora_defconfig b/firmware/configs/ttgo_lora_defconfig index a5e9ad1a..dbff14f1 100644 --- a/firmware/configs/ttgo_lora_defconfig +++ b/firmware/configs/ttgo_lora_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=2019091401 CONFIG_INFO_HARDWARE_NAME="TTGO LoRa" CONFIG_INFO_HARDWARE_FOLDER="generic" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/ttgo-lora.bin" diff --git a/firmware/configs/ttgo_t4_defconfig b/firmware/configs/ttgo_t4_defconfig index c5d519e5..34887c72 100644 --- a/firmware/configs/ttgo_t4_defconfig +++ b/firmware/configs/ttgo_t4_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=19101901 CONFIG_INFO_HARDWARE_NAME="ESP32" CONFIG_INFO_HARDWARE_FOLDER="ttgo-t4" CONFIG_INFO_HARDWARE_WOEZEL_NAME="TTGO T4" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/ttgo-t4.bin" diff --git a/firmware/configs/ttgo_tm_music_defconfig b/firmware/configs/ttgo_tm_music_defconfig index 39f257fb..f58cbac7 100644 --- a/firmware/configs/ttgo_tm_music_defconfig +++ b/firmware/configs/ttgo_tm_music_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=2019091401 CONFIG_INFO_HARDWARE_NAME="ESP32" CONFIG_INFO_HARDWARE_FOLDER="generic" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" diff --git a/firmware/configs/wrover_kit_defconfig b/firmware/configs/wrover_kit_defconfig index 9598194e..74630f9a 100644 --- a/firmware/configs/wrover_kit_defconfig +++ b/firmware/configs/wrover_kit_defconfig @@ -85,7 +85,7 @@ CONFIG_INFO_FIRMWARE_BUILD=2019091401 CONFIG_INFO_HARDWARE_NAME="Wrover kit" CONFIG_INFO_HARDWARE_FOLDER="generic" CONFIG_INFO_HARDWARE_WOEZEL_NAME="generic" -CONFIG_OTA_WEB_SERVER="badge.team" +CONFIG_OTA_WEB_SERVER="ota.badge.team" CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/wrover_kit.bin" From 433218d2ccb3c248b0d541d892a76b8c7628ab2d Mon Sep 17 00:00:00 2001 From: Francis Duvivier Date: Tue, 13 Feb 2024 23:52:55 +0100 Subject: [PATCH 4/5] Replace all CONFIG_WOEZEL_WEB_SERVER="badge.team" with CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" in configs files --- firmware/configs/brucon2018_defconfig | 2 +- firmware/configs/brucon2019_defconfig | 2 +- firmware/configs/disobey2019_defconfig | 2 +- firmware/configs/flipdotter_defconfig | 2 +- firmware/configs/fri3d2018_defconfig | 2 +- firmware/configs/generic_defconfig | 2 +- firmware/configs/hsnl_defconfig | 2 +- firmware/configs/m5stack_atom_defconfig | 2 +- firmware/configs/odroidgo_defconfig | 2 +- firmware/configs/ohs2018_defconfig | 2 +- firmware/configs/openaars_defconfig | 2 +- firmware/configs/renze_nfc_defconfig | 2 +- firmware/configs/t8_defconfig | 2 +- firmware/configs/troopers2019_defconfig | 2 +- firmware/configs/ttgo_lora_defconfig | 2 +- firmware/configs/ttgo_t4_defconfig | 2 +- firmware/configs/ttgo_tm_music_defconfig | 2 +- firmware/configs/wrover_kit_defconfig | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/firmware/configs/brucon2018_defconfig b/firmware/configs/brucon2018_defconfig index bc9fd89a..69d81673 100644 --- a/firmware/configs/brucon2018_defconfig +++ b/firmware/configs/brucon2018_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/generic.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/brucon2019_defconfig b/firmware/configs/brucon2019_defconfig index 536f3773..b93ecf65 100644 --- a/firmware/configs/brucon2019_defconfig +++ b/firmware/configs/brucon2019_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/generic.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/disobey2019_defconfig b/firmware/configs/disobey2019_defconfig index 1accea51..832028c2 100644 --- a/firmware/configs/disobey2019_defconfig +++ b/firmware/configs/disobey2019_defconfig @@ -93,7 +93,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/disobey2019.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/disobey2019.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/flipdotter_defconfig b/firmware/configs/flipdotter_defconfig index 34063a86..65eea0f4 100644 --- a/firmware/configs/flipdotter_defconfig +++ b/firmware/configs/flipdotter_defconfig @@ -93,7 +93,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/flipdotter.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/flipdotter.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/fri3d2018_defconfig b/firmware/configs/fri3d2018_defconfig index fa0626df..7e32dec8 100644 --- a/firmware/configs/fri3d2018_defconfig +++ b/firmware/configs/fri3d2018_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/fri3d2018.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/fri3d2018.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/generic_defconfig b/firmware/configs/generic_defconfig index 2054be26..e7444a11 100644 --- a/firmware/configs/generic_defconfig +++ b/firmware/configs/generic_defconfig @@ -93,7 +93,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/generic.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/hsnl_defconfig b/firmware/configs/hsnl_defconfig index 768f30e0..f89b120e 100644 --- a/firmware/configs/hsnl_defconfig +++ b/firmware/configs/hsnl_defconfig @@ -93,7 +93,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/hsnl.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/hsnl.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/m5stack_atom_defconfig b/firmware/configs/m5stack_atom_defconfig index 93570cdf..bf29d158 100644 --- a/firmware/configs/m5stack_atom_defconfig +++ b/firmware/configs/m5stack_atom_defconfig @@ -93,7 +93,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/m5stack_atom.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/m5stack_atom.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/odroidgo_defconfig b/firmware/configs/odroidgo_defconfig index f99bb172..7e66d223 100644 --- a/firmware/configs/odroidgo_defconfig +++ b/firmware/configs/odroidgo_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/odroidgo.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/odroidgo.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/ohs2018_defconfig b/firmware/configs/ohs2018_defconfig index 2cf67484..970d724a 100644 --- a/firmware/configs/ohs2018_defconfig +++ b/firmware/configs/ohs2018_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/ohs2018.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/ohs2018.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/openaars_defconfig b/firmware/configs/openaars_defconfig index b579cbb8..6e8f4bcd 100644 --- a/firmware/configs/openaars_defconfig +++ b/firmware/configs/openaars_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/openaars.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/openaars.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/renze_nfc_defconfig b/firmware/configs/renze_nfc_defconfig index 4472192e..adb04ab1 100644 --- a/firmware/configs/renze_nfc_defconfig +++ b/firmware/configs/renze_nfc_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/generic.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/t8_defconfig b/firmware/configs/t8_defconfig index c0fb6c6d..1f33eb97 100644 --- a/firmware/configs/t8_defconfig +++ b/firmware/configs/t8_defconfig @@ -93,7 +93,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/generic.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/troopers2019_defconfig b/firmware/configs/troopers2019_defconfig index f18350f3..554029cb 100644 --- a/firmware/configs/troopers2019_defconfig +++ b/firmware/configs/troopers2019_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/troopers2019.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/troopers2019.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/ttgo_lora_defconfig b/firmware/configs/ttgo_lora_defconfig index dbff14f1..f1e9ca86 100644 --- a/firmware/configs/ttgo_lora_defconfig +++ b/firmware/configs/ttgo_lora_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/ttgo-lora.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/ttgo-lora.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/ttgo_t4_defconfig b/firmware/configs/ttgo_t4_defconfig index 34887c72..898a1c4e 100644 --- a/firmware/configs/ttgo_t4_defconfig +++ b/firmware/configs/ttgo_t4_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/ttgo-t4.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/ttgo-t4.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE= diff --git a/firmware/configs/ttgo_tm_music_defconfig b/firmware/configs/ttgo_tm_music_defconfig index f58cbac7..86127d8e 100644 --- a/firmware/configs/ttgo_tm_music_defconfig +++ b/firmware/configs/ttgo_tm_music_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/generic.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/generic.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y diff --git a/firmware/configs/wrover_kit_defconfig b/firmware/configs/wrover_kit_defconfig index 74630f9a..3a10d30c 100644 --- a/firmware/configs/wrover_kit_defconfig +++ b/firmware/configs/wrover_kit_defconfig @@ -90,7 +90,7 @@ CONFIG_OTA_WEB_USE_HTTPS=y CONFIG_OTA_WEB_PORT=443 CONFIG_OTA_WEB_PATH="/firmware/wrover_kit.bin" CONFIG_OTA_WEB_VERSION_PATH="/firmware/version/wrover_kit.txt" -CONFIG_WOEZEL_WEB_SERVER="badge.team" +CONFIG_WOEZEL_WEB_SERVER="hatchery.badge.team" CONFIG_WIFI_SSID="badge" CONFIG_WIFI_PASSWORD="" CONFIG_DEFAULT_DISPLAY_ORIENTATION_LANDSCAPE=y From e0bf2eed18eea7728b71952e560572a9223d0e42 Mon Sep 17 00:00:00 2001 From: Francis Duvivier Date: Tue, 13 Feb 2024 23:59:28 +0100 Subject: [PATCH 5/5] Fixup formatting --- firmware/python_modules/pixel/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/python_modules/pixel/version.py b/firmware/python_modules/pixel/version.py index 12f27f9d..bad684e0 100644 --- a/firmware/python_modules/pixel/version.py +++ b/firmware/python_modules/pixel/version.py @@ -1,4 +1,4 @@ -import defines,consts +import defines, consts build = 1 name = "Harry Potter"