Skip to content

Commit 22d1c65

Browse files
GrumpyOldPizzaGrumpyOldPizza
committed
Update variants and compile flags for consistency
1 parent 3249420 commit 22d1c65

File tree

10 files changed

+67
-65
lines changed

10 files changed

+67
-65
lines changed

‎boards.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ NUCLEO-L432KC.build.f_cpu=80000000L
282282
NUCLEO-L432KC.build.board=NUCLEO-L432KC
283283
NUCLEO-L432KC.build.arch=STM32L4
284284
NUCLEO-L432KC.build.core=stm32l4
285-
NUCLEO-L432KC.build.extra_flags=-DSTM32L432xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant {build.dosfs_flags}
285+
NUCLEO-L432KC.build.extra_flags=-DSTM32L432xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant
286286
NUCLEO-L432KC.build.ldscript=linker_scripts/STM32L432KC_FLASH.ld
287287
NUCLEO-L432KC.build.openocdscript=openocd_scripts/stm32l432kc_nucleo.cfg
288288
NUCLEO-L432KC.build.variant=STM32L432KC-NUCLEO
@@ -344,7 +344,7 @@ NUCLEO-L476RG.build.f_cpu=80000000L
344344
NUCLEO-L476RG.build.board=NUCLEO-L476RG
345345
NUCLEO-L476RG.build.arch=STM32L4
346346
NUCLEO-L476RG.build.core=stm32l4
347-
NUCLEO-L476RG.build.extra_flags=-DSTM32L476xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant
347+
NUCLEO-L476RG.build.extra_flags=-DSTM32L476xx -D__FPU_PRESENT=1 -march=armv7e-m -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mabi=aapcs -mslow-flash-data -fsingle-precision-constant {build.dosfs_flags}
348348
NUCLEO-L476RG.build.ldscript=linker_scripts/STM32L476RG_FLASH.ld
349349
NUCLEO-L476RG.build.openocdscript=openocd_scripts/stm32l476rg_nucleo.cfg
350350
NUCLEO-L476RG.build.variant=STM32L476RG-NUCLEO

‎platform.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} '-DUSB_MANUFACTURER=
7070

7171
# DOSFS Flags
7272
# ---------
73-
build.dosfs_flags='-DDOSFS_SDCARD={build.dosfs_sdcard}' '-DDOSFS_SFLASH={build.dosfs_sflash}'
73+
build.dosfs_flags=-DDOSFS_SDCARD={build.dosfs_sdcard} -DDOSFS_SFLASH={build.dosfs_sflash}
7474

7575
# Compile patterns
7676
# ----------------

‎system/STM32L4xx/Lib/libstm32l432.a‎

0 Bytes
Binary file not shown.

‎system/STM32L4xx/Lib/libstm32l433.a‎

0 Bytes
Binary file not shown.

‎system/STM32L4xx/Lib/libstm32l476.a‎

0 Bytes
Binary file not shown.

‎variants/STM32L432KC-Ladybug/variant.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,17 @@ extern const PinDescription g_APinDescription[NUM_TOTAL_PINS] =
9292
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9393
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9494

95-
// 32..36 - Reserved
95+
// 32..37 QSPI pins (NCS,CK,IO0,IO1,IO2,IO3)
96+
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9697
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9798
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9899
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
99100
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
100101
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
101102

102-
// 37..38 - Digital pins (BUTTON,ATN)
103-
{ GPIOH, GPIO_PIN_MASK(GPIO_PIN_PH3), GPIO_PIN_PH3, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
103+
// 38..39 - Digital pins (ATN,BUTTON)
104104
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
105+
{ GPIOH, GPIO_PIN_MASK(GPIO_PIN_PH3), GPIO_PIN_PH3, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
105106
};
106107

107108
extern const unsigned int g_PWMInstances[PWM_INSTANCE_COUNT] = {

‎variants/STM32L432KC-Ladybug/variant.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extern "C"
6767
// Number of pins defined in PinDescription array
6868
#define PINS_COUNT (25u)
6969
#define NUM_DIGITAL_PINS (19u)
70-
#define NUM_TOTAL_PINS (39u)
70+
#define NUM_TOTAL_PINS (40u)
7171
#define NUM_ANALOG_INPUTS (5u)
7272
#define NUM_ANALOG_OUTPUTS (2u)
7373
#define analogInputToDigitalPin(p) ((p < 6u) ? (p) + 14u : -1)
@@ -100,7 +100,7 @@ static const uint8_t DAC1 = PIN_DAC1;
100100

101101
// Other pins
102102

103-
#define PIN_BUTTON (37u)
103+
#define PIN_BUTTON (44u)
104104
static const uint8_t BUTTON = PIN_BUTTON;
105105

106106
#define PIN_ATN (38u)

‎variants/STM32L433CC-Butterfly/variant.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,17 @@ extern const PinDescription g_APinDescription[NUM_TOTAL_PINS] =
9292
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA10), GPIO_PIN_PA10, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9393
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA9), GPIO_PIN_PA9, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9494

95-
// 32..36 - Reserved
95+
// 32..37 QSPI pins (NCS,CK,IO0,IO1,IO2,IO3)
96+
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9697
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9798
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9899
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
99100
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
100101
{ NULL, 0, GPIO_PIN_NONE, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
101102

102-
// 37..38 - Digital pins (BUTTON,ATN)
103-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC13), GPIO_PIN_PC13, (PIN_ATTR_EXTI | PIN_ATTR_WKUP2), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
103+
// 38..39 - Digital pins (ATN,BUTTON)
104104
{ GPIOH, GPIO_PIN_MASK(GPIO_PIN_PH0), GPIO_PIN_PH0, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
105+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC13), GPIO_PIN_PC13, (PIN_ATTR_EXTI | PIN_ATTR_WKUP2), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
105106
};
106107

107108
extern const unsigned int g_PWMInstances[PWM_INSTANCE_COUNT] = {

‎variants/STM32L433CC-Butterfly/variant.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extern "C"
6767
// Number of pins defined in PinDescription array
6868
#define PINS_COUNT (25u)
6969
#define NUM_DIGITAL_PINS (20u)
70-
#define NUM_TOTAL_PINS (39u)
70+
#define NUM_TOTAL_PINS (40u)
7171
#define NUM_ANALOG_INPUTS (6u)
7272
#define NUM_ANALOG_OUTPUTS (2u)
7373
#define analogInputToDigitalPin(p) ((p < 6u) ? (p) + 14u : -1)
@@ -106,7 +106,7 @@ static const uint8_t DAC1 = PIN_DAC1;
106106

107107
// Other pins
108108

109-
#define PIN_BUTTON (37u)
109+
#define PIN_BUTTON (39u)
110110
static const uint8_t BUTTON = PIN_BUTTON;
111111

112112
#define PIN_ATN (38u)

0 commit comments

Comments
 (0)