fix: Firmware binary naming and ci

Author: muzaffarbhat07

.github/workflows/build.yml

@@ -15,17 +15,17 @@ jobs:
       matrix:
         firmware: [Main]
         target: [Release]
-        coin_support: ["BTC_ONLY", "MULTI_COIN"]
         vendor: [Cypherock, Odix]
+        coin_support: ["BTC_ONLY", "MULTI_COIN"]
         exclude:
           - vendor: Odix
             coin_support: BTC_ONLY
     uses: ./.github/workflows/containerized-build.yml
     with:
       firmware: ${{ matrix.firmware }}
       target: ${{ matrix.target }}
-      coin_support_variant: ${{ matrix.coin_support }}
       vendor: ${{ matrix.vendor }}
+      coin_support_variant: ${{ matrix.coin_support }}
     secrets: inherit
 
   create-release:
@@ -54,7 +54,7 @@ jobs:
           chkmain_cypherock_btc_only=$(sha256sum Main-Release-Cypherock-BTC_ONLY-outputs/Cypherock-Main-BTC.bin | cut -f -1 -d ' ')
 
           # Calculate SHA256 hash for the Odix firmware with MULTI_COIN support
-          chkmain_odix_multicoin=$(sha256sum Main-Release-Odix-MULTI_COIN-outputs/Cypherock-Main-Odix.bin | cut -f -1 -d ' ')
+          chkmain_odix_multicoin=$(sha256sum Main-Release-Odix-MULTI_COIN-outputs/Odix-Main.bin | cut -f -1 -d ' ')
 
           APP_VERSION=$(cat version.txt | grep firmware | cut -f 2-2 -d '=' | awk -F ':' '{ print 0+$1 "." 0+$2 "." $3*2**8 + $4 }')
           HW_VERSION=$(cat version.txt | grep hardware | cut -f 2-2 -d '=' | awk -F ':' '{ print 0+$1 "." 0+$2 "." $3*2**8 + $4 }')
@@ -106,14 +106,14 @@ jobs:
             --data-binary @Main-Release-Cypherock-BTC_ONLY-outputs/Cypherock-Main-BTC.bin
 
           # Upload the Odix MULTI_COIN firmware binary
-          content_type_odix_multicoin=$(file -b --mime-type Main-Release-Odix-MULTI_COIN-outputs/Cypherock-Main-Odix.bin)
+          content_type_odix_multicoin=$(file -b --mime-type Main-Release-Odix-MULTI_COIN-outputs/Odix-Main.bin)
           curl -X POST \
             -H "Content-Type: ${content_type_odix_multicoin}" \
             -H "Accept: application/vnd.github+json" \
             -H "Authorization: Bearer ${auth_token}" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
             "${upload_url}?name=Odix-Main.bin" \
-            --data-binary @Main-Release-Odix-MULTI_COIN-outputs/Cypherock-Main-Odix.bin
+            --data-binary @Main-Release-Odix-MULTI_COIN-outputs/Odix-Main.bin
 
           # Upload version.txt
           content_type_version=$(file -b --mime-type version.txt)

.github/workflows/containerized-build.yml

@@ -9,14 +9,12 @@ on:
       target:
         required: true
         type: string
-      coin_support_variant:
-        required: true
-        default: 'MULTI_COIN'
-        type: string
       vendor:
-        required: true
         default: "Cypherock"
         type: string
+      coin_support_variant:
+        default: 'MULTI_COIN'
+        type: string
 
 jobs:
   build:
@@ -74,9 +72,9 @@ jobs:
 
         mkdir -p build
 
-        cp x1_wallet_firmware/"${BUILD_DIR}"/Cypherock-*.* ./build/
+        cp x1_wallet_firmware/"${BUILD_DIR}"/${{ inputs.vendor }}-*.* ./build/
 
-    - name: Archive Build Artifacts ($${{ inputs.vendor }}-$${{ inputs.coin_support_variant }})
+    - name: Archive Build Artifacts (${{ inputs.vendor }}-${{ inputs.coin_support_variant }})
       uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.firmware }}-${{ inputs.target }}-${{ inputs.vendor }}-${{ inputs.coin_support_variant }}-outputs

CMakeLists.txt

@@ -1,39 +1,42 @@
 cmake_minimum_required(VERSION 3.19.0)
 set(CMAKE_MESSAGE_LOG_LEVEL debug)
 
-if("${CMAKE_BUILD_PLATFORM}" STREQUAL "Device")
-    message("Device platform selected")
-    set(CMAKE_TOOLCHAIN_FILE utilities/cmake/arm-none-eabi-gcc.cmake)
-    set(PROJECT Cypherock-${FIRMWARE_TYPE})
-elseif("${CMAKE_BUILD_PLATFORM}" STREQUAL "Simulator")
-    message("Simulator platform selected")
-    set(PROJECT Cypherock_Simulator)
-else()
-    message(WARNING "No platform specified defaulting to Simulator. Specify using -DCMAKE_BUILD_PLATFORM=<Type> Type can be Device or Simulator")
-    set(PROJECT Cypherock_Simulator)
-endif()
-
-# Define all options upfront, including BTC_ONLY
-OPTION(DEV_SWITCH "Additional features/logs to aid developers" OFF)
-OPTION(UNIT_TESTS_SWITCH "Compile build for main firmware or unit tests" OFF)
-OPTION(BTC_ONLY "Build firmware for Bitcoin only" OFF)
-
 # Add vendor specific compile definitions
 if ("${VENDOR}" STREQUAL "Odix")
+    message("Vendor Odix")
     add_compile_definitions(VENDOR_NAME="Odix Wallet")
     add_compile_definitions(VENDOR_COMPANION_APP="Odix")
     add_compile_definitions(VENDOR_DEVICE_NAME="Odix Wallet")
     add_compile_definitions(VENDOR_COMPANY_NAME"Odix")
-    set(PROJECT ${PROJECT}-Odix)
+    set(PROJECT Odix)
     add_compile_definitions(VENDOR_ID=1)
 else()
+    message("Vendor Cypherock")
     add_compile_definitions(VENDOR_NAME="Cypherock X1 Wallet")
     add_compile_definitions(VENDOR_COMPANION_APP="cySync")
     add_compile_definitions(VENDOR_DEVICE_NAME="Cypherock X1")
     add_compile_definitions(VENDOR_COMPANY_NAME"Cypherock")
     add_compile_definitions(VENDOR_ID=0)
+    set(PROJECT Cypherock)
 endif()
 
+if("${CMAKE_BUILD_PLATFORM}" STREQUAL "Device")
+    message("Device platform selected")
+    set(CMAKE_TOOLCHAIN_FILE utilities/cmake/arm-none-eabi-gcc.cmake)
+    set(PROJECT ${PROJECT}-${FIRMWARE_TYPE})
+elseif("${CMAKE_BUILD_PLATFORM}" STREQUAL "Simulator")
+    message("Simulator platform selected")
+    set(PROJECT ${PROJECT}_Simulator)
+else()
+    message(WARNING "No platform specified defaulting to Simulator. Specify using -DCMAKE_BUILD_PLATFORM=<Type> Type can be Device or Simulator")
+    set(PROJECT ${PROJECT}_Simulator)
+endif()
+
+# Define all options upfront, including BTC_ONLY
+OPTION(DEV_SWITCH "Additional features/logs to aid developers" OFF)
+OPTION(UNIT_TESTS_SWITCH "Compile build for main firmware or unit tests" OFF)
+OPTION(BTC_ONLY "Build firmware for Bitcoin only" OFF)
+
 # Append -BTC to project name if BTC_ONLY is enabled
 if (BTC_ONLY)
     set(PROJECT ${PROJECT}-BTC)