Revert "Update examples to use the latest CMSIS_6 pack dev-drop"

This reverts commit f459e66. A newer dev-drop is required (not available yet).
ARM-software · Nov 14, 2023 · 60dfdac · 60dfdac
1 parent f459e66
commit 60dfdac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/build_MLEK_kws.yml b/.github/workflows/build_MLEK_kws.yml
@@ -35,8 +35,8 @@ jobs:
       - name: Install custom CMSIS packs
         # Install custom CMSIS packs required for the ML project
         run: | 
-             wget -P /home/arm_mlops_docker https://github.com/ARM-software/CMSIS_6/releases/download/dev%2Fv6.0.0-dev53/ARM.CMSIS.6.0.0-dev53+g825ef36.pack -nv
-             su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add ARM.CMSIS.6.0.0-dev53+g825ef36.pack --agree-embedded-license"
+             wget -P /home/arm_mlops_docker https://github.com/ARM-software/CMSIS_6/releases/download/dev%2Fv6.0.0-dev35/ARM.CMSIS.6.0.0-dev35+geb1d42a.pack -nv
+             su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add ARM.CMSIS.6.0.0-dev35+geb1d42a.pack --agree-embedded-license"
              wget -P /home/arm_mlops_docker https://github.com/ARM-software/Cortex_DFP/releases/download/dev%2Fv1.0.0-dev15/ARM.Cortex_DFP.1.0.0-dev15+gf6802e4.pack -nv
              su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add ARM.Cortex_DFP.1.0.0-dev15+gf6802e4.pack --agree-embedded-license"
 

diff --git a/.github/workflows/build_QeexoML.yml b/.github/workflows/build_QeexoML.yml
@@ -36,7 +36,7 @@ jobs:
         # Install custom CMSIS packs required for the ML project
         run: | 
              su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add https://github.com/ARM-software/CMSIS-RTX/releases/download/dev%2Fv1.0.0-dev7/ARM.CMSIS-RTX.1.0.0-dev7+g11d1f10.pack --agree-embedded-license"
-             su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add https://github.com/ARM-software/CMSIS_6/releases/download/dev%2Fv6.0.0-dev53/ARM.CMSIS.6.0.0-dev53+g825ef36.pack --agree-embedded-license"
+             su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add https://github.com/ARM-software/CMSIS_6/releases/download/dev%2Fv6.0.0-dev35/ARM.CMSIS.6.0.0-dev35+geb1d42a.pack --agree-embedded-license"
              su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add https://github.com/ARM-software/Cortex_DFP/releases/download/dev%2Fv1.0.0-dev15/ARM.Cortex_DFP.1.0.0-dev15+gf6802e4.pack --agree-embedded-license"
 
       - name: Build custom Qeexo project CMSIS pack

diff --git a/.github/workflows/build_TFLmicrospeech.yml b/.github/workflows/build_TFLmicrospeech.yml
@@ -35,8 +35,8 @@ jobs:
       - name: Install custom CMSIS packs
         # Install custom CMSIS packs required for the ML project
         run: | 
-             wget -P /home/arm_mlops_docker https://github.com/ARM-software/CMSIS_6/releases/download/dev%2Fv6.0.0-dev53/ARM.CMSIS.6.0.0-dev53+g825ef36.pack -nv
-             su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add ARM.CMSIS.6.0.0-dev53+g825ef36.pack --agree-embedded-license"
+             wget -P /home/arm_mlops_docker https://github.com/ARM-software/CMSIS_6/releases/download/dev%2Fv6.0.0-dev35/ARM.CMSIS.6.0.0-dev35+geb1d42a.pack -nv
+             su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add ARM.CMSIS.6.0.0-dev35+geb1d42a.pack --agree-embedded-license"
              wget -P /home/arm_mlops_docker https://github.com/ARM-software/Cortex_DFP/releases/download/dev%2Fv1.0.0-dev15/ARM.Cortex_DFP.1.0.0-dev15+gf6802e4.pack -nv
              su -l arm_mlops_docker -c "/home/arm_mlops_docker/cmsis-toolbox-linux-amd64/bin/cpackget add ARM.Cortex_DFP.1.0.0-dev15+gf6802e4.pack --agree-embedded-license"
 

diff --git a/mlek-kws/Model/RTE/Machine_Learning/micro_time.cpp b/mlek-kws/Model/RTE/Machine_Learning/micro_time.cpp
@@ -70,7 +70,10 @@ uint32_t GetCurrentTimeTicks() {
     ARM_PMU_CNTR_Enable(PMU_CNTENSET_CCNTR_ENABLE_Msk);
 
 #else
-    DCB->DEMCR |= DCB_DEMCR_TRCENA_Msk;
+#ifdef ARMCM7
+    DWT->LAR = 0xC5ACCE55;
+#endif
+    CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
 
     // Reset and DWT cycle counter.
     DWT->CYCCNT = 0;