bot custom

.github/workflows/nightly.yml

@@ -30,13 +30,10 @@ jobs:
         run: |
            ./workflows/autobuild.sh pico
            ./build_pico_fido2.sh
-           ./workflows/autobuild.sh esp32
       - name: Delete private key
         run: rm private.pem
-      - name: Update nightly release
-        uses: pyTooling/Actions/releaser@main
+      - name: 'Upload Artifact'
+        uses: actions/upload-artifact@v4
         with:
-          tag: nightly-${{ matrix.refs }}
-          rm: true
-          token: ${{ secrets.GITHUB_TOKEN }}
-          files: release/*.*
+          name: pico-fido2
+          path: "release/*.*"

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "pico-fido"]
 	path = pico-fido
-	url = ../pico-fido.git
+	url = https://github.com/polhenarejos/pico-fido.git
 	branch = main
 [submodule "pico-openpgp"]
 	path = pico-openpgp
-	url = ../pico-openpgp.git
+	url = https://github.com/polhenarejos/pico-openpgp.git
 	branch = main
 [submodule "pico-keys-sdk"]
 	path = pico-keys-sdk
-	url = ../pico-keys-sdk.git
+	url = https://github.com/Bot-wxt1221/pico-keys-sdk.git
 	branch = main

CMakeLists.txt

@@ -35,11 +35,6 @@ project(pico_fido2 C CXX ASM)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
 
-if(ENABLE_EMULATION)
-else()
-pico_sdk_init()
-endif()
-
 add_executable(pico_fido2)
 endif()
 

build_pico_fido2.sh

@@ -2,7 +2,6 @@
 
 VERSION_MAJOR="6"
 VERSION_MINOR="6"
-NO_EDDSA=0
 SUFFIX="${VERSION_MAJOR}.${VERSION_MINOR}"
 #if ! [[ -z "${GITHUB_SHA}" ]]; then
 #    SUFFIX="${SUFFIX}.${GITHUB_SHA}"
@@ -13,15 +12,16 @@ mkdir -p release
 rm -rf -- release/*
 cd build_release
 
-PICO_SDK_PATH="${PICO_SDK_PATH:-../../pico-sdk}"
+PICO_SDK_PATH="../../pico-sdk"
 board_dir=${PICO_SDK_PATH}/src/boards/include/boards
 SECURE_BOOT_PKEY="${SECURE_BOOT_PKEY:-../../ec_private_key.pem}"
 
-for board in "$board_dir"/*
+for board in "waveshare_rp2350_one.h"
 do
     board_name="$(basename -- "$board" .h)"
     rm -rf -- ./*
-    PICO_SDK_PATH="${PICO_SDK_PATH}" cmake .. -DPICO_BOARD=$board_name -DSECURE_BOOT_PKEY=${SECURE_BOOT_PKEY} -DENABLE_EDDSA=1
+    PICO_SDK_PATH="${PICO_SDK_PATH}" cmake .. -DPICO_BOARD=$board_name -DSECURE_BOOT_PKEY=${SECURE_BOOT_PKEY} -DENABLE_EDDSA=1 -DVIDPID=Yubikey5 -DPICO_DEFAULT_WS2812_PIN=16
     make -j`nproc`
     mv pico_fido2.uf2 ../release/pico_fido2_$board_name-$SUFFIX.uf2
+    mv ../pico-keys-sdk/otp.json ../release/pico_fido2_$board_name-$SUFFIX-otp.json
 done

workflows/autobuild.sh

@@ -5,9 +5,10 @@ sudo apt update
 
 if [[ $1 == "pico" ]]; then
 sudo apt install -y cmake gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib
+pushd ..
 git clone https://github.com/raspberrypi/pico-sdk
 cd pico-sdk
-git checkout tags/2.1.1
+git checkout tags/2.2.0
 git submodule update --init
 cd ..
 git clone https://github.com/raspberrypi/picotool
@@ -18,11 +19,9 @@ cd build
 cmake -DPICO_SDK_PATH=../../pico-sdk ..
 make -j`nproc`
 sudo make install
-cd ../..
+popd
 mkdir build_pico
 cd build_pico
-cmake -DPICO_SDK_PATH=../pico-sdk ..
-make
 cd ..
 elif [[ $1 == "esp32" ]]; then
 sudo apt install -y git wget flex bison gperf python3 python3-pip python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util libusb-1.0-0