Merge branch 'master' into disobey-last-pieces

Author: annejan

esp32/Makefile

@@ -81,8 +81,8 @@ INC += -I../lib/timeutils
 INC += -I../../components/badge
 INC += -I../../components/ugfx-glue
 INC += -I../../components/graph
-INC += -I../../components/sha2017
 INC += -I../../components/graphics
+INC += -I../../components/badge-ota
 INC += -I../../components/bpp-recv
 INC += -I../../components/bpp-if
 INC += -I../../components/ed25519/include
@@ -722,9 +722,9 @@ BADGE_COMPONENTS_O = $(addprefix $(PROJECT_PATH)/components/,\
 	ugfx-glue/ginput_lld_toggle.o \
 	ugfx-glue/gfx_mk.o \
 	ugfx-glue/gfx_userfs.o \
-	sha2017/letsencrypt.o \
+	badge-ota/letsencrypt.o \
 	graphics/graphics.o \
-	sha2017/sha2017_ota.o \
+	badge-ota/badge_ota.o \
 	badge-first-run/badge_first_run.o \
 	png/adler32.o \
 	png/crc32.o \

esp32/main.c

@@ -37,7 +37,7 @@
 #include "soc/cpu.h"
 #include "rom/rtc.h"
 
-#include "sha2017_ota.h"
+#include "badge_ota.h"
 #include "esprtcmem.h"
 
 #include "py/stackctrl.h"
@@ -204,7 +204,7 @@ void app_main(void) {
 		switch (magic) {
 			case 1:
 				printf("Starting OTA\n");
-				sha2017_ota_update();
+				badge_ota_update();
 				break;
 
 #ifdef CONFIG_SHA_BPP_ENABLE

esp32/modbadge.c

@@ -524,6 +524,7 @@ STATIC mp_obj_t badge_eink_png(mp_obj_t obj_x, mp_obj_t obj_y, mp_obj_t obj_file
 	uint32_t dst_min_x = x < 0 ? -x : 0;
 	uint32_t dst_min_y = y < 0 ? -y : 0;
 	int res = lib_png_load_image(pr, &badge_fb[y * BADGE_FB_WIDTH + x], dst_min_x, dst_min_y, BADGE_FB_WIDTH - x, BADGE_FB_HEIGHT - y, BADGE_FB_WIDTH);
+
 	lib_png_destroy(pr);
 	if (is_bytes) {
 		lib_mem_destroy(reader_p);

esp32/modbadge.h

@@ -5,6 +5,7 @@
 
 #include "badge.h"
 #include "badge_pins.h"
+#include "badge_fb.h"
 #include "badge_eink.h"
 #include "badge_fb.h"
 #include "badge_eink_dev.h"
@@ -29,4 +30,4 @@
 // #include "madison_gurkha.h"
 // #include "leaseweb.h"
 
-#include "sha2017_ota.h"
+#include "badge_ota.h"

unix/Makefile

@@ -24,7 +24,7 @@ INC +=  -I$(TOP)
 INC += -I$(BUILD)
 INC += -I../../components/ugfx-glue
 INC += -I../../components/badge
-INC += -I../../components/sha2017
+INC += -I../../components/badge-ota
 INC += -I../../esp-idf/components/esp32/include/
 INC += -I../../ugfx/src/gdisp/mcufont
 INC += -I../../ugfx
@@ -168,7 +168,7 @@ SRC_C = \
 	modbadge.c \
 	../../ugfx/drivers/multiple/SDL/gdisp_lld_SDL.c \
 	ginput_lld_toggle.c \
-	../../components/sha2017/letsencrypt.c \
+	../../components/badge-ota/letsencrypt.c \
 	gfx_mk.c \
 	modos.c \
 	moduos_vfs.c \