Update example (#5)

- Move RTOS init/start to app_main - Update csolution.yml and cproject.yml files - Update RTE_Components.h - Improve formatting
Arm-Examples · Nov 27, 2024 · ee896b4 · ee896b4
1 parent 31954af
commit ee896b4
Show file tree

Hide file tree

Showing 34 changed files with 307 additions and 315 deletions.
diff --git a/Hello.cproject.yml b/Hello.cproject.yml
@@ -1,65 +1,66 @@
+# A project translates into one executable or library.
 project:
 
-# it is recommended to list the packs that contain the components in the cproject.yml file.
-  groups:
-    - group: Documentation
-      files: 
-        - file: ./README.md
-    - group: Main
-      files:
-        - file: ./main.c
-    - group: App
-      files:
-          - file: ./hello.c
-    - group: Board IO
-      files:
-        - file: ./Board_IO/retarget_stdio.c
-
+  # List components to use for your application.
+  # A software component is a re-usable unit that may be configurable.
   components:
-    - component: CMSIS:CORE                             # short form, vendor selected from available packs
-    - component: ARM::CMSIS:RTOS2:Keil RTX5&Source      # long form, vendor explicitly stated
-    - component: ARM::CMSIS:OS Tick:SysTick
+    - component: CMSIS:CORE
+    - component: CMSIS:RTOS2:Keil RTX5&Source
+    - component: CMSIS:OS Tick:SysTick
     - component: CMSIS Driver:USART
     - component: Device:Startup&C Startup
-    - component: ARM::CMSIS-Compiler:CORE
-    - component: ARM::CMSIS-Compiler:STDERR:Custom
-    - component: ARM::CMSIS-Compiler:STDOUT:Custom
-    - component: ARM::CMSIS-Compiler:STDIN:Custom
-
+    - component: CMSIS-Compiler:CORE
+    - component: CMSIS-Compiler:STDERR:Custom
+    - component: CMSIS-Compiler:STDOUT:Custom
+    - component: CMSIS-Compiler:STDIN:Custom
 
-    - component: ARM::Device:Native Driver:IO
+    - component: Device:Native Driver:IO
       for-context:
       - +CS300
       - +CS310
       - +CS315
 
-    - component: ARM::Device:Native Driver:UART
+    - component: Device:Native Driver:UART
       for-context:
       - +CS300
       - +CS310
       - +CS315
 
-    - component: ARM::Device:Native Driver:SysCounter
+    - component: Device:Native Driver:SysCounter
       for-context:
       - +CS300
       - +CS310
       - +CS315
 
-    - component: ARM::Device:Native Driver:SysTimer
+    - component: Device:Native Driver:SysTimer
       for-context:
       - +CS300
       - +CS310
       - +CS315
 
-    - component: ARM::Device:Native Driver:Timeout
+    - component: Device:Native Driver:Timeout
       for-context:
       - +CS300
       - +CS310
       - +CS315
 
-    - component: ARM::Device:Definition
+    - component: Device:Definition
       for-context:
       - +CS300
       - +CS310
       - +CS315
 
+  # List of source groups and files added to a project or a layer.
+  groups:
+    - group: Documentation
+      files: 
+        - file: ./README.md
+    - group: Main
+      files:
+        - file: ./main.c
+    - group: App
+      files:
+        - file: ./hello.c
+    - group: Board IO
+      files:
+        - file: ./Board_IO/retarget_stdio.c
diff --git a/Hello.csolution.yml b/Hello.csolution.yml
@@ -1,81 +1,85 @@
-solution:
-
-  created-for: [email protected]
-  description: Print Hello World and a counter value via UART
-  select-compiler:
-    - compiler: AC6
-    - compiler: GCC
-  cdefault:
-
-
-  # It is recommended to list the pack or packs that define the device or board used in the csolution.yml file
-  packs:
-    - pack: ARM::CMSIS
-    - pack: ARM::CMSIS-RTX
+# A solution is a collection of related projects that share same base configuration.
+solution:
+
+  created-for: [email protected]
+  description: Print Hello World and a counter value via UART
+  cdefault:
+
+  # List of tested compilers that can be selected.
+  select-compiler:
+    - compiler: AC6
+    - compiler: GCC
+
+  # List the packs that define the device and/or board.
+  packs:
+    - pack: ARM::CMSIS
+    - pack: ARM::CMSIS-RTX
     - pack: ARM::V2M_MPS3_SSE_300_BSP          # Corstone-300 (Cortex-M55)
     - pack: ARM::V2M_MPS3_SSE_310_BSP          # SSE-310-MPS3_FVP
     - pack: ARM::SSE_315_BSP                   # SSE-315-FVP
     - pack: Keil::V2M-MPS2_CMx_BSP             # For Cortex-M0 .. M33  ;  AVH-CM* devices.
     - pack: Keil::V2M-MPS2_IOTKit_BSP          # For the IOTKit_CM23_VHT, IOTKit_CM33_VHT, and IOTKit_CM33_FP_VHT devices
     - pack: Keil::V2M-MPS3_IOTKit_BSP          # For the IOTKit_CM33_MPS3 and the IOTKit_CM33_FP_MPS3 devices
     - pack: ARM::CMSIS-Compiler                # For retargeting stdout to UART
-
-
-  target-types:
-    - type: CS300                              # Runs on Arm Virtual Hardware
-      device: ARM::SSE-300-MPS3
-
-    - type: CS310
-      device: ARM::SSE-310-MPS3_FVP
-
-    - type: CS315
-      device: ARM::SSE-315-FVP
-
-    - type: CM0plus
-      device: ARM::CMSDK_CM0plus_VHT
-
-    - type: CM0
-      device: ARM::CMSDK_CM0_VHT
-
-    - type: CM3
-      device: ARM::CMSDK_CM3_VHT
-
-    - type: CM4
-      device: ARM::CMSDK_CM4_VHT
-
-    - type: CM4_FP
-      device: ARM::CMSDK_CM4_FP_VHT
-
-    - type: CM7
-      device: ARM::CMSDK_CM7_VHT
-
-    - type: CM7_SP
-      device: ARM::CMSDK_CM7_SP_VHT
-
-    - type: CM7_DP
-      device: ARM::CMSDK_CM7_DP_VHT
-
-    - type: CM23
-      device: ARM::IOTKit_CM23_VHT
-
-    - type: CM33
-      device: ARM::IOTKit_CM33_VHT
-
-    - type: CM33_FP
-      device: ARM::IOTKit_CM33_FP_VHT
-
-                                              # add more hardware targets (don't forget to add the required packs)
-  build-types:                                # defines toolchain options for 'debug' and 'release'
-    - type: Debug
-      debug: on
-      optimize: none
-
-    - type: Release
-      debug: off
-      optimize: balanced
-
-  output-dirs:
-    outdir:  $SolutionDir()$/out/$Project$/$TargetType$/$BuildType$/$Compiler$
-
-  projects:                                   # list related projects
-    - project: ./Hello.cproject.yml
+
+  # List different targets that are used to deploy the solution.
+  target-types:
+    - type: CS300
+      device: ARM::SSE-300-MPS3
+
+    - type: CS310
+      device: ARM::SSE-310-MPS3_FVP
+
+    - type: CS315
+      device: ARM::SSE-315-FVP
+
+    - type: CM0plus
+      device: ARM::CMSDK_CM0plus_VHT
+
+    - type: CM0
+      device: ARM::CMSDK_CM0_VHT
+
+    - type: CM3
+      device: ARM::CMSDK_CM3_VHT
+
+    - type: CM4
+      device: ARM::CMSDK_CM4_VHT
+
+    - type: CM4_FP
+      device: ARM::CMSDK_CM4_FP_VHT
+
+    - type: CM7
+      device: ARM::CMSDK_CM7_VHT
+
+    - type: CM7_SP
+      device: ARM::CMSDK_CM7_SP_VHT
+
+    - type: CM7_DP
+      device: ARM::CMSDK_CM7_DP_VHT
+
+    - type: CM23
+      device: ARM::IOTKit_CM23_VHT
+
+    - type: CM33
+      device: ARM::IOTKit_CM33_VHT
+
+    - type: CM33_FP
+      device: ARM::IOTKit_CM33_FP_VHT
+
+  # List of different build configurations.
+  build-types:
+    - type: Debug
+      debug: on
+      optimize: none
+
+    - type: Release
+      debug: off
+      optimize: balanced
+
+  # Set output directory.
+  output-dirs:
+    outdir: $SolutionDir()$/out/$Project$/$TargetType$/$BuildType$/$Compiler$
+
+  # List related projects.
+  projects:
+    - project: ./Hello.cproject.yml
diff --git a/RTE/_Debug_CM0/RTE_Components.h b/RTE/_Debug_CM0/RTE_Components.h
@@ -1,6 +1,6 @@
 /*
  * CSOLUTION generated file: DO NOT EDIT!
- * Generated by: csolution version 2.5.0
+ * Generated by: csolution version 2.6.0
  *
  * Project: 'Hello.Debug+CM0' 
  * Target:  'Debug+CM0' 
@@ -17,17 +17,17 @@
 
 /* ARM::CMSIS-Compiler:STDERR:[email protected] */
 #define RTE_CMSIS_Compiler_STDERR                /* CMSIS-Compiler STDERR */
-        #define RTE_CMSIS_Compiler_STDERR_Custom         /* CMSIS-Compiler STDERR: Custom */
+#define RTE_CMSIS_Compiler_STDERR_Custom         /* CMSIS-Compiler STDERR: Custom */
 /* ARM::CMSIS-Compiler:STDIN:[email protected] */
 #define RTE_CMSIS_Compiler_STDIN                 /* CMSIS-Compiler STDIN */
-        #define RTE_CMSIS_Compiler_STDIN_Custom          /* CMSIS-Compiler STDIN: Custom */
+#define RTE_CMSIS_Compiler_STDIN_Custom          /* CMSIS-Compiler STDIN: Custom */
 /* ARM::CMSIS-Compiler:STDOUT:[email protected] */
 #define RTE_CMSIS_Compiler_STDOUT                /* CMSIS-Compiler STDOUT */
-        #define RTE_CMSIS_Compiler_STDOUT_Custom         /* CMSIS-Compiler STDOUT: Custom */
+#define RTE_CMSIS_Compiler_STDOUT_Custom         /* CMSIS-Compiler STDOUT: Custom */
 /* ARM::CMSIS:RTOS2:Keil RTX5&[email protected] */
 #define RTE_CMSIS_RTOS2                 /* CMSIS-RTOS2 */
-        #define RTE_CMSIS_RTOS2_RTX5            /* CMSIS-RTOS2 Keil RTX5 */
-        #define RTE_CMSIS_RTOS2_RTX5_SOURCE     /* CMSIS-RTOS2 Keil RTX5 Source */
+#define RTE_CMSIS_RTOS2_RTX5            /* CMSIS-RTOS2 Keil RTX5 */
+#define RTE_CMSIS_RTOS2_RTX5_SOURCE     /* CMSIS-RTOS2 Keil RTX5 Source */
 /* Keil::CMSIS Driver:[email protected] */
 #define RTE_Drivers_USART
 

diff --git a/RTE/_Debug_CM0plus/RTE_Components.h b/RTE/_Debug_CM0plus/RTE_Components.h
@@ -1,6 +1,6 @@
 /*
  * CSOLUTION generated file: DO NOT EDIT!
- * Generated by: csolution version 2.5.0
+ * Generated by: csolution version 2.6.0
  *
  * Project: 'Hello.Debug+CM0plus' 
  * Target:  'Debug+CM0plus' 
@@ -17,17 +17,17 @@
 
 /* ARM::CMSIS-Compiler:STDERR:[email protected] */
 #define RTE_CMSIS_Compiler_STDERR                /* CMSIS-Compiler STDERR */
-        #define RTE_CMSIS_Compiler_STDERR_Custom         /* CMSIS-Compiler STDERR: Custom */
+#define RTE_CMSIS_Compiler_STDERR_Custom         /* CMSIS-Compiler STDERR: Custom */
 /* ARM::CMSIS-Compiler:STDIN:[email protected] */
 #define RTE_CMSIS_Compiler_STDIN                 /* CMSIS-Compiler STDIN */
-        #define RTE_CMSIS_Compiler_STDIN_Custom          /* CMSIS-Compiler STDIN: Custom */
+#define RTE_CMSIS_Compiler_STDIN_Custom          /* CMSIS-Compiler STDIN: Custom */
 /* ARM::CMSIS-Compiler:STDOUT:[email protected] */
 #define RTE_CMSIS_Compiler_STDOUT                /* CMSIS-Compiler STDOUT */
-        #define RTE_CMSIS_Compiler_STDOUT_Custom         /* CMSIS-Compiler STDOUT: Custom */
+#define RTE_CMSIS_Compiler_STDOUT_Custom         /* CMSIS-Compiler STDOUT: Custom */
 /* ARM::CMSIS:RTOS2:Keil RTX5&[email protected] */
 #define RTE_CMSIS_RTOS2                 /* CMSIS-RTOS2 */
-        #define RTE_CMSIS_RTOS2_RTX5            /* CMSIS-RTOS2 Keil RTX5 */
-        #define RTE_CMSIS_RTOS2_RTX5_SOURCE     /* CMSIS-RTOS2 Keil RTX5 Source */
+#define RTE_CMSIS_RTOS2_RTX5            /* CMSIS-RTOS2 Keil RTX5 */
+#define RTE_CMSIS_RTOS2_RTX5_SOURCE     /* CMSIS-RTOS2 Keil RTX5 Source */
 /* Keil::CMSIS Driver:[email protected] */
 #define RTE_Drivers_USART
 

diff --git a/RTE/_Debug_CM23/RTE_Components.h b/RTE/_Debug_CM23/RTE_Components.h
@@ -1,6 +1,6 @@
 /*
  * CSOLUTION generated file: DO NOT EDIT!
- * Generated by: csolution version 2.5.0
+ * Generated by: csolution version 2.6.0
  *
  * Project: 'Hello.Debug+CM23' 
  * Target:  'Debug+CM23' 
@@ -17,17 +17,17 @@
 
 /* ARM::CMSIS-Compiler:STDERR:[email protected] */
 #define RTE_CMSIS_Compiler_STDERR                /* CMSIS-Compiler STDERR */
-        #define RTE_CMSIS_Compiler_STDERR_Custom         /* CMSIS-Compiler STDERR: Custom */
+#define RTE_CMSIS_Compiler_STDERR_Custom         /* CMSIS-Compiler STDERR: Custom */
 /* ARM::CMSIS-Compiler:STDIN:[email protected] */
 #define RTE_CMSIS_Compiler_STDIN                 /* CMSIS-Compiler STDIN */
-        #define RTE_CMSIS_Compiler_STDIN_Custom          /* CMSIS-Compiler STDIN: Custom */
+#define RTE_CMSIS_Compiler_STDIN_Custom          /* CMSIS-Compiler STDIN: Custom */
 /* ARM::CMSIS-Compiler:STDOUT:[email protected] */
 #define RTE_CMSIS_Compiler_STDOUT                /* CMSIS-Compiler STDOUT */
-        #define RTE_CMSIS_Compiler_STDOUT_Custom         /* CMSIS-Compiler STDOUT: Custom */
+#define RTE_CMSIS_Compiler_STDOUT_Custom         /* CMSIS-Compiler STDOUT: Custom */
 /* ARM::CMSIS:RTOS2:Keil RTX5&[email protected] */
 #define RTE_CMSIS_RTOS2                 /* CMSIS-RTOS2 */
-        #define RTE_CMSIS_RTOS2_RTX5            /* CMSIS-RTOS2 Keil RTX5 */
-        #define RTE_CMSIS_RTOS2_RTX5_SOURCE     /* CMSIS-RTOS2 Keil RTX5 Source */
+#define RTE_CMSIS_RTOS2_RTX5            /* CMSIS-RTOS2 Keil RTX5 */
+#define RTE_CMSIS_RTOS2_RTX5_SOURCE     /* CMSIS-RTOS2 Keil RTX5 Source */
 /* Keil::CMSIS Driver:[email protected] */
 #define RTE_Drivers_USART
 

diff --git a/RTE/_Debug_CM3/RTE_Components.h b/RTE/_Debug_CM3/RTE_Components.h
@@ -1,6 +1,6 @@
 /*
  * CSOLUTION generated file: DO NOT EDIT!
- * Generated by: csolution version 2.5.0
+ * Generated by: csolution version 2.6.0
  *
  * Project: 'Hello.Debug+CM3' 
  * Target:  'Debug+CM3' 
@@ -17,17 +17,17 @@
 
 /* ARM::CMSIS-Compiler:STDERR:[email protected] */
 #define RTE_CMSIS_Compiler_STDERR                /* CMSIS-Compiler STDERR */
-        #define RTE_CMSIS_Compiler_STDERR_Custom         /* CMSIS-Compiler STDERR: Custom */
+#define RTE_CMSIS_Compiler_STDERR_Custom         /* CMSIS-Compiler STDERR: Custom */
 /* ARM::CMSIS-Compiler:STDIN:[email protected] */
 #define RTE_CMSIS_Compiler_STDIN                 /* CMSIS-Compiler STDIN */
-        #define RTE_CMSIS_Compiler_STDIN_Custom          /* CMSIS-Compiler STDIN: Custom */
+#define RTE_CMSIS_Compiler_STDIN_Custom          /* CMSIS-Compiler STDIN: Custom */
 /* ARM::CMSIS-Compiler:STDOUT:[email protected] */
 #define RTE_CMSIS_Compiler_STDOUT                /* CMSIS-Compiler STDOUT */
-        #define RTE_CMSIS_Compiler_STDOUT_Custom         /* CMSIS-Compiler STDOUT: Custom */
+#define RTE_CMSIS_Compiler_STDOUT_Custom         /* CMSIS-Compiler STDOUT: Custom */
 /* ARM::CMSIS:RTOS2:Keil RTX5&[email protected] */
 #define RTE_CMSIS_RTOS2                 /* CMSIS-RTOS2 */
-        #define RTE_CMSIS_RTOS2_RTX5            /* CMSIS-RTOS2 Keil RTX5 */
-        #define RTE_CMSIS_RTOS2_RTX5_SOURCE     /* CMSIS-RTOS2 Keil RTX5 Source */
+#define RTE_CMSIS_RTOS2_RTX5            /* CMSIS-RTOS2 Keil RTX5 */
+#define RTE_CMSIS_RTOS2_RTX5_SOURCE     /* CMSIS-RTOS2 Keil RTX5 Source */
 /* Keil::CMSIS Driver:[email protected] */
 #define RTE_Drivers_USART