-
Notifications
You must be signed in to change notification settings - Fork 198
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #136 from kshitij-sisodia-arm/feature/update-pack-…
…versions-20240619 MLECO-4703: Updates for pack versions
- Loading branch information
Showing
27 changed files
with
385 additions
and
323 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its | ||
| # SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its | ||
| # affiliates <[email protected]> | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
|
|
@@ -14,7 +14,7 @@ | |
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/cdefault.schema.json | ||
| # yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.4.0/tools/projmgr/schemas/cdefault.schema.json | ||
|
|
||
| default: | ||
| # Note that we need [email protected] or higher to compile for Corstone-310 target. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its | ||
| # SPDX-FileCopyrightText: Copyright 2022-2024 Arm Limited and/or its | ||
| # affiliates <[email protected]> | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
|
|
@@ -14,7 +14,7 @@ | |
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/clayer.schema.json | ||
| # yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.4.0/tools/projmgr/schemas/clayer.schema.json | ||
|
|
||
| layer: | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its | ||
| # SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its | ||
| # affiliates <[email protected]> | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| # | ||
|
|
@@ -14,7 +14,7 @@ | |
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.0.0/tools/projmgr/schemas/clayer.schema.json | ||
| # yaml-language-server: $schema=https://raw.githubusercontent.com/Open-CMSIS-Pack/devtools/schemas/projmgr/2.4.0/tools/projmgr/schemas/clayer.schema.json | ||
|
|
||
| layer: | ||
| description: Alif Ensemble E7 ML islands' CPU device layer (High-Performance and High-Efficiency Arm Cortex-M55 CPUs). | ||
|
|
@@ -26,7 +26,8 @@ layer: | |
| files: | ||
| - file: ./src/GpioSignal.cpp | ||
| - file: ./include/GpioSignal.hpp | ||
| - file: ./src/gpio.c | ||
| - file: ./src/gpio_wrapper.c | ||
| - file: ./src/gpio_wrapper.h | ||
|
|
||
| - group: AudioHelpers | ||
| for-context: +Alif-E7-M55-HE | ||
|
|
@@ -64,11 +65,10 @@ layer: | |
| - component: AlifSemiconductor::Device:SOC Peripherals:USART | ||
| - component: AlifSemiconductor::Device:SOC Peripherals:GPIO | ||
| - component: AlifSemiconductor::Device:SOC Peripherals:PINCONF | ||
| - component: AlifSemiconductor::Device:SOC Peripherals:MHU | ||
| - component: AlifSemiconductor::Device:Startup | ||
| - component: ARM::CMSIS Driver:USART | ||
| - component: ARM::CMSIS Driver:USART:Custom | ||
| - component: AlifSemiconductor::Device:SE Services:SE RunTime services&Source | ||
| - component: AlifSemiconductor::Device:SE Services:MHU Driver | ||
|
|
||
| - component: AlifSemiconductor::Device:SOC Peripherals:DMA | ||
| for-context: +Alif-E7-M55-HE | ||
|
|
@@ -79,7 +79,7 @@ layer: | |
| - component: AlifSemiconductor::Device:SOC Peripherals:I3C | ||
| for-context: +Alif-E7-M55-HP | ||
|
|
||
| - component: AlifSemiconductor::Device:SOC Peripherals:CDC200 | ||
| - component: AlifSemiconductor::Device:SOC Peripherals:CDC | ||
| for-context: +Alif-E7-M55-HP | ||
|
|
||
| - component: AlifSemiconductor::Device:SOC Peripherals:MIPI CSI2 | ||
|
|
@@ -88,11 +88,22 @@ layer: | |
| - component: AlifSemiconductor::Device:SOC Peripherals:MIPI DSI | ||
| for-context: +Alif-E7-M55-HP | ||
|
|
||
| - component: AlifSemiconductor::Device:SOC Peripherals:CAMERA Controller | ||
| - component: AlifSemiconductor::Device:SOC Peripherals:I2C | ||
| for-context: +Alif-E7-M55-HP | ||
|
|
||
| - component: AlifSemiconductor::Device:SOC Peripherals:CPI | ||
| for-context: +Alif-E7-M55-HP | ||
|
|
||
| - component: AlifSemiconductor::BSP:External peripherals:ILI9806E LCD panel | ||
| for-context: +Alif-E7-M55-HP | ||
|
|
||
| - component: AlifSemiconductor::BSP:External peripherals:CAMERA Sensor ARX3A0 | ||
| for-context: +Alif-E7-M55-HP | ||
|
|
||
| - component: AlifSemiconductor::Device:SE runtime Services:core | ||
| for-context: +Alif-E7-M55-HP | ||
|
|
||
| - component: AlifSemiconductor::Device:SE runtime Services:Initialization Helper | ||
| for-context: +Alif-E7-M55-HP | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its | ||
| * SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its | ||
| * affiliates <[email protected]> | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
|
|
@@ -18,18 +18,22 @@ | |
| #ifndef CAMERA_CAPTURE_HPP | ||
| #define CAMERA_CAPTURE_HPP | ||
|
|
||
| #if defined (__cplusplus) | ||
| extern "C" { | ||
| #include "Camera_Common.h" | ||
| } | ||
| #endif | ||
| #include <cstdint> | ||
| #include "Driver_CPI.h" | ||
| #include "RTE_Device.h" | ||
|
|
||
| #if !defined(RTE_ARX3A0_CAMERA_SENSOR_FRAME_WIDTH) || !defined(RTE_ARX3A0_CAMERA_SENSOR_FRAME_HEIGHT) | ||
| #error "Camera frame dimensions undefined!" | ||
| #endif | ||
|
|
||
| #define CAMERA_FRAME_WIDTH 560 | ||
| #define CAMERA_FRAME_HEIGHT 560 | ||
| #define CAMERA_RESOLUTION CAMERA_RESOLUTION_560x560 | ||
| #define CAMERA_FRAME_WIDTH RTE_ARX3A0_CAMERA_SENSOR_FRAME_WIDTH | ||
| #define CAMERA_FRAME_HEIGHT RTE_ARX3A0_CAMERA_SENSOR_FRAME_HEIGHT | ||
| #define CAMERA_IMAGE_RAW_SIZE (CAMERA_FRAME_WIDTH * CAMERA_FRAME_HEIGHT) | ||
|
|
||
| #if CAMERA_IMAGE_RAW_SIZE <= 0 | ||
| #error "Invalid image size" | ||
| #endif | ||
|
|
||
| namespace arm { | ||
| namespace app { | ||
|
|
||
|
|
@@ -48,7 +52,7 @@ enum class ColourFilter { | |
| * @param raw_image Pointer to the raw image that can be populated. | ||
| * @return int: 0 if successful, error code otherwise | ||
| */ | ||
| int CameraCaptureInit(ARM_CAMERA_RESOLUTION resolution); | ||
| int CameraCaptureInit(); | ||
|
|
||
| /** | ||
| * @brief Starts the camera capture (does not wait for it to finish) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its | ||
| * SPDX-FileCopyrightText: Copyright 2022-2024 Arm Limited and/or its | ||
| * affiliates <[email protected]> | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
|
|
@@ -24,7 +24,7 @@ | |
| extern "C" { | ||
| #endif // #if defined(__cplusplus) | ||
|
|
||
| #include "gpio.h" | ||
| #include "gpio_wrapper.h" | ||
|
|
||
| #if defined(__cplusplus) | ||
| } | ||
|
|
@@ -37,14 +37,17 @@ namespace app { | |
| enum class SignalDirection { DirectionOutput = 0, DirectionInput = 1, DirectionInvalid = 2 }; | ||
|
|
||
| /* Valid GPIO port numbers */ | ||
| enum class SignalPort { Port1 = 1, Port2 = 2, Port3 = 3 }; | ||
| enum class SignalPort { Port6 = 6, Port7 = 7, Port12 = 12 }; | ||
|
|
||
| /* Valid and used GPIO pin number definitions */ | ||
| enum class SignalPin { | ||
| Port1_UserButton1 = 12, /* Wired to SW2 on the board. */ | ||
| Port3_UserButton2 = 4, /* Wired to SW3 on the board. */ | ||
| Port1_StatusLED1 = 14, /* LED1 - green. */ | ||
| Port1_StatusLED2 = 15 /* LED2 - orange. */ | ||
| Port12_LED0_R = 3, /* LED0 - red. */ | ||
| Port07_LED0_G = 4, /* LED0 - green. */ | ||
| Port12_LED0_B = 0, /* LED0 - blue. */ | ||
|
|
||
| Port06_LED1_R = 2, /* LED0 - red. */ | ||
| Port06_LED1_G = 4, /* LED0 - green. */ | ||
| Port06_LED1_B = 6 /* LED0 - blue. */ | ||
| }; | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its | ||
| * SPDX-FileCopyrightText: Copyright 2022-2024 Arm Limited and/or its | ||
| * affiliates <[email protected]> | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
|
|
@@ -26,6 +26,14 @@ | |
| #define DIMAGE_Y RTE_PANEL_VACTIVE_LINE | ||
| #define RGB_BYTES 3 | ||
|
|
||
| #if RTE_CDC200_PIXEL_FORMAT==(1) | ||
| #define LCD_BYTES_PER_PIXEL (3) | ||
| #elif RTE_CDC200_PIXEL_FORMAT==(2) | ||
| #define LCD_BYTES_PER_PIXEL (2) | ||
| #else // LCD_BYTES_PER_PIXEL | ||
| #error "Unsupported RTE_CDC200_PIXEL_FORMAT." | ||
| #endif // LCD_BYTES_PER_PIXEL | ||
|
|
||
| namespace arm { | ||
| namespace app { | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its | ||
| * SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its | ||
| * affiliates <[email protected]> | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
|
|
@@ -26,13 +26,13 @@ extern "C" { | |
|
|
||
| #include "RTE_Components.h" | ||
| #include "RTE_Device.h" | ||
| #include <Driver_PINMUX_AND_PINPAD.h> | ||
| #include "pinconf.h" | ||
| #include <Driver_SAI.h> | ||
| #include CMSIS_device_header | ||
|
|
||
| #include <stdio.h> | ||
|
|
||
| #define I2S_ADC 2 /* Audio I2S Controller 2 */ | ||
| #define I2S_ADC 3 /* Audio I2S Controller 3 */ | ||
| extern ARM_DRIVER_SAI ARM_Driver_SAI_(I2S_ADC); | ||
| ARM_DRIVER_SAI* s_i2s_drv; | ||
|
|
||
|
|
@@ -45,9 +45,9 @@ static volatile audio_capture_state s_cap_state; | |
|
|
||
| static void set_capture_completed(bool val) | ||
| { | ||
| NVIC_DisableIRQ((IRQn_Type)I2S2_IRQ); | ||
| NVIC_DisableIRQ((IRQn_Type)I2S3_IRQ_IRQn); | ||
| s_cap_state.capCompleted = val; | ||
| NVIC_EnableIRQ((IRQn_Type)I2S2_IRQ); | ||
| NVIC_EnableIRQ((IRQn_Type)I2S3_IRQ_IRQn); | ||
| } | ||
|
|
||
| static void set_capture_started(bool val) | ||
|
|
@@ -77,20 +77,14 @@ static int32_t ConfigureI2SPinMuxPinPad() | |
| { | ||
| int32_t status = 0; | ||
|
|
||
| // Configure P2_1.I2S2_SDI_A | ||
| status |= PINMUX_Config(PORT_NUMBER_2, PIN_NUMBER_1, PINMUX_ALTERNATE_FUNCTION_3); | ||
| status |= | ||
| PINPAD_Config(PORT_NUMBER_2, | ||
| PIN_NUMBER_1, | ||
| PAD_FUNCTION_DRIVER_DISABLE_STATE_WITH_PULL_DOWN | PAD_FUNCTION_READ_ENABLE); | ||
| /** Configure I2S3_B_WS */ | ||
| status |= pinconf_set(PORT_8, PIN_7, PINMUX_ALTERNATE_FUNCTION_2, 0); | ||
|
|
||
| /* Configure P2_3.I2S2_SCLK_A */ | ||
| status |= PINMUX_Config(PORT_NUMBER_2, PIN_NUMBER_3, PINMUX_ALTERNATE_FUNCTION_3); | ||
| status |= PINPAD_Config(PORT_NUMBER_2, PIN_NUMBER_3, PAD_FUNCTION_READ_ENABLE); | ||
| /** Configure I2S3_B_SCLK */ | ||
| status |= pinconf_set(PORT_8, PIN_6, PINMUX_ALTERNATE_FUNCTION_2, 0); | ||
|
|
||
| /* Configure P2_3.I2S2_WS_A */ | ||
| status |= PINMUX_Config(PORT_NUMBER_2, PIN_NUMBER_4, PINMUX_ALTERNATE_FUNCTION_2); | ||
| status |= PINPAD_Config(PORT_NUMBER_2, PIN_NUMBER_4, PAD_FUNCTION_READ_ENABLE); | ||
| /** Configure I2S3_B_SDI */ | ||
| status |= pinconf_set(PORT_9, PIN_0, PINMUX_ALTERNATE_FUNCTION_2, PADCTRL_READ_ENABLE); | ||
|
|
||
| return status; | ||
| } | ||
|
|
||
Oops, something went wrong.