merge amigos projects

sipeed · odudex · Mar 6, 2022 · Mar 21, 2022 · Mar 22, 2022 · Mar 24, 2022
commit fcf45a6daf6d62684f8ebbbd9abc99985cc9ff70
diff --git a/projects/maixpy_amigo_ips/.gitignore → projects/maixpy_amigo/.gitignore b/projects/maixpy_amigo_ips/.gitignore → projects/maixpy_amigo/.gitignore
diff --git a/projects/maixpy_amigo_ips/CMakeLists.txt → projects/maixpy_amigo/CMakeLists.txt b/projects/maixpy_amigo_ips/CMakeLists.txt → projects/maixpy_amigo/CMakeLists.txt
diff --git a/...ects/maixpy_amigo_tft/builtin_py/board.py → projects/maixpy_amigo/builtin_py/board.py b/...ects/maixpy_amigo_tft/builtin_py/board.py → projects/maixpy_amigo/builtin_py/board.py
@@ -5,7 +5,7 @@
 
 config = json.loads("""
 {
-    "type": "amigo_tft",
+    "type": "amigo",
     "lcd": {
         "height": 320,
         "width": 480,

diff --git a/...xpy_amigo_ips/builtin_py/fpioa_manager.py → .../maixpy_amigo/builtin_py/fpioa_manager.py b/...xpy_amigo_ips/builtin_py/fpioa_manager.py → .../maixpy_amigo/builtin_py/fpioa_manager.py
diff --git a/projects/maixpy_amigo_ips/builtin_py/pmu.py → projects/maixpy_amigo/builtin_py/pmu.py b/projects/maixpy_amigo_ips/builtin_py/pmu.py → projects/maixpy_amigo/builtin_py/pmu.py
diff --git a/...xpy_amigo_ips/compile/compile_flags.cmake → .../maixpy_amigo/compile/compile_flags.cmake b/...xpy_amigo_ips/compile/compile_flags.cmake → .../maixpy_amigo/compile/compile_flags.cmake
diff --git a/...ects/maixpy_amigo_ips/compile/kendryte.ld → projects/maixpy_amigo/compile/kendryte.ld b/...ects/maixpy_amigo_ips/compile/kendryte.ld → projects/maixpy_amigo/compile/kendryte.ld
diff --git a/...nents/micropython/port/src/omv/img/font.c → ...nents/micropython/port/src/omv/img/font.c b/...nents/micropython/port/src/omv/img/font.c → ...nents/micropython/port/src/omv/img/font.c
diff --git a/...ts/maixpy_amigo_ips/compile/priority.conf → projects/maixpy_amigo/compile/priority.conf b/...ts/maixpy_amigo_ips/compile/priority.conf → projects/maixpy_amigo/compile/priority.conf
diff --git a/projects/maixpy_amigo_ips/config_defaults.mk → projects/maixpy_amigo/config_defaults.mk b/projects/maixpy_amigo_ips/config_defaults.mk → projects/maixpy_amigo/config_defaults.mk
diff --git a/...ects/maixpy_amigo_ips/main/CMakeLists.txt → projects/maixpy_amigo/main/CMakeLists.txt b/...ects/maixpy_amigo_ips/main/CMakeLists.txt → projects/maixpy_amigo/main/CMakeLists.txt
diff --git a/projects/maixpy_amigo_ips/main/src/main.cpp → projects/maixpy_amigo/main/src/main.cpp b/projects/maixpy_amigo_ips/main/src/main.cpp → projects/maixpy_amigo/main/src/main.cpp
diff --git a/projects/maixpy_amigo_ips/project.py → projects/maixpy_amigo/project.py b/projects/maixpy_amigo_ips/project.py → projects/maixpy_amigo/project.py
diff --git a/projects/maixpy_amigo_ips/builtin_py/board.py b/projects/maixpy_amigo_ips/builtin_py/board.py
diff --git a/projects/maixpy_amigo_tft/.gitignore b/projects/maixpy_amigo_tft/.gitignore
diff --git a/projects/maixpy_amigo_tft/CMakeLists.txt b/projects/maixpy_amigo_tft/CMakeLists.txt
diff --git a/projects/maixpy_amigo_tft/builtin_py/fpioa_manager.py b/projects/maixpy_amigo_tft/builtin_py/fpioa_manager.py
diff --git a/projects/maixpy_amigo_tft/builtin_py/pmu.py b/projects/maixpy_amigo_tft/builtin_py/pmu.py