Merge pull request #12 from badgeteam/fix-hatchery-url

Fix hatchery url

Author: annejan

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 PROJECT_PATH
-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

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()
 

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)

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: