Examples: Update framework

Use recent packs:
- ARM::CMSIS@>=6.0.0
- ARM::CMSIS-Driver@>=2.8.0
- ARM::ARM::CMSIS-View@>=1.0.0
- ARM::CMSIS-Compiler@>=2.0.0
- MDK-Packs::[email protected]
- Keil::[email protected]

CMSIS-Driver:[email protected]
- Custom implementations for B-U585I-IOT2A and IMXRT1050-EVKB boards

Add sensor initialization in main.c for IMXRT1050-EVKB board

Author: DavidLesnjak

examples/framework/interface/gpio/include/README.md

@@ -12,9 +12,9 @@ The API is defined in the [Driver_GPIO.h](./Driver_GPIO.h) header file.
 
 ## API aligned with CMSIS-Driver specification
 
-This proposal is aligned with [CMSIS-Driver](https://arm-software.github.io/CMSIS_5/Driver/html/group__mci__interface__gr.html) specification with some exceptions.
+This proposal is aligned with [CMSIS-Driver](https://arm-software.github.io/CMSIS_6/latest/Driver/group__gpio__interface__gr.html) specification with some exceptions.
 
-The API provides common driver functions and expects function calls as described in CMSIS-Driver [Theory of Operation](https://arm-software.github.io/CMSIS_5/Driver/html/theoryOperation.html).
+The API provides common driver functions and expects function calls as described in CMSIS-Driver [Theory of Operation](https://arm-software.github.io/CMSIS_6/latest/Driver/theoryOperation.html).
 
 >Note: The term GPIO is used consistently in the API despite that it defines operations on pin level.
 

examples/framework/layer/Board/AVH_MPS3_Corstone-300/Board.clayer.yml

@@ -23,9 +23,9 @@ layer:
 
   packs:
     - pack: ARM::[email protected]
-    - pack: ARM::CMSIS@5.9.0
-    - pack: ARM::CMSIS-Driver
-    - pack: ARM::CMSIS-View
+    - pack: ARM::CMSIS@>=6.0.0
+    - pack: ARM::CMSIS-Driver@>=2.8.0
+    - pack: ARM::CMSIS-View@>=1.0.0
 
   define:
     - CMSIS_board_header: "\"AVH_MPS3_Corstone_300.h\""

examples/framework/layer/Board/AVH_MPS3_Corstone-300/Driver/vio_V2M-MPS3-SSE-300.c

@@ -1,11 +1,12 @@
 /******************************************************************************
  * @file     vio.c
  * @brief    Virtual I/O implementation template
- * @version  V1.0.0
- * @date     23. March 2020
+ * @version  V2.0.0
+ * @date     18. October 2023
  ******************************************************************************/
 /*
- * Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2023 Arm Limited (or its affiliates).
+ * All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -38,12 +39,17 @@ vioLED6           | vioSignalOut.6 | User LED UL6
 vioLED7           | vioSignalOut.7 | User LED UL7                                   |
 */
 
-#include <stdio.h>
+/* History:
+ *  Version 2.0.0
+ *    Updated to API 1.0.0
+ *  Version 1.0.0
+ *    Initial release
+ */
+
 #include <string.h>
-#include <stdarg.h>
 #include "cmsis_vio.h"
 
-#include "RTE_Components.h"             // Component selection
+#include "RTE_Components.h"                 // Component selection
 #include CMSIS_device_header
 
 #if !defined CMSIS_VOUT || !defined CMSIS_VIN
@@ -53,21 +59,12 @@ vioLED7           | vioSignalOut.7 | User LED UL7
 #endif
 
 // VIO input, output definitions
-#define VIO_PRINT_MAX_SIZE      64U     // maximum size of print memory
-#define VIO_PRINTMEM_NUM         4U     // number of print memories
-#define VIO_VALUE_NUM            3U     // number of values
-#define VIO_VALUEXYZ_NUM         3U     // number of XYZ values
-#define VIO_IPV4_ADDRESS_NUM     2U     // number of IPv4 addresses
-#define VIO_IPV6_ADDRESS_NUM     2U     // number of IPv6 addresses
+#define VIO_VALUE_NUM           3U          // Number of values
 
 // VIO input, output variables
-__USED uint32_t      vioSignalIn;                                       // Memory for incoming signal
-__USED uint32_t      vioSignalOut;                                      // Memory for outgoing signal
-__USED char          vioPrintMem[VIO_PRINTMEM_NUM][VIO_PRINT_MAX_SIZE]; // Memory for the last value for each level
-__USED int32_t       vioValue   [VIO_VALUE_NUM];                        // Memory for value used in vioGetValue/vioSetValue
-__USED vioValueXYZ_t vioValueXYZ[VIO_VALUEXYZ_NUM];                     // Memory for XYZ value for 3-D vector
-__USED vioAddrIPv4_t vioAddrIPv4[VIO_IPV4_ADDRESS_NUM];                 // Memory for IPv4 address value used in vioSetIPv4/vioGetIPv4
-__USED vioAddrIPv6_t vioAddrIPv6[VIO_IPV6_ADDRESS_NUM];                 // Memory for IPv6 address value used in vioSetIPv6/vioGetIPv6
+__USED uint32_t vioSignalIn;                // Memory for incoming signal
+__USED uint32_t vioSignalOut;               // Memory for outgoing signal
+__USED int32_t  vioValue[VIO_VALUE_NUM];    // Memory for value used in vioGetValue/vioSetValue
 
 #if !defined CMSIS_VOUT
 // Add global user types, variables, functions here:
@@ -93,11 +90,7 @@ void vioInit (void) {
   vioSignalIn  = 0U;
   vioSignalOut = 0U;
 
-  memset (vioPrintMem, 0, sizeof(vioPrintMem));
-  memset (vioValue,    0, sizeof(vioValue));
-  memset (vioValueXYZ, 0, sizeof(vioValueXYZ));
-  memset (vioAddrIPv4, 0, sizeof(vioAddrIPv4));
-  memset (vioAddrIPv6, 0, sizeof(vioAddrIPv6));
+  memset(vioValue, 0, sizeof(vioValue));
 
 #if !defined CMSIS_VOUT
   // Turn off all LEDs
@@ -110,37 +103,6 @@ void vioInit (void) {
 #endif
 }
 
-// Print formated string to test terminal.
-int32_t vioPrint (uint32_t level, const char *format, ...) {
-  va_list args;
-  int32_t ret;
-#if !defined CMSIS_VOUT
-// Add user variables here:
-
-#endif
-
-  if (level > vioLevelError) {
-    return (-1);
-  }
-
-  if (level > VIO_PRINTMEM_NUM) {
-    return (-1);
-  }
-
-  va_start(args, format);
-
-  ret = vsnprintf((char *)vioPrintMem[level], sizeof(vioPrintMem[level]), format, args);
-
-  va_end(args);
-
-#if !defined CMSIS_VOUT
-// Add user code here:
-
-#endif
-
-  return (ret);
-}
-
 // Set signal output.
 void vioSetSignal (uint32_t mask, uint32_t signal) {
 #if !defined CMSIS_VOUT
@@ -171,9 +133,9 @@ uint32_t vioGetSignal (uint32_t mask) {
   vioSignalIn = arm_mps3_io_read_buttons(&MPS3_IO_DEV, ARM_MPS3_IO_ACCESS_PORT, 0);
 #endif
 
-  signal = vioSignalIn;
+  signal = vioSignalIn & mask;
 
-  return (signal & mask);
+  return signal;
 }
 
 // Set value output.
@@ -219,136 +181,3 @@ int32_t vioGetValue (uint32_t id) {
 
   return value;
 }
-
-// Set XYZ value output.
-void vioSetXYZ (uint32_t id, vioValueXYZ_t valueXYZ) {
-  uint32_t index = id;
-#if !defined CMSIS_VOUT
-// Add user variables here:
-
-#endif
-
-  if (index >= VIO_VALUEXYZ_NUM) {
-    return;                             /* return in case of out-of-range index */
-  }
-
-  vioValueXYZ[index] = valueXYZ;
-
-#if !defined CMSIS_VOUT
-// Add user code here:
-
-#endif
-}
-
-// Get XYZ value input.
-vioValueXYZ_t vioGetXYZ (uint32_t id) {
-  uint32_t index = id;
-  vioValueXYZ_t valueXYZ = {0, 0, 0};
-#if !defined CMSIS_VIN
-// Add user variables here:
-
-#endif
-
-  if (index >= VIO_VALUEXYZ_NUM) {
-    return valueXYZ;                    /* return default in case of out-of-range index */
-  }
-
-#if !defined CMSIS_VIN
-// Add user code here:
-
-//   vioValueXYZ[index] = ...;
-#endif
-
-  valueXYZ = vioValueXYZ[index];
-
-  return valueXYZ;
-}
-
-// Set IPv4 address output.
-void vioSetIPv4 (uint32_t id, vioAddrIPv4_t addrIPv4) {
-  uint32_t index = id;
-#if !defined CMSIS_VOUT
-// Add user variables here:
-
-#endif
-
-  if (index >= VIO_IPV4_ADDRESS_NUM) {
-    return;                             /* return in case of out-of-range index */
-  }
-
-  vioAddrIPv4[index] = addrIPv4;
-
-#if !defined CMSIS_VOUT
-// Add user code here:
-
-#endif
-}
-
-// Get IPv4 address input.
-vioAddrIPv4_t vioGetIPv4 (uint32_t id) {
-  uint32_t index = id;
-  vioAddrIPv4_t addrIPv4 = {0U, 0U, 0U, 0U};
-#if !defined CMSIS_VIN
-// Add user variables here:
-
-#endif
-
-  if (index >= VIO_IPV4_ADDRESS_NUM) {
-    return addrIPv4;                    /* return default in case of out-of-range index */
-  }
-
-#if !defined CMSIS_VIN
-// Add user code here:
-
-//   vioAddrIPv4[index] = ...;
-#endif
-
-  addrIPv4 = vioAddrIPv4[index];
-
-  return addrIPv4;
-}
-
-// Set IPv6 address output.
-void vioSetIPv6 (uint32_t id, vioAddrIPv6_t addrIPv6) {
-  uint32_t index = id;
-#if !defined CMSIS_VOUT
-// Add user variables here:
-
-#endif
-
-  if (index >= VIO_IPV6_ADDRESS_NUM) {
-    return;                             /* return in case of out-of-range index */
-  }
-
-  vioAddrIPv6[index] = addrIPv6;
-
-#if !defined CMSIS_VOUT
-// Add user code here:
-
-#endif
-}
-
-// Get IPv6 address input.
-vioAddrIPv6_t vioGetIPv6 (uint32_t id) {
-  uint32_t index = id;
-  vioAddrIPv6_t addrIPv6 = {0U, 0U, 0U, 0U, 0U, 0U, 0U, 0U,
-                            0U, 0U, 0U, 0U, 0U, 0U, 0U, 0U};
-#if !defined CMSIS_VIN
-// Add user variables here:
-
-#endif
-
-  if (index >= VIO_IPV6_ADDRESS_NUM) {
-    return addrIPv6;                    /* return default in case of out-of-range index */
-  }
-
-#if !defined CMSIS_VIN
-// Add user code here:
-
-//   vioAddrIPv6[index] = ...;
-#endif
-
-  addrIPv6 = vioAddrIPv6[index];
-
-  return addrIPv6;
-}

examples/framework/layer/Board/B-U585I-IOT02A/Board.clayer.yml

@@ -41,9 +41,9 @@ layer:
   packs:
     - pack: Keil::[email protected]
     - pack: Keil::[email protected]
-    - pack: ARM::CMSIS@5.9.0
-    - pack: ARM::CMSIS-View
-    - pack: ARM::CMSIS-Compiler@1.0.0
+    - pack: ARM::CMSIS@>=6.0.0
+    - pack: ARM::CMSIS-View@>=1.0.0
+    - pack: ARM::CMSIS-Compiler@>=2.0.0
 
   define:
     - CMSIS_board_header: "\"B_U585I_IOT02A_DK.h\""
@@ -111,13 +111,16 @@ layer:
     - component: Keil::CMSIS Driver:SPI
     - component: Keil::CMSIS Driver:USART
     - component: Keil::CMSIS Driver:USB Device
-    - component: Keil::CMSIS Driver:VIO
+    # - component: Keil::CMSIS Driver:VIO
     - component: Keil::CMSIS Driver:WiFi:EMW3080
 
+    - component: ARM::CMSIS Driver:VIO:Custom
+
     - component: ARM::CMSIS-View:Event Recorder&DAP
-    - component: ARM::CMSIS-Compiler:I/O:STDERR&User
-    - component: ARM::CMSIS-Compiler:I/O:STDOUT&User
-    - component: ARM::CMSIS-Compiler:I/O:STDIN&User
+    - component: ARM::CMSIS-Compiler:CORE
+    - component: ARM::CMSIS-Compiler:STDERR:Custom
+    - component: ARM::CMSIS-Compiler:STDOUT:Custom
+    - component: ARM::CMSIS-Compiler:STDIN:Custom
 
   groups:
     - group: GPIO Interface
@@ -138,3 +141,4 @@ layer:
         - file: ./Driver/sensor_drv_hw.c
         - file: ./Driver/Audio_B-U585I-IOT02A.c
         - file: ./Driver/ism330dhcx_fifo.c
+        - file: ./Driver/vio_B-U585I-IOT02A.c

examples/framework/layer/Board/B-U585I-IOT02A/Board/B-U585I-IOT02A/STM32CubeMX/Src/main.c

@@ -201,9 +201,11 @@ static void BSP_SENSOR_Init (void) {
   BSP_ENV_SENSOR_Init(0U, ENV_TEMPERATURE);
   BSP_ENV_SENSOR_Init(0U, ENV_HUMIDITY);
   BSP_ENV_SENSOR_Init(1U, ENV_PRESSURE);
-//  BSP_MOTION_SENSOR_Init(0U, MOTION_ACCELERO);
-//  BSP_MOTION_SENSOR_Init(0U, MOTION_GYRO);
-//  BSP_MOTION_SENSOR_Init(1U, MOTION_MAGNETO);
+#ifndef RTE_VIO_BOARD
+  BSP_MOTION_SENSOR_Init(0U, MOTION_ACCELERO);
+  BSP_MOTION_SENSOR_Init(0U, MOTION_GYRO);
+  BSP_MOTION_SENSOR_Init(1U, MOTION_MAGNETO);
+#endif
   BSP_ENV_SENSOR_Disable(0U, ENV_TEMPERATURE);
   BSP_ENV_SENSOR_Disable(0U, ENV_HUMIDITY);
   BSP_ENV_SENSOR_Disable(1U, ENV_PRESSURE);