Fixed frozen module loading

Author: jorisplusplus

firmware/main/main.c

@@ -39,47 +39,47 @@ void app_main()
 	size_t mp_task_heap_size = mp_preallocate_heap();
     ESP_LOGI(TAG, "Heap size: %d", mp_task_heap_size);
 
-	// logo();
-	// bool is_first_boot = nvs_init();
+	logo();
+	bool is_first_boot = nvs_init();
 
 	fflush(stdout);
 	platform_init();
 
-	// if (is_first_boot) {
-	// 	#ifdef CONFIG_DRIVER_FRAMEBUFFER_ENABLE
-	// 		driver_framebuffer_fill(NULL, COLOR_BLACK);
-	// 		driver_framebuffer_print(NULL, "Extracting ZIP...\n", 0, 0, 1, 1, COLOR_WHITE, &roboto_12pt7b);
-	// 		driver_framebuffer_flush(0);
-	// 	#endif
-	// 	printf("Attempting to unpack FAT initialization ZIP file...\b");
-	// 	if (unpack_first_boot_zip() != ESP_OK) { //Error
-	// 		#ifdef CONFIG_DRIVER_FRAMEBUFFER_ENABLE
-	// 			driver_framebuffer_fill(NULL, COLOR_BLACK);
-	// 			driver_framebuffer_print(NULL, "ZIP error!\n", 0, 0, 1, 1, COLOR_WHITE, &roboto_12pt7b);
-	// 			driver_framebuffer_flush(0);
-	// 		#endif
-	// 		printf("An error occured while unpacking the ZIP file!");
-	// 		nvs_write_zip_status(false);
-	// 	} else {
-	// 		nvs_write_zip_status(true);
-	// 	}
-	// 	esp_restart();
-	// }
+	if (is_first_boot) {
+		#ifdef CONFIG_DRIVER_FRAMEBUFFER_ENABLE
+			driver_framebuffer_fill(NULL, COLOR_BLACK);
+			driver_framebuffer_print(NULL, "Extracting ZIP...\n", 0, 0, 1, 1, COLOR_WHITE, &roboto_12pt7b);
+			driver_framebuffer_flush(0);
+		#endif
+		printf("Attempting to unpack FAT initialization ZIP file...\b");
+		if (unpack_first_boot_zip() != ESP_OK) { //Error
+			#ifdef CONFIG_DRIVER_FRAMEBUFFER_ENABLE
+				driver_framebuffer_fill(NULL, COLOR_BLACK);
+				driver_framebuffer_print(NULL, "ZIP error!\n", 0, 0, 1, 1, COLOR_WHITE, &roboto_12pt7b);
+				driver_framebuffer_flush(0);
+			#endif
+			printf("An error occured while unpacking the ZIP file!");
+			nvs_write_zip_status(false);
+		} else {
+			nvs_write_zip_status(true);
+		}
+		esp_restart();
+	}
 
-	//  int magic = get_magic();
+	 int magic = get_magic();
 
-	//  switch(magic) {
-	//  	case MAGIC_OTA:
-	//  	  // This triggers an Over-the-Air firmware update
-	//  		badge_ota_update();
-	//  		break;
-	//  	case MAGIC_FACTORY_RESET:
-	//  	  // This clears any FAT data partitions
-	//  		factory_reset();
-	//  		break;
-	//  	default:
-	//  	  // This starts the MicroPython FreeRTOS task
-       	start_mp();
-	// 	  while(1){}
-	//  }
+	 switch(magic) {
+	 	case MAGIC_OTA:
+	 	  // This triggers an Over-the-Air firmware update
+	 		badge_ota_update();
+	 		break;
+	 	case MAGIC_FACTORY_RESET:
+	 	  // This clears any FAT data partitions
+	 		factory_reset();
+	 		break;
+	 	default:
+	 	 	// This starts the MicroPython FreeRTOS task
+       		start_mp();
+			while(1){}
+	 }
 }

firmware/python_modules/common/_boot.py

@@ -1,4 +1,4 @@
-import uos, gc
+import uos, gc, sys
 
 try:
 	uos.mkdir('/lib')
@@ -16,5 +16,5 @@
 	uos.mkdir('/config')
 except:
 	pass
-
+sys.path.append(".frozen")
 gc.collect()