From 60f57d2133f3cbaf6031d4eae45ff65fbe0715d8 Mon Sep 17 00:00:00 2001
From: Gabor Peresztegi <gabor.p1983@gmail.com>
Date: Thu, 14 Jul 2022 08:00:32 +0200
Subject: [PATCH] Fix ESP32-M5Core2 board build error (#56)

---
 ports/esp32/boards/M5CORE2/board.json         | 25 ++++++
 ports/esp32/boards/M5CORE2/manifest.py        |  2 +-
 .../esp32/boards/M5CORE2/modules/inisetup.py  | 88 -------------------
 ports/esp32/boards/M5CORE2/modules/m5core2.py | 18 ++++
 .../modules/{m5core2_power.py => power.py}    |  0
 ports/esp32/boards/M5CORE2/mpconfigboard.mk   |  9 --
 6 files changed, 44 insertions(+), 98 deletions(-)
 create mode 100644 ports/esp32/boards/M5CORE2/board.json
 delete mode 100644 ports/esp32/boards/M5CORE2/modules/inisetup.py
 create mode 100644 ports/esp32/boards/M5CORE2/modules/m5core2.py
 rename ports/esp32/boards/M5CORE2/modules/{m5core2_power.py => power.py} (100%)
 delete mode 100644 ports/esp32/boards/M5CORE2/mpconfigboard.mk

diff --git a/ports/esp32/boards/M5CORE2/board.json b/ports/esp32/boards/M5CORE2/board.json
new file mode 100644
index 000000000..bae63f477
--- /dev/null
+++ b/ports/esp32/boards/M5CORE2/board.json
@@ -0,0 +1,25 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "https://docs.m5stack.com/en/core/core2",
+    "features": [
+        "BLE",
+        "WiFi",
+        "SPIRAM",
+        "IMU",
+        "RTC",
+        "PMU",
+        "SDCard",
+        "Microphone",
+        "USB-C"
+    ],
+    "images": [
+        "m5core2.jpg"
+    ],
+    "mcu": "esp32",
+    "product": "M5Stack Core2",
+    "thumbnail": "",
+    "url": "https://m5stack.com/",
+    "vendor": "M5 Stack"
+}
diff --git a/ports/esp32/boards/M5CORE2/manifest.py b/ports/esp32/boards/M5CORE2/manifest.py
index 58f435405..18bc6de67 100644
--- a/ports/esp32/boards/M5CORE2/manifest.py
+++ b/ports/esp32/boards/M5CORE2/manifest.py
@@ -1,2 +1,2 @@
-freeze("modules")
 include("$(PORT_DIR)/boards/manifest.py")
+freeze("./modules")
\ No newline at end of file
diff --git a/ports/esp32/boards/M5CORE2/modules/inisetup.py b/ports/esp32/boards/M5CORE2/modules/inisetup.py
deleted file mode 100644
index cef3d7290..000000000
--- a/ports/esp32/boards/M5CORE2/modules/inisetup.py
+++ /dev/null
@@ -1,88 +0,0 @@
-import uos
-from flashbdev import bdev
-import lvgl as lv
-
-
-def check_bootsec():
-    buf = bytearray(bdev.ioctl(5, 0))  # 5 is SEC_SIZE
-    bdev.readblocks(0, buf)
-    empty = True
-    for b in buf:
-        if b != 0xFF:
-            empty = False
-            break
-    if empty:
-        return True
-    fs_corrupted()
-
-
-def fs_corrupted():
-    import time
-
-    while 1:
-        print(
-            """\
-The filesystem appears to be corrupted. If you had important data there, you
-may want to make a flash snapshot to try to recover it. Otherwise, perform
-factory reprogramming of MicroPython firmware (completely erase flash, followed
-by firmware programming).
-"""
-        )
-        time.sleep(3)
-
-
-def setup():
-    check_bootsec()
-    print("Performing initial setup")
-    uos.VfsLfs2.mkfs(bdev)
-    vfs = uos.VfsLfs2(bdev)
-    uos.mount(vfs, "/")
-    with open("boot.py", "w") as f:
-        f.write(
-            """\
-# This file is executed on every boot (including wake-boot from deepsleep)
-#import esp
-#esp.osdebug(None)
-#import webrepl
-#webrepl.start()
-
-# Init LVGL
-import lvgl as lv
-lv.init()
-
-# Power Management
-from m5core2_power import Power
-power = Power()
-
-# LCD screen
-from ili9XXX import ili9341
-lcd = ili9341(mosi=23, miso=38, clk=18, dc=15, cs=5, invert=True, rot=0x10, width=320, height=240, rst=-1, power=-1, backlight=-1)
-
-# Touch sensor
-from ft6x36 import ft6x36
-touch = ft6x36(width=320, height=280)  
-"""
-        )
-
-    with open("board.py", "w") as f:
-        f.write(
-            """\
-name = "m5core2"
-"""
-        )
-
-    with open("main.py", "w") as f:
-        f.write(
-            """\
-import lvgl as lv
-
-scr = lv.obj()
-btn = lv.btn(scr)
-btn.align(lv.ALIGN.CENTER, 0, 0)
-label = lv.label(btn)
-label.set_text("Button")
-lv.scr_load(scr)
-"""
-        )
-
-    return vfs
diff --git a/ports/esp32/boards/M5CORE2/modules/m5core2.py b/ports/esp32/boards/M5CORE2/modules/m5core2.py
new file mode 100644
index 000000000..870928cc5
--- /dev/null
+++ b/ports/esp32/boards/M5CORE2/modules/m5core2.py
@@ -0,0 +1,18 @@
+name = "m5core2"
+
+def init():
+    # Init LVGL
+    import lvgl as lv
+    lv.init()
+
+    # Power Management
+    from power import Power
+    Power()
+
+    # LCD screen
+    from ili9XXX import ili9341
+    ili9341(mosi=23, miso=38, clk=18, dc=15, cs=5, invert=True, rot=0x10, width=320, height=240, rst=-1, power=-1, backlight=-1)
+
+    # Touch sensor
+    from ft6x36 import ft6x36
+    ft6x36(width=320, height=280)
diff --git a/ports/esp32/boards/M5CORE2/modules/m5core2_power.py b/ports/esp32/boards/M5CORE2/modules/power.py
similarity index 100%
rename from ports/esp32/boards/M5CORE2/modules/m5core2_power.py
rename to ports/esp32/boards/M5CORE2/modules/power.py
diff --git a/ports/esp32/boards/M5CORE2/mpconfigboard.mk b/ports/esp32/boards/M5CORE2/mpconfigboard.mk
deleted file mode 100644
index 7c8ec3a8e..000000000
--- a/ports/esp32/boards/M5CORE2/mpconfigboard.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-SDKCONFIG += boards/sdkconfig.base
-SDKCONFIG += boards/sdkconfig.spiram
-SDKCONFIG += boards/sdkconfig.240mhz
-SDKCONFIG += boards/M5CORE2/sdkconfig.board
-
-FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
-
-PART_SRC = $(BOARD_DIR)/partitions.csv
-LV_CFLAGS = -DLV_COLOR_DEPTH=16 -DLV_COLOR_16_SWAP=1