Skip to content

Commit

Permalink
Merge branch 'stm32duino:main' into analogread
Browse files Browse the repository at this point in the history
  • Loading branch information
@Candas1
Candas1 authored Feb 17, 2024
2 parents bb93fa7 + 0ca1f4c commit cacc328
Show file tree
Hide file tree
Showing 1,266 changed files with 41,143 additions and 47,100 deletions.
15 changes: 5 additions & 10 deletions .github/workflows/PIO-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- '!CI/build/platformio-builder.py'
- cmake/**
- tools/**
- '!tools/platformio-build.py'
- '!tools/platformio/platformio-build.py'
pull_request:
paths-ignore:
- .github/**
Expand All @@ -27,7 +27,7 @@ on:
- '!CI/build/platformio-builder.py'
- cmake/**
- tools/**
- '!tools/platformio-build.py'
- '!tools/platformio/platformio-build.py'
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
Expand All @@ -39,11 +39,6 @@ jobs:
- name: Checkout
uses: actions/checkout@main

# - name: PlatformIO
# id: Compile
# uses: ./.github/actions/pio-build
# Use the output from the `Astyle` step
- name: Warning
run: |
echo "PlatformIO build disabled while not support CMSIS update."
exit 0
- name: PlatformIO
id: Compile
uses: ./.github/actions/pio-build
24 changes: 24 additions & 0 deletions CI/build/conf/cores_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,13 @@
"GENERIC_F722RETX",
"GENERIC_F722ZCTX",
"GENERIC_F722ZETX",
"GENERIC_F723ICKX",
"GENERIC_F723ICTX",
"GENERIC_F723IEKX",
"GENERIC_F723IETX",
"GENERIC_F730I8KX",
"GENERIC_F730R8TX",
"GENERIC_F733IEKX",
"GENERIC_F745ZETX",
"GENERIC_F745ZGTX",
"GENERIC_F746BETX",
Expand Down Expand Up @@ -534,7 +540,9 @@
"GENERIC_G4A1MESX",
"GENERIC_G4A1REIX",
"GENERIC_G4A1RETX",
"GENERIC_H563IIKXQ",
"GENERIC_H563ZGTX",
"GENERIC_H563ZITX",
"GENERIC_H723ZETX",
"GENERIC_H723ZGTX",
"GENERIC_H730ZBTX",
Expand All @@ -546,6 +554,8 @@
"GENERIC_H742VGTX",
"GENERIC_H742VIHX",
"GENERIC_H742VITX",
"GENERIC_H742XGHX",
"GENERIC_H742XIHX",
"GENERIC_H742ZGTX",
"GENERIC_H742ZITX",
"GENERIC_H743IGKX",
Expand All @@ -556,19 +566,28 @@
"GENERIC_H743VGTX",
"GENERIC_H743VIHX",
"GENERIC_H743VITX",
"GENERIC_H743XGHX",
"GENERIC_H743XIHX",
"GENERIC_H743ZGTX",
"GENERIC_H743ZITX",
"GENERIC_H745XGHX",
"GENERIC_H745XIHX",
"GENERIC_H747AGIX",
"GENERIC_H747AIIX",
"GENERIC_H747IGTX",
"GENERIC_H747IITX",
"GENERIC_H747XGHX",
"GENERIC_H747XIHX",
"GENERIC_H750IBKX",
"GENERIC_H750IBTX",
"GENERIC_H750VBTX",
"GENERIC_H750XBHX",
"GENERIC_H750ZBTX",
"GENERIC_H753IIKX",
"GENERIC_H753VIHX",
"GENERIC_H753XIHX",
"GENERIC_H753ZITX",
"GENERIC_H755XIHX",
"GENERIC_H757AIIX",
"GENERIC_L010F4PX",
"GENERIC_L010K4TX",
Expand Down Expand Up @@ -778,8 +797,13 @@
"GENERIC_MP157DACX",
"GENERIC_U575AGIXQ",
"GENERIC_U575AIIXQ",
"GENERIC_U575CGTX",
"GENERIC_U575CGUX",
"GENERIC_U575CITX",
"GENERIC_U575CIUX",
"GENERIC_U575ZGTXQ",
"GENERIC_U575ZITXQ",
"GENERIC_U585CITX",
"GENERIC_WB35CCUXA",
"GENERIC_WB35CEUXA",
"GENERIC_WB55CCUX",
Expand Down
24 changes: 24 additions & 0 deletions CI/build/conf/cores_config_ci.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,13 @@
"GENERIC_F722RETX",
"GENERIC_F722ZCTX",
"GENERIC_F722ZETX",
"GENERIC_F723ICKX",
"GENERIC_F723ICTX",
"GENERIC_F723IEKX",
"GENERIC_F723IETX",
"GENERIC_F730I8KX",
"GENERIC_F730R8TX",
"GENERIC_F733IEKX",
"GENERIC_F745ZETX",
"GENERIC_F745ZGTX",
"GENERIC_F746BETX",
Expand Down Expand Up @@ -534,7 +540,9 @@
"GENERIC_G4A1MESX",
"GENERIC_G4A1REIX",
"GENERIC_G4A1RETX",
"GENERIC_H563IIKXQ",
"GENERIC_H563ZGTX",
"GENERIC_H563ZITX",
"GENERIC_H723ZETX",
"GENERIC_H723ZGTX",
"GENERIC_H730ZBTX",
Expand All @@ -546,6 +554,8 @@
"GENERIC_H742VGTX",
"GENERIC_H742VIHX",
"GENERIC_H742VITX",
"GENERIC_H742XGHX",
"GENERIC_H742XIHX",
"GENERIC_H742ZGTX",
"GENERIC_H742ZITX",
"GENERIC_H743IGKX",
Expand All @@ -556,19 +566,28 @@
"GENERIC_H743VGTX",
"GENERIC_H743VIHX",
"GENERIC_H743VITX",
"GENERIC_H743XGHX",
"GENERIC_H743XIHX",
"GENERIC_H743ZGTX",
"GENERIC_H743ZITX",
"GENERIC_H745XGHX",
"GENERIC_H745XIHX",
"GENERIC_H747AGIX",
"GENERIC_H747AIIX",
"GENERIC_H747IGTX",
"GENERIC_H747IITX",
"GENERIC_H747XGHX",
"GENERIC_H747XIHX",
"GENERIC_H750IBKX",
"GENERIC_H750IBTX",
"GENERIC_H750VBTX",
"GENERIC_H750XBHX",
"GENERIC_H750ZBTX",
"GENERIC_H753IIKX",
"GENERIC_H753VIHX",
"GENERIC_H753XIHX",
"GENERIC_H753ZITX",
"GENERIC_H755XIHX",
"GENERIC_H757AIIX",
"GENERIC_L010F4PX",
"GENERIC_L010K4TX",
Expand Down Expand Up @@ -778,8 +797,13 @@
"GENERIC_MP157DACX",
"GENERIC_U575AGIXQ",
"GENERIC_U575AIIXQ",
"GENERIC_U575CGTX",
"GENERIC_U575CGUX",
"GENERIC_U575CITX",
"GENERIC_U575CIUX",
"GENERIC_U575ZGTXQ",
"GENERIC_U575ZITXQ",
"GENERIC_U585CITX",
"GENERIC_WB35CCUXA",
"GENERIC_WB35CEUXA",
"GENERIC_WB55CCUX",
Expand Down
36 changes: 17 additions & 19 deletions CI/build/examples/BareMinimum/BareMinimum.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,37 @@
/* ----------------------------------------------------------------------
Defines each of the tests performed
------------------------------------------------------------------- */
#define MAX_BLOCKSIZE 2
#define DELTA (0.0001f)
#define MAX_BLOCKSIZE 2
#define DELTA (0.0001f)
/* ----------------------------------------------------------------------
Test input data for Floating point sin_cos example for 32-blockSize
Generated by the MATLAB randn() function
------------------------------------------------------------------- */
const float32_t testInput_f32[MAX_BLOCKSIZE] =
{
-1.244916875853235400, -4.793533929171324800
const float32_t testInput_f32[MAX_BLOCKSIZE] = {
-1.244916875853235400, -4.793533929171324800
};
const float32_t testRefOutput_f32 = 1.000000000;
/* ----------------------------------------------------------------------
Declare Global variables
------------------------------------------------------------------- */
uint32_t blockSize = 2;
float32_t testOutput;
float32_t cosOutput;
float32_t sinOutput;
float32_t cosSquareOutput;
float32_t sinSquareOutput;
float32_t testOutput;
float32_t cosOutput;
float32_t sinOutput;
float32_t cosSquareOutput;
float32_t sinSquareOutput;
/* ----------------------------------------------------------------------
Max magnitude FFT Bin test
------------------------------------------------------------------- */
arm_status status;
/* CMSIS_DSP */

#ifndef USER_BTN
#define USER_BTN 2
#define USER_BTN 2
#endif

#ifndef LED_BUILTIN
#define LED_BUILTIN 13
#define LED_BUILTIN 13
#endif

#ifndef PIN_SERIAL_RX
Expand All @@ -72,8 +71,7 @@ SoftwareSerial swSerial(10, 11);

void setup() {
// Serial HW & SW
#if (!defined(USBD_USE_CDC) && !defined(DISABLE_GENERIC_SERIALUSB)) &&\
(!defined(VIRTIOCON) && !defined(DISABLE_GENERIC_SERIALVIRTIO))
#if (!defined(USBD_USE_CDC) && !defined(DISABLE_GENERIC_SERIALUSB)) && (!defined(VIRTIOCON) && !defined(DISABLE_GENERIC_SERIALVIRTIO))
Serial.setRx(PIN_SERIAL_RX);
Serial.setTx(digitalPinToPinName(PIN_SERIAL_TX));
#endif
Expand All @@ -92,7 +90,7 @@ void setup() {

// EEPROM
byte value = EEPROM.read(0x01);
EEPROM.write(EEPROM.length()-1, value);
EEPROM.write(EEPROM.length() - 1, value);

#ifndef STM32MP1xx
// IWDG
Expand All @@ -111,13 +109,13 @@ void setup() {
#endif

// SPI
SPISettings settings(SPI_SPEED_CLOCK_DEFAULT, MSBFIRST, SPI_MODE_0);
SPISettings settings(SPI_SPEED_CLOCK_DEFAULT, MSBFIRST, SPI_MODE0);
SPI.setMISO(PIN_SPI_MISO);
SPI.setMOSI(PIN_SPI_MOSI);
SPI.setSCLK(PIN_SPI_SCK);
SPI.setSSEL(digitalPinToPinName(PIN_SPI_SS));
SPI.begin(PIN_SPI_SS);
SPI.beginTransaction(1, settings);
SPI.begin();
SPI.beginTransaction(settings);
SPI.endTransaction();
SPI.transfer(1);
SPI.end();
Expand Down Expand Up @@ -146,7 +144,7 @@ void setup() {
diff = fabsf(testRefOutput_f32 - testOutput);
/* Comparison of sin_cos value with reference */
status = (diff > DELTA) ? ARM_MATH_TEST_FAILURE : ARM_MATH_SUCCESS;
if ( status == ARM_MATH_TEST_FAILURE) {
if (status == ARM_MATH_TEST_FAILURE) {
break;
}
}
Expand Down
1 change: 1 addition & 0 deletions CI/build/platformio-builder.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

# Libraries that are not meant to be checked in CI by default
DEFAULT_IGNORED_LIBRARIES = (
"cmsis_dsp",
"keyboard",
"mouse",
"subghz"
Expand Down
51 changes: 0 additions & 51 deletions CI/update/patch/CMSIS/G4/0001-Fix-CMSIS-stm32g491-and-stm32g4a1-add-missing-aliase.patch
View file

This file was deleted.

Loading

0 comments on commit cacc328

Please sign in to comment.