From 337711539a54487b7098f6b5df97f8be89ee2365 Mon Sep 17 00:00:00 2001 From: Renze Nicolai Date: Mon, 4 Feb 2019 23:23:32 +0100 Subject: [PATCH 1/3] Small mistake --- esp32/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esp32/Makefile b/esp32/Makefile index 2c8ed0784..b36062f25 100644 --- a/esp32/Makefile +++ b/esp32/Makefile @@ -37,7 +37,7 @@ ifdef CONFIG_SHA_BADGE_V3_LITE FROZEN_MPY_DIR = modules_sha2017 endif -ifdef PROJECT_PATH +ifdef CONFIG_DISOBEY FROZEN_MPY_DIR = modules_disobey2019 endif From 2895190cb477c53843d68dd04a2e20465521b79e Mon Sep 17 00:00:00 2001 From: Renze Nicolai Date: Mon, 4 Feb 2019 23:28:21 +0100 Subject: [PATCH 2/3] Temp. fix --- esp32/Makefile | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/esp32/Makefile b/esp32/Makefile index b36062f25..2a9f94691 100644 --- a/esp32/Makefile +++ b/esp32/Makefile @@ -21,37 +21,40 @@ MICROPY_PY_BTREE = 1 #FROZEN_DIR = scripts -ifdef CONFIG_SHA_BADGE_V1 FROZEN_MPY_DIR = modules_sha2017 -endif +#FROZEN_MPY_DIR = modules_disobey2019 -ifdef CONFIG_SHA_BADGE_V2 -FROZEN_MPY_DIR = modules_sha2017 -endif +#ifdef CONFIG_SHA_BADGE_V1 +#FROZEN_MPY_DIR = modules_sha2017 +#endif -ifdef CONFIG_SHA_BADGE_V3 -FROZEN_MPY_DIR = modules_sha2017 -endif +#ifdef CONFIG_SHA_BADGE_V2 +#FROZEN_MPY_DIR = modules_sha2017 +#endif -ifdef CONFIG_SHA_BADGE_V3_LITE -FROZEN_MPY_DIR = modules_sha2017 -endif +#ifdef CONFIG_SHA_BADGE_V3 +#FROZEN_MPY_DIR = modules_sha2017 +#endif -ifdef CONFIG_DISOBEY -FROZEN_MPY_DIR = modules_disobey2019 -endif +#ifdef CONFIG_SHA_BADGE_V3_LITE +#FROZEN_MPY_DIR = modules_sha2017 +#endif -ifdef CONFIG_HACKERHOTEL_BADGE_V1 -FROZEN_MPY_DIR = modules_hackerhotel2019 -endif +#ifdef CONFIG_DISOBEY +#FROZEN_MPY_DIR = modules_disobey2019 +#endif -ifdef CONFIG_HACKERHOTEL_BADGE_V0 -FROZEN_MPY_DIR = modules_hackerhotel2019 -endif +#ifdef CONFIG_HACKERHOTEL_BADGE_V1 +#FROZEN_MPY_DIR = modules_hackerhotel2019 +#endif -ifdef CONFIG_SHA_BADGE_NONE -FROZEN_MPY_DIR = modules_generic -endif +#ifdef CONFIG_HACKERHOTEL_BADGE_V0 +#FROZEN_MPY_DIR = modules_hackerhotel2019 +#endif + +#ifdef CONFIG_SHA_BADGE_NONE +#FROZEN_MPY_DIR = modules_generic +#endif # include py core make definitions include ../py/py.mk From 7b40a96d0bee1a09b5c0a9edb6f8ba9fe096d0b8 Mon Sep 17 00:00:00 2001 From: Renze Nicolai Date: Mon, 4 Feb 2019 23:32:31 +0100 Subject: [PATCH 3/3] Change to badge.team --- esp32/modules_sha2017/installer.py | 6 +++--- esp32/modules_sha2017/tasks/otacheck.py | 2 +- esp32/modules_sha2017/woezel.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/esp32/modules_sha2017/installer.py b/esp32/modules_sha2017/installer.py index d4fe12e53..3e0c60133 100644 --- a/esp32/modules_sha2017/installer.py +++ b/esp32/modules_sha2017/installer.py @@ -71,7 +71,7 @@ def list_apps(slug): ugfx.flush(ugfx.LUT_FULL) try: - f = urequests.get("https://badge.sha2017.org/eggs/category/%s/json" % slug, timeout=30) + f = urequests.get("https://badge.team/eggs/category/%s/json" % slug, timeout=30) try: packages = f.json() finally: @@ -167,7 +167,7 @@ def list_categories(): ugfx.input_init() draw_msg('Getting categories') try: - f = urequests.get("https://badge.sha2017.org/eggs/categories/json", timeout=30) + f = urequests.get("https://badge.team/eggs/categories/json", timeout=30) categories = f.json() except: draw_msg('Failed!') @@ -202,7 +202,7 @@ def list_categories(): ugfx.string_box(148,78,148,18, " A: Open category", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft) ugfx.string_box(148,92,148,18, " B: Return to home", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft) ugfx.line(148, 110, 296, 110, ugfx.BLACK) - ugfx.string_box(148,110,148,18, " badge.sha2017.org", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft) + ugfx.string_box(148,110,148,18, " badge.team", "Roboto_Regular12", ugfx.BLACK, ugfx.justifyLeft) ugfx.flush(ugfx.LUT_FULL) gc.collect() diff --git a/esp32/modules_sha2017/tasks/otacheck.py b/esp32/modules_sha2017/tasks/otacheck.py index 7d963ac82..88ff99fa8 100644 --- a/esp32/modules_sha2017/tasks/otacheck.py +++ b/esp32/modules_sha2017/tasks/otacheck.py @@ -11,7 +11,7 @@ def download_info(): easydraw.msg("Checking for updates...") result = False try: - data = requests.get("https://badge.sha2017.org/version") + data = requests.get("https://badge.team/version") except: easydraw.msg("Error: could not download JSON!") time.sleep(5) diff --git a/esp32/modules_sha2017/woezel.py b/esp32/modules_sha2017/woezel.py index ec31ffb19..a63c284bc 100644 --- a/esp32/modules_sha2017/woezel.py +++ b/esp32/modules_sha2017/woezel.py @@ -148,21 +148,21 @@ def url_open(url): def get_pkg_metadata(name): - f = url_open("https://badge.sha2017.org/eggs/get/%s/json" % name) + f = url_open("https://badge.team/eggs/get/%s/json" % name) try: return json.load(f) finally: f.close() def get_pkg_list(): - f = url_open("https://badge.sha2017.org/eggs/list/json") + f = url_open("https://badge.team/eggs/list/json") try: return json.load(f) finally: f.close() def search_pkg_list(query): - f = url_open("https://badge.sha2017.org/eggs/search/%s/json" % query) + f = url_open("https://badge.team/eggs/search/%s/json" % query) try: return json.load(f) finally: