👷 Upgrade version of conan for demos (#178)

* 👷 Upgrade version of conan for demos

* Attempt to fix deploy

Author: kammce

.github/workflows/ci.yml

@@ -14,36 +14,50 @@ jobs:
     uses: libhal/ci/.github/workflows/library_check.yml@5.x.y
     secrets: inherit
 
-  deploy_check:
-    uses: ./.github/workflows/deploy.yml
+  deploy_gcc:
+    uses: ./.github/workflows/deploy_with_cache.yml
     with:
+      compiler_profile: hal/tc/arm-gcc
+      version: latest
+      upload_suffix: gcc
+    secrets: inherit
+
+  deploy_llvm:
+    uses: ./.github/workflows/deploy_with_cache.yml
+    with:
+      compiler_profile: hal/tc/llvm
       version: latest
+      upload_suffix: llvm
     secrets: inherit
 
   demo_check_lpc4074:
     uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
     with:
       compiler_profile: hal/tc/arm-gcc
       platform_profile: hal/mcu/lpc4074
+      conan_version: 2.23.0
     secrets: inherit
 
   demo_check_lpc4078:
     uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
     with:
       compiler_profile: hal/tc/arm-gcc
       platform_profile: hal/mcu/lpc4078
+      conan_version: 2.23.0
     secrets: inherit
 
   demo_check_stm32f103c8:
     uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
     with:
       compiler_profile: hal/tc/arm-gcc
       platform_profile: hal/mcu/stm32f103c8
+      conan_version: 2.23.0
     secrets: inherit
 
   demo_check_stm32f411re:
     uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
     with:
       compiler_profile: hal/tc/arm-gcc
       platform_profile: hal/mcu/stm32f411re
+      conan_version: 2.23.0
     secrets: inherit

.github/workflows/deploy.yml

@@ -4,25 +4,20 @@ on:
   workflow_dispatch:
   release:
     types: [published]
-  workflow_call:
-    inputs:
-      version:
-        type: string
-        default: ${{ github.ref_name }}
 
 jobs:
   gcc:
     uses: ./.github/workflows/deploy_with_cache.yml
     with:
       compiler_profile: hal/tc/arm-gcc
-      version: ${{ inputs.version }}
+      version: ${{ github.ref_name }}
       upload_suffix: gcc
     secrets: inherit
 
   llvm:
     uses: ./.github/workflows/deploy_with_cache.yml
     with:
       compiler_profile: hal/tc/llvm
-      version: ${{ inputs.version }}
+      version: ${{ github.ref_name }}
       upload_suffix: llvm
     secrets: inherit

src/interrupt.cpp

@@ -304,29 +304,29 @@ extern "C"
   __attribute__((naked)) void __wrap_arm_hardfault_isr(void)  // NOLINT
   {
 #if defined(__CORTEX_M)
-    __asm volatile("   movs   r0, #4                     \n"
-                   "   mov    r1, lr                     \n"
-                   "   tst    r0, r1                     \n"
-                   "   beq    .use_msp                   \n"
-                   "   mrs    r0, psp                    \n"
-                   "   b      .check_debug               \n"
-                   ".use_msp:                            \n"
-                   "   mrs    r0, msp                    \n"
-                   ".check_debug:                        \n"
-                   "   ldr    r1, =0xE000ED2C            \n"
-                   "   ldr    r2, [r1]                   \n"
-                   "   lsls   r2, #1                     \n"
-                   ".hardfault_loop:                     \n"
-                   "   bcc    .hardfault_loop            \n"
-                   "   ldr    r2, [r1]                   \n"
-                   "   str    r2, [r1]                   \n"
-                   "   ldr    r1, [r0, #24]              \n"
-                   "   adds   r1, r1, #2                 \n"
-                   "   str    r1, [r0, #24]              \n"
-                   "   movs   r1, #1                     \n"
-                   "   negs   r1, r1                     \n"
-                   "   str    r1, [r0, #0]               \n"
-                   "   bx     lr                         \n"
+    __asm volatile("   movs   r0, #4           \n"
+                   "   mov    r1, lr           \n"
+                   "   tst    r0, r1           \n"
+                   "   beq    .use_msp         \n"
+                   "   mrs    r0, psp          \n"
+                   "   b      .check_debug     \n"
+                   ".use_msp:                  \n"
+                   "   mrs    r0, msp          \n"
+                   ".check_debug:              \n"
+                   "   ldr    r1, =0xE000ED2C  \n"
+                   "   ldr    r2, [r1]         \n"
+                   "   lsls   r2, #1           \n"
+                   ".hardfault_loop:           \n"
+                   "   bcc    .hardfault_loop  \n"
+                   "   ldr    r2, [r1]         \n"
+                   "   str    r2, [r1]         \n"
+                   "   ldr    r1, [r0, #24]    \n"
+                   "   adds   r1, r1, #2       \n"
+                   "   str    r1, [r0, #24]    \n"
+                   "   movs   r1, #1           \n"
+                   "   negs   r1, r1           \n"
+                   "   str    r1, [r0, #0]     \n"
+                   "   bx     lr               \n"
                    :
                    :
                    : "memory");