Merge pull request solosky#146 from solosky/develop

2.8.7

Author: solosky

.gitignore

@@ -5,6 +5,8 @@ fw/src/amiibo_private.c
 fw/src/version.inc.h
 fw/src/version.json
 
+fw/application/log.log
+
 
 fw/log.log
 
@@ -24,8 +26,12 @@ hw/RevA/pixl.js/*.zip
 hw/RevA/pixl.js/*.pdf
 hw/RevA/pixl.js/*.kicad_prl
 
+hw/RevC
+hw/RevD
 hw/SP.RevA
 hw/PRO.RevA
+hw/LIPO.RevA
+3d
 
 dist
 # venv stuff

.vscode/.cortex-debug.registers.state.json

@@ -0,0 +1 @@
+[]

README.md

@@ -30,10 +30,6 @@ hw/RevC为最新PCB版本，使用[Kicad 6](https://www.kicad.org/download/)打
 * [RevC InteractiveHtmlBom](docs/RevC-ibom.html)
 * [RevC 物料清单购买指南](docs/RevC-bom.md)
 
-## 衍生版本
-
-[docs/boards-thirdparty.md](docs/boards-thirdparty.md)
-
 ## OLED版本
 
 OLED版本由网友 @xiaohail 贡献，可以点[这里](https://gitlab.com/xiaohai/pixl.js)下载PCB。

docs/boards-thirdparty.md

@@ -44,7 +44,7 @@
       "ipAddress": null,
       "serialNumber": null,
       "configFiles": [
-        "${workspaceRoot}/config/pixljs.cfg"
+        "${workspaceRoot}/openocd/debug.cfg"
       ]
     }
   ]

fw/application/.vscode/launch.json

@@ -83,7 +83,21 @@
     "ntag_emu.h": "c",
     "settings.h": "c",
     "m-string.h": "c",
-    "player_scene_config.h": "c"
+    "player_scene_config.h": "c",
+    "chrono": "c",
+    "compare": "c",
+    "functional": "c",
+    "istream": "c",
+    "ostream": "c",
+    "ratio": "c",
+    "tuple": "c",
+    "type_traits": "c",
+    "utility": "c",
+    "mlib_common.h": "c",
+    "mui_anim.h": "c",
+    "mui_common.h": "c",
+    "stdbool.h": "c",
+    "app_timer.h": "c"
   },
   "cortex-debug.variableUseNaturalFormat": true,
   "cortex-debug.openocdPath.windows": "openocd",

fw/application/.vscode/settings.json

@@ -172,6 +172,7 @@ SRC_FILES += \
   $(PROJ_DIR)/utils.c \
   $(PROJ_DIR)/version2.c \
   $(PROJ_DIR)/amiibo_helper.c \
+  $(PROJ_DIR)/mui_qrcode_helper.c \
   $(PROJ_DIR)/app_error_handler.c \
   $(PROJ_DIR)/libc_nano_stubs.c \
   $(PROJ_DIR)/hal/hal_spi_bus.c \
@@ -300,6 +301,7 @@ SRC_FILES += \
   $(COMP_DIR)/littlefs/lfs.c \
   $(COMP_DIR)/littlefs/lfs_util.c \
   $(COMP_DIR)/cwalk/src/cwalk.c \
+  $(COMP_DIR)/qrcode/c/qrcodegen.c \
   $(U8G2_ROOT)/u8g2_bitmap.c \
   $(U8G2_ROOT)/u8g2_box.c \
   $(U8G2_ROOT)/u8g2_buffer.c \
@@ -522,6 +524,7 @@ INC_FOLDERS += \
   $(COMP_DIR)/littlefs \
   $(COMP_DIR)/tlsf \
   $(COMP_DIR)/cwalk/include \
+  $(COMP_DIR)/qrcode/c \
   $(SDK_ROOT)/components/libraries/bsp
 
 # Libraries common to all targets
@@ -666,14 +669,17 @@ ota:
 full: settingsgen
 	mergehex --merge $(OUTPUT_DIRECTORY)/settings.hex $(OUTPUT_DIRECTORY)/bootloader.hex $(SDK_ROOT)/components/softdevice/s112/hex/s112_nrf52_7.2.0_softdevice.hex $(OUTPUT_DIRECTORY)/pixljs.hex --output $(OUTPUT_DIRECTORY)/pixljs_all.hex
 
-flash_openocd:
+flash_ocd: default
 	openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "program $(OUTPUT_DIRECTORY)/pixljs.hex verify" -c "reset" -c exit
 
-flash_openocd_all:
-	openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf5 mass_erase" -c "program $(SDK_ROOT)/components/softdevice/s112/hex/s112_nrf52_7.2.0_softdevice.hex verify" -c "program $(OUTPUT_DIRECTORY)/pixljs.hex verify" -c "reset" -c exit
+flash_all_ocd:
+	openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf51 mass_erase" -c "program $(SDK_ROOT)/components/softdevice/s112/hex/s112_nrf52_7.2.0_softdevice.hex verify" -c "program $(OUTPUT_DIRECTORY)/pixljs.hex verify" -c "reset" -c exit
 
-reset_openocd:
+reset_ocd:
 	openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -c "init" -c "reset" -c "exit"
 
-erase_openocd:
-	openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf5 mass_erase" -c "reset" -c exit
+erase_ocd:
+	openocd -f interface/cmsis-dap.cfg -c "transport select swd" -f target/nrf52.cfg -d2 -c init -c "reset init" -c halt -c "nrf51 mass_erase" -c "reset" -c exit
+
+rtt_ocd:
+	openocd -f openocd/rtt.cfg

fw/application/Makefile

@@ -129,6 +129,9 @@ const db_amiibo_t amiibo_list[] = {
 {0x08050200, 0x038f0402, "Octoling Boy", "章鱼族男孩"}, 
 {0x08050200, 0x041b0402, "Octoling - Blue", "章鱼族 - 蓝色"}, 
 {0x08050300, 0x03900402, "Octoling Octopus", "章鱼族章鱼形态"}, 
+{0x08070000, 0x04330402, "Shiver", "莎莎"}, 
+{0x08080000, 0x04340402, "Frye", "曼曼"}, 
+{0x08090000, 0x04350402, "Big Man", "鬼福"}, 
 {0x08060100, 0x041c0402, "Smallfry", "小鲑鱼"}, 
 {0x00240000, 0x038d0002, "Piranha Plant", "吞食花"}, 
 {0x00c00000, 0x037b0002, "King K. Rool", "库鲁鲁王"}, 

fw/application/src/amiidb/db_amiibo.c

@@ -11,7 +11,7 @@ const db_game_t game_list[] = {
 {9, 0, "Captain Toad: Treasure Tracker", "蘑菇队长:宝藏追踪者", 1, 4}, 
 {10, 0, "Bayonetta 2", "猎天使魔女2", 1, 13}, 
 {11, 0, "Animal Crossing: New Horizons", "集合啦！动物森友会", 99, 525}, 
-{12, 0, "Splatoon 3", "斯普拉遁3", 40, 20}, 
+{12, 0, "Splatoon 3", "斯普拉遁3", 40, 23}, 
 {13, 0, "Fire Emblem Warriors: Three Hopes", "火焰纹章：风花雪月无双", 15, 13}, 
 {14, 0, "Fire Emblem Warriors", "火焰纹章：无双", 15, 13}, 
 {15, 0, "Fire Emblem Three Houses", "火焰纹章：风花雪月", 30, 13}, 

fw/application/src/amiidb/db_game.c

@@ -144,6 +144,9 @@ const db_link_t link_list[] = {
 {12, 0x08050300, 0x03900402, "", "暂无简介"}, 
 {12, 0x08030000, 0x03760402, "", "暂无简介"}, 
 {12, 0x08060100, 0x041c0402, "", "暂无简介"}, 
+{12, 0x08070000, 0x04330402, "", "暂无简介"}, 
+{12, 0x08080000, 0x04340402, "", "暂无简介"}, 
+{12, 0x08090000, 0x04350402, "", "暂无简介"}, 
 {13, 0x21060000, 0x03601202, "", "暂无简介"}, 
 {13, 0x210b0000, 0x03a50002, "", "暂无简介"}, 
 {13, 0x21070000, 0x03611202, "", "暂无简介"},