diff --git a/.github/.cSpellWords.txt b/.github/.cSpellWords.txt index cadd881d6..b7eee8b5c 100644 --- a/.github/.cSpellWords.txt +++ b/.github/.cSpellWords.txt @@ -23,6 +23,7 @@ CDMF CECS CFGR CIER +CLKSOURCE CMAC CMOCK CMSE @@ -69,6 +70,7 @@ FORTEZZA FRACN FRACR FRCK +FREERUNCLK Fithb Fqcumd GMAC @@ -126,6 +128,8 @@ LPUART LPWORD LPWRRSTF LTDC +LWIPOPTS +LWIPERF LYNKS Lenx MBED @@ -203,6 +207,8 @@ RDSR RECVMBOX RELAYX REXTI +RINGCLKSOURCE +RNGCLKSOURCE RRCC RSAES RSASSA @@ -231,6 +237,8 @@ SSLV STLEXH STLK SYSCFGEN +SYSCLK +SYSCLKSOURCE Signa TCEM TKIP diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2ca63118..687fb3878 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ on: jobs: formatting: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Check Formatting of Files @@ -33,14 +33,6 @@ jobs: - name: Run spellings check uses: FreeRTOS/CI-CD-Github-Actions/spellings@main - link-verifier: - runs-on: ubuntu-latest - steps: - - name: Clone This Repo - uses: actions/checkout@v3 - - name: Link Verification - uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main - verify-manifest: runs-on: ubuntu-latest steps: @@ -49,10 +41,18 @@ jobs: submodules: true fetch-depth: 0 + # At time of writing the gitmodules are set not to pull + # Even when using fetch submodules. Need to run this command + # To force it to grab them. + - name: Perform Recursive Clone + shell: bash + run: git submodule update --checkout --init --recursive + - name: Run manifest verifier uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@main with: path: ./ + exclude-submodules: Drivers/BSP/Components/lsm6dso fail-on-incorrect-version: true git-secrets: diff --git a/Common/app/env_sensor_publish.c b/Common/app/env_sensor_publish.c index 5bca76871..f95611172 100644 --- a/Common/app/env_sensor_publish.c +++ b/Common/app/env_sensor_publish.c @@ -58,7 +58,7 @@ #define MQTT_PUBLISH_MAX_LEN ( 512 ) #define MQTT_PUBLISH_TIME_BETWEEN_MS ( 1000 ) #define MQTT_PUBLISH_TOPIC "env_sensor_data" -#define MQTT_PUBLICH_TOPIC_STR_LEN ( 256 ) +#define MQTT_PUBLISH_TOPIC_STR_LEN ( 256 ) #define MQTT_PUBLISH_BLOCK_TIME_MS ( 1000 ) #define MQTT_PUBLISH_NOTIFICATION_WAIT_MS ( 1000 ) @@ -246,7 +246,7 @@ void vEnvironmentSensorPublishTask( void * pvParameters ) BaseType_t xExitFlag = pdFALSE; char payloadBuf[ MQTT_PUBLISH_MAX_LEN ]; MQTTAgentHandle_t xAgentHandle = NULL; - char pcTopicString[ MQTT_PUBLICH_TOPIC_STR_LEN ] = { 0 }; + char pcTopicString[ MQTT_PUBLISH_TOPIC_STR_LEN ] = { 0 }; size_t uxTopicLen = 0; ( void ) pvParameters; @@ -259,14 +259,14 @@ void vEnvironmentSensorPublishTask( void * pvParameters ) vTaskDelete( NULL ); } - uxTopicLen = KVStore_getString( CS_CORE_THING_NAME, pcTopicString, MQTT_PUBLICH_TOPIC_STR_LEN ); + uxTopicLen = KVStore_getString( CS_CORE_THING_NAME, pcTopicString, MQTT_PUBLISH_TOPIC_STR_LEN ); if( uxTopicLen > 0 ) { - uxTopicLen = strlcat( pcTopicString, "/" MQTT_PUBLISH_TOPIC, MQTT_PUBLICH_TOPIC_STR_LEN ); + uxTopicLen = strlcat( pcTopicString, "/" MQTT_PUBLISH_TOPIC, MQTT_PUBLISH_TOPIC_STR_LEN ); } - if( ( uxTopicLen == 0 ) || ( uxTopicLen >= MQTT_PUBLICH_TOPIC_STR_LEN ) ) + if( ( uxTopicLen == 0 ) || ( uxTopicLen >= MQTT_PUBLISH_TOPIC_STR_LEN ) ) { LogError( "Failed to construct topic string." ); xExitFlag = pdTRUE; diff --git a/Common/app/motion_sensors_publish.c b/Common/app/motion_sensors_publish.c index f1ee8f034..0d1b733aa 100644 --- a/Common/app/motion_sensors_publish.c +++ b/Common/app/motion_sensors_publish.c @@ -67,7 +67,7 @@ */ #define MQTT_PUBLISH_MAX_LEN ( 200 ) #define MQTT_PUBLISH_PERIOD_MS ( 500 ) -#define MQTT_PUBLICH_TOPIC_STR_LEN ( 256 ) +#define MQTT_PUBLISH_TOPIC_STR_LEN ( 256 ) #define MQTT_PUBLISH_BLOCK_TIME_MS ( 200 ) #define MQTT_PUBLISH_NOTIFICATION_WAIT_MS ( 1000 ) #define MQTT_NOTIFY_IDX ( 1 ) @@ -222,7 +222,7 @@ void vMotionSensorsPublish( void * pvParameters ) MQTTAgentHandle_t xAgentHandle = NULL; char pcPayloadBuf[ MQTT_PUBLISH_MAX_LEN ]; - char pcTopicString[ MQTT_PUBLICH_TOPIC_STR_LEN ] = { 0 }; + char pcTopicString[ MQTT_PUBLISH_TOPIC_STR_LEN ] = { 0 }; char * pcDeviceId = NULL; int lTopicLen = 0; @@ -242,10 +242,10 @@ void vMotionSensorsPublish( void * pvParameters ) } else { - lTopicLen = snprintf( pcTopicString, ( size_t ) MQTT_PUBLICH_TOPIC_STR_LEN, "%s/motion_sensor_data", pcDeviceId ); + lTopicLen = snprintf( pcTopicString, ( size_t ) MQTT_PUBLISH_TOPIC_STR_LEN, "%s/motion_sensor_data", pcDeviceId ); } - if( ( lTopicLen <= 0 ) || ( lTopicLen > MQTT_PUBLICH_TOPIC_STR_LEN ) ) + if( ( lTopicLen <= 0 ) || ( lTopicLen > MQTT_PUBLISH_TOPIC_STR_LEN ) ) { LogError( "Error while constructing topic string." ); xExitFlag = pdTRUE; diff --git a/Common/cli/logging.c b/Common/cli/logging.c index 3d8005f58..b7cafdd25 100644 --- a/Common/cli/logging.c +++ b/Common/cli/logging.c @@ -74,7 +74,7 @@ void vDyingGasp( void ) } while( xNumBytes != 0 ); - HAL_GPIO_WritePin( LED_RED_GPIO_Port, LED_GREEN_Pin, GPIO_PIN_SET ); + HAL_GPIO_WritePin( LED_GREEN_GPIO_Port, LED_GREEN_Pin, GPIO_PIN_SET ); HAL_GPIO_WritePin( LED_RED_GPIO_Port, LED_RED_Pin, GPIO_PIN_RESET ); } diff --git a/manifest.yml b/manifest.yml index 117da5664..6ec5c019e 100644 --- a/manifest.yml +++ b/manifest.yml @@ -177,12 +177,6 @@ dependencies: type: "git" url: "https://github.com/STMicroelectronics/stm32-iis2mdc.git" path: "Drivers/BSP/Components/iis2mdc" - - name : "stm32-lsm6dso" - version: "v1.5.3" - repository: - type: "git" - url: "https://github.com/STMicroelectronics/stm32-lsm6dso.git" - path: "Drivers/BSP/Components/lsm6dso" - name : "stm32-lps22hh" version: "v1.2.0" repository: