From 27dba11c6874792d7c6e2002edc1b4b5bb852ed4 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 29 Nov 2024 12:05:46 -0800 Subject: [PATCH 1/2] Upgrade github workflow upload-artifact@v3 to @v4. upload-artifact@v3 will be deprecate in Jan 2025. Find more details here: https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md --- .github/workflows/pixl.js-fw.yml | 31 ++++++++++++++++++------------- .gitignore | 3 ++- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/pixl.js-fw.yml b/.github/workflows/pixl.js-fw.yml index 87a5c95d..08cfb833 100644 --- a/.github/workflows/pixl.js-fw.yml +++ b/.github/workflows/pixl.js-fw.yml @@ -26,32 +26,37 @@ jobs: - name: build firmware run: cd fw && make all RELEASE=1 APP_VERSION=$GITHUB_RUN_NUMBER BOARD=${{matrix.board}} - name: upload bootloader - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: pixljs_fw_${{matrix.board}} + name: ${{matrix.board}}__bootloader.hex path: fw/_build/bootloader.hex - name: upload firmware - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: pixljs_fw_${{matrix.board}} + name: ${{matrix.board}}__pixljs.hex path: fw/_build/pixljs.hex - name: upload all - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: pixljs_fw_${{matrix.board}} + name: ${{matrix.board}}__pixljs_all.hex path: fw/_build/pixljs_all.hex - name: upload ota - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: pixljs_fw_${{matrix.board}} + name: ${{matrix.board}}__pixjs_ota_v${{github.run_number}}.zip path: fw/_build/pixjs_ota_v${{github.run_number}}.zip - name: upload fw update script - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: pixljs_fw_${{matrix.board}} + name: ${{matrix.board}}__fw_update.bat path: fw/scripts/fw_update.bat - name: upload fw readme file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: pixljs_fw_${{matrix.board}} - path: fw/docs/fw_readme.txt \ No newline at end of file + name: ${{matrix.board}}__fw_readme.txt + path: fw/docs/fw_readme.txt + - name: Merge Artifacts + uses: actions/upload-artifact/merge@v4 + with: + name: ${{matrix.board}}__pixljs_fw_${{github.run_number}} + pattern: ${{matrix.board}}__* diff --git a/.gitignore b/.gitignore index 6d12761c..9e115a59 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,5 @@ hw/LIPO.RevA dist # venv stuff -.venv \ No newline at end of file +.venv +*.un~ From d4773e2229aba0f6f0f681baf0b6130cc651ef82 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 23 Dec 2024 18:47:00 -0800 Subject: [PATCH 2/2] Renaming an uninitialized card chemeleon card always fails. This change make sure the user will be backed out of the screen when that happens, instead of being permanently stuck on the naming screen. --- .../src/app/chameleon/scene/chameleon_scene_menu_card_set_name.c | 1 + 1 file changed, 1 insertion(+) 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 index 30986e34..955502a2 100644 --- 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 @@ -30,6 +30,7 @@ static void chameleon_scene_menu_card_set_name_text_input_event_cb(mui_text_inpu int32_t err = tag_helper_set_nickname(text); if (err != 0) { mui_toast_view_show(app->p_toast_view, _T(APP_CHAMELEON_CARD_SET_NICK_FAILED)); + mui_scene_dispatcher_previous_scene(app->p_scene_dispatcher); return; } mui_toast_view_show(app->p_toast_view, _T(APP_CHAMELEON_CARD_SET_NICK_SUCCESS));