cu port dev: cu cli is working now

solosky · Aug 28, 2024 · 8908100 · 8908100
1 parent 3f35f8a
commit 8908100
Show file tree

Hide file tree

Showing 66 changed files with 113 additions and 75 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,8 @@ hw/RevD
 hw/SP.RevA
 hw/PRO.RevA
 hw/LIPO.RevA
+hw/Ultra.*
+hw/NEO.*
 3d
 
 dist

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -41,6 +41,8 @@
         "algorithm": "c",
         "app_status.h": "c",
         "app_cmd.h": "c",
-        "rfid_main.h": "c"
+        "rfid_main.h": "c",
+        "cstdlib": "c",
+        "cstdint": "cpp"
     }
 }
diff --git a/fw/application/Makefile b/fw/application/Makefile
@@ -214,9 +214,9 @@ SRC_FILES += \
   $(PROJ_DIR)/hal/hal_qspi_flash.c \
   $(PROJ_DIR)/hal/hal_internal_flash.c \
   $(PROJ_DIR)/mod/bsp_btn.c \
-  $(PROJ_DIR)/mod/settings.c \
+  $(PROJ_DIR)/mod/settings2.c \
   $(PROJ_DIR)/mod/cache.c \
-  $(PROJ_DIR)/mod/ble/ble_main.c \
+  $(PROJ_DIR)/mod/ble/ble_main2.c \
   $(PROJ_DIR)/mod/ble/ble_df_driver.c \
   $(PROJ_DIR)/mod/ble/ble_amiibolink.c \
   $(PROJ_DIR)/mod/cwalk2.c \
@@ -493,8 +493,12 @@ ifeq ($(BOARD),NEO)
 SRC_FILES += \
   $(CHAMELEON_ROOT)/application/src/app_cmd.c \
   $(CHAMELEON_ROOT)/application/src/rfid_main.c \
+  $(CHAMELEON_ROOT)/application/src/settings.c \
   $(CHAMELEON_ROOT)/application/src/utils/dataframe.c \
-  $(CHAMELEON_ROOT)/application/src/bsp/bsp_wdt.c
+  $(CHAMELEON_ROOT)/application/src/utils/delayed_reset.c \
+  $(CHAMELEON_ROOT)/application/src/utils/syssleep.c \
+  $(CHAMELEON_ROOT)/application/src/bsp/bsp_wdt.c \
+  $(CHAMELEON_ROOT)/common/hw_connect.c
 endif 
 
 # Include folders common to all targets
@@ -754,6 +758,7 @@ endif
 
 ifeq ($(BOARD),NEO)
 CFLAGS += -DPROJECT_CHAMELEON_ULTRA
+CFLAGS += -DPIXLJS_NEO
 endif
 
 CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_NRF5X

diff --git a/fw/application/src/app/amiibo/app_amiibo.c b/fw/application/src/app/amiibo/app_amiibo.c
@@ -11,7 +11,7 @@
 
 #include "cache.h"
 #include "m-string.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "amiibo_helper.h"
 #include "i18n/language.h"

diff --git a/fw/application/src/app/amiibo/scene/amiibo_scene_amiibo_detail.c b/fw/application/src/app/amiibo/scene/amiibo_scene_amiibo_detail.c
@@ -9,7 +9,7 @@
 #include "nrf_log.h"
 #include "ntag_emu.h"
 #include "ntag_store.h"
-#include "settings.h"
+#include "settings2.h"
 #include "vfs.h"
 #include "vfs_meta.h"
 

diff --git a/fw/application/src/app/amiibo/scene/amiibo_scene_amiibo_detail_menu.c b/fw/application/src/app/amiibo/scene/amiibo_scene_amiibo_detail_menu.c
@@ -5,7 +5,7 @@
 #include "cwalk2.h"
 #include "mui_list_view.h"
 #include "nrf_log.h"
-#include "settings.h"
+#include "settings2.h"
 #include "vfs.h"
 #include "vfs_meta.h"
 

diff --git a/fw/application/src/app/amiibo/scene/amiibo_scene_file_browser.c b/fw/application/src/app/amiibo/scene/amiibo_scene_file_browser.c
@@ -9,7 +9,7 @@
 #include "vfs_meta.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #define ICON_FOLDER 0xe1d6
 #define ICON_FILE 0xe1ed

diff --git a/fw/application/src/app/amiibolink/scene/amiibolink_scene_main.c b/fw/application/src/app/amiibolink/scene/amiibolink_scene_main.c
@@ -2,7 +2,7 @@
 #include "amiibolink_view.h"
 #include "app_amiibolink.h"
 #include "ble_amiibolink.h"
-#include "ble_main.h"
+#include "ble_main2.h"
 #include "vfs.h"
 
 #include "amiibo_helper.h"
@@ -13,7 +13,7 @@
 
 #include "nrf_log.h"
 
-#include "settings.h"
+#include "settings2.h"
 
 #define ICON_FOLDER 0xe1d6
 #define ICON_FILE 0xe1ed

diff --git a/fw/application/src/app/amiibolink/scene/amiibolink_scene_menu.c b/fw/application/src/app/amiibolink/scene/amiibolink_scene_menu.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #define ICON_MODE 0xe135
 #define ICON_BACK 0xe069

diff --git a/fw/application/src/app/amiibolink/scene/amiibolink_scene_menu_ver.c b/fw/application/src/app/amiibolink/scene/amiibolink_scene_menu_ver.c
@@ -4,7 +4,7 @@
 #include "mini_app_launcher.h"
 #include "mini_app_registry.h"
 
-#include "settings.h"
+#include "settings2.h"
 #include "i18n/language.h"
 
 #define ICON_MODE 0xe1ed

diff --git a/fw/application/src/app/amiidb/api/amiidb_api_slot.c b/fw/application/src/app/amiidb/api/amiidb_api_slot.c
@@ -3,7 +3,7 @@
 //
 #include "amiidb_api_slot.h"
 #include "amiibo_helper.h"
-#include "settings.h"
+#include "settings2.h"
 #include "vfs.h"
 #include "vfs_meta.h"
 #include <stdio.h>

diff --git a/fw/application/src/app/amiidb/app_amiidb.c b/fw/application/src/app/amiidb/app_amiidb.c
@@ -9,7 +9,7 @@
 
 #include "cache.h"
 #include "m-string.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "amiibo_helper.h"
 #include "ntag_emu.h"

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_detail.c b/fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_detail.c
@@ -8,7 +8,7 @@
 
 #include "ntag_emu.h"
 #include "ntag_store.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_detail_menu.c b/fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_detail_menu.c
@@ -5,7 +5,7 @@
 #include "cwalk2.h"
 #include "mui_list_view.h"
 #include "nrf_log.h"
-#include "settings.h"
+#include "settings2.h"
 #include "vfs.h"
 
 #include "mui_icons.h"

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_search.c b/fw/application/src/app/amiidb/scene/amiidb_scene_amiibo_search.c
@@ -8,7 +8,7 @@
 
 #include "db_header.h"
 #include "mui_icons.h"
-#include "settings.h"
+#include "settings2.h"
 #include "i18n/language.h"
 #include <math.h>
 

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_data_list.c b/fw/application/src/app/amiidb/scene/amiidb_scene_data_list.c
@@ -7,7 +7,7 @@
 #include "amiidb_api_slot.h"
 #include "db_header.h"
 #include "mui_icons.h"
-#include "settings.h"
+#include "settings2.h"
 #include "vfs.h"
 #include "vfs_meta.h"
 #include "i18n/language.h"

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_data_list_menu.c b/fw/application/src/app/amiidb/scene/amiidb_scene_data_list_menu.c
@@ -5,7 +5,7 @@
 #include "cwalk2.h"
 #include "mui_list_view.h"
 #include "nrf_log.h"
-#include "settings.h"
+#include "settings2.h"
 #include "vfs.h"
 
 #include "amiidb_api_slot.h"

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_fav_list.c b/fw/application/src/app/amiidb/scene/amiidb_scene_fav_list.c
@@ -7,7 +7,7 @@
 
 #include "db_header.h"
 #include "mui_icons.h"
-#include "settings.h"
+#include "settings2.h"
 #include "vfs.h"
 #include <math.h>
 

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_fav_list_menu.c b/fw/application/src/app/amiidb/scene/amiidb_scene_fav_list_menu.c
@@ -5,7 +5,7 @@
 #include "cwalk2.h"
 #include "mui_list_view.h"
 #include "nrf_log.h"
-#include "settings.h"
+#include "settings2.h"
 #include "vfs.h"
 
 #include "amiidb_api_fav.h"

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_game_list.c b/fw/application/src/app/amiidb/scene/amiidb_scene_game_list.c
@@ -6,7 +6,7 @@
 
 #include "db_header.h"
 #include "mui_icons.h"
-#include "settings.h"
+#include "settings2.h"
 #include <math.h>
 
 static void amiidb_scene_game_list_reload(app_amiidb_t *app);

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_main.c b/fw/application/src/app/amiidb/scene/amiidb_scene_main.c
@@ -8,7 +8,7 @@
 #include "mini_app_launcher.h"
 #include "mini_app_registry.h"
 
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_settings.c b/fw/application/src/app/amiidb/scene/amiidb_scene_settings.c
@@ -3,7 +3,7 @@
 #include "app_amiidb.h"
 #include "cwalk2.h"
 #include "mui_icons.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "i18n/language.h"
 

diff --git a/fw/application/src/app/amiidb/scene/amiidb_scene_settings_slot_num.c b/fw/application/src/app/amiidb/scene/amiidb_scene_settings_slot_num.c
@@ -8,7 +8,7 @@
 #include "mui_icons.h"
 #include "nrf_log.h"
 #include "ntag_emu.h"
-#include "settings.h"
+#include "settings2.h"
 #include "i18n/language.h"
 
 static void amiidb_scene_settings_slot_num_on_selected(mui_list_view_event_t event, mui_list_view_t *p_list_view,

diff --git a/fw/application/src/app/amiidb/view/amiibo_view.c b/fw/application/src/app/amiidb/view/amiibo_view.c
@@ -3,7 +3,7 @@
 #include "i18n/language.h"
 #include "mui_element.h"
 #include "mui_qrcode_helper.h"
-#include "settings.h"
+#include "settings2.h"
 
 #define ICON_LEFT 0xe1ac
 #define ICON_RIGHT 0xe1aa

diff --git a/fw/application/src/app/ble/scene/ble_scene_connect_start.c b/fw/application/src/app/ble/scene/ble_scene_connect_start.c
@@ -1,6 +1,6 @@
 #include "ble_scene.h"
 #include "app_ble.h"
-#include "ble_main.h"
+#include "ble_main2.h"
 #include "ble_status_view.h"
 #include "ble_df_driver.h"
 

diff --git a/fw/application/src/app/chameleon/app_chameleon.c b/fw/application/src/app/chameleon/app_chameleon.c
@@ -6,7 +6,7 @@
 #include "chameleon_scene.h"
 #include "fds_utils.h"
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 #include "tag_helper.h"
 
 static void app_chameleon_on_run(mini_app_inst_t *p_app_inst);

diff --git a/fw/application/src/app/chameleon/port/tag_helper.c b/fw/application/src/app/chameleon/port/tag_helper.c
@@ -3,7 +3,7 @@
 #include "fds_utils.h"
 #include "i18n/language.h"
 #include "nrf_log.h"
-#include "settings.h"
+#include "settings2.h"
 #include "utils2.h"
 #include <string.h>
 

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_main.c b/fw/application/src/app/chameleon/scene/chameleon_scene_main.c
@@ -5,7 +5,7 @@
 
 #include "nrf_log.h"
 
-#include "settings.h"
+#include "settings2.h"
 #include "hal_nfc_t2t.h"
 #include "nfc_mf1.h"
 #include "tag_emulation.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu.c
@@ -8,13 +8,13 @@
 #include "nrf_log.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 
 #include "tag_helper.h"
 
-#include "settings.h"
+#include "settings2.h"
 
 typedef enum {
     CHAMELEON_MENU_HOME,

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_advanced.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_advanced.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_helper.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_advanced_id_edit.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_advanced_id_edit.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_helper.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_data.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_data.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_emulation.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_data_file_load.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_data_file_load.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_helper.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_data_file_save.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_data_file_save.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_helper.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_set_name.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_set_name.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_helper.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_slot.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_slot.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_helper.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_slot_select.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_slot_select.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_helper.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_type.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_type.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_helper.h"

diff --git a/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_write_mode_select.c b/fw/application/src/app/chameleon/scene/chameleon_scene_menu_card_write_mode_select.c
@@ -9,7 +9,7 @@
 #include "nrf_log_ctrl.h"
 
 #include "i18n/language.h"
-#include "settings.h"
+#include "settings2.h"
 
 #include "mui_icons.h"
 #include "tag_helper.h"