Smaller main platform for dev

Author: jorisplusplus

firmware/main/CMakeLists.txt

@@ -10,7 +10,7 @@ set(srcs
 )
 
 idf_component_register(SRCS "${srcs}"
-                    INCLUDE_DIRS "./")
+                    INCLUDE_DIRS ".")
 
 add_custom_command(
     OUTPUT "${COMPONENT_DIR}/platform_gen.c"

firmware/main/include/platform.h

@@ -1,7 +1,6 @@
 #ifndef PLATFORM_H
 #define PLATFORM_H
 
-#include "include/system.h"
 #include "include/nvs_init.h"
 
 #include "esp_log.h"

firmware/main/main.c

@@ -1,5 +1,6 @@
 #include "include/nvs_init.h"
 #include "include/platform.h"
+#include "include/system.h"
 #include "include/ota_update.h"
 #include "include/factory_reset.h"
 #include "driver_framebuffer.h"
@@ -12,6 +13,7 @@
 #include "nvs.h"
 #include "micropython_main.h"
 
+
 extern void micropython_entry(void);
 
 extern esp_err_t unpack_first_boot_zip(void);
@@ -36,45 +38,47 @@ void app_main()
 	size_t mp_task_heap_size = mp_preallocate_heap();
     ESP_LOGI("MP", "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();
-	 }
+	//  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/main/platform.c

@@ -2,6 +2,15 @@
 #include "include/platform_gen.h"
 #include "driver_framebuffer.h"
 #include <driver/gpio.h>
+#include <esp_event.h>
+#include <esp_system.h>
+#include <esp_wifi.h>
+#include <esp_spi_flash.h>
+#include <esp_partition.h>
+#include <esp_vfs.h>
+#include <esp_vfs_fat.h>
+#include <esp_log.h>
+#include "buses.h"
 
 #define TAG "platform"
 
@@ -48,40 +57,13 @@ void fatal_error(const char *message) {
 
 void platform_init()
 {
-	if (isr_init() != ESP_OK) restart();
+	//if (isr_init() != ESP_OK) restart();
 	//Static inits can be performed here
+  start_buses();
+
+  //Init generated modules
   platform_gen_init();
-  /*
-  INIT_DRIVER(vspi         , "VSPI BUS"   ) //Generic VSPI bus driver
-	INIT_DRIVER(i2c          , "I2C BUS"    ) //Generic I2C bus driver
-	INIT_DRIVER(hub75        , "HUB75"      ) //LED matrix as found on the CampZone 2019 badge
-	INIT_DRIVER(erc12864     , "ERC12864"   ) //128x64 LCD screen as found on the Disobey 2019 badge
-	INIT_DRIVER(ssd1306      , "SSD1306"    ) //128x64 OLED screen as found on the Disobey 2020 badge
-	INIT_DRIVER(eink         , "E-INK"      ) //296x128 e-ink display as found on the SHA2017 and HackerHotel 2019 badges
-	INIT_DRIVER(gxgde0213b1  , "GXGDE0213B1") //E-ink on OHS badge
-	INIT_DRIVER(nokia6100    , "NOKIA6100"  ) //Nokia 6100 LCD
-	INIT_DRIVER(flipdotter   , "FLIPDOTTER" ) //Otter flipdot display
-	INIT_DRIVER(ili9341      , "ILI9341"    ) //LCD display on wrover kit
-	INIT_DRIVER(fri3d        , "FRI3D"      ) //LEDs on the Fri3d camp 2018 badge
-	INIT_DRIVER(st7735       , "ST7735"     ) //Color display
-	INIT_DRIVER(st7789v      , "ST7789V"    ) //Color display
-    INIT_DRIVER(ledmatrix    , "LEDMATRIX"  ) //Ledmatrix display
-    INIT_DRIVER(i2c_display  , "I2C DISPLAY") //Generic i2c display
-	INIT_DRIVER(framebuffer  , "FRAMEBUFFER") //Framebuffer driver with basic drawing routines
-	fbReady = true;                           //Notify the error handler that framebuffer support is now available
-	
-  INIT_DRIVER(mpr121       , "MPR121"     ) //I/O expander with touch inputs as found on the SHA2017 and HackerHotel 2019 badges
-    INIT_DRIVER(pca9555      , "PCA9555"     ) //16-bit I/O expander found on the Troopers 2020 badge
-	INIT_DRIVER(disobey_samd , "SAMD"       ) //I/O via the SAMD co-processor on the Disobey 2019 badge
-	INIT_DRIVER(neopixel     , "NEOPIXEL"   ) //Addressable LEDs as found on the SHA2017 and HackerHotel 2019 badges
-	INIT_DRIVER(microphone   , "MICROPHONE" ) //Microphone driver
-	INIT_DRIVER(mpu6050      , "MPU6050"    ) //Accelerometer driver
-	INIT_DRIVER(sdcard       , "SDCARD"     ) //SD card driver
-	INIT_DRIVER(lora         , "LORA"       ) //LoRa modem driver
-	INIT_DRIVER(am2320       , "AM2320"     ) //AM2320 sensor driver
-	INIT_DRIVER(touchbuttons , "TOUCHBUTTONS"     ) //ESP32 touchbuttons driver
-  INIT_DRIVER(fsoveruart   , "FSOVERUART")
-  */
+  
 	fflush(stdout);
 	vTaskDelay(100 / portTICK_PERIOD_MS); //Give things time to settle.
 }