Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const PinName digitalPin[] = {
};

// Analog (Ax) pin number array
const uint32_t analogInputPin[] = {
const pin_size_t analogInputPin[] = {
34, // A0, PA0
35, // A1, PA1
36, // A2, PA4
Expand Down Expand Up @@ -153,7 +153,6 @@ void SystemClock_Config(void)

}


#ifdef __cplusplus
}
#endif
Expand Down
15 changes: 11 additions & 4 deletions variants/STM32G4xx/G431C(6-8-B)U_G441CBU/variant_PHOQUE2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
*/
#if defined(ARDUINO_PHOQUE2)
#include "pins_arduino.h"
#include "pinmap.h"

// Digital PinName array
extern "C" const PinName digitalPin[] = {
const PinName digitalPin[] = {
PA_0, // D0/A0
PA_1, // D1/A1
PA_2, // D2/A2
Expand Down Expand Up @@ -61,7 +60,7 @@ extern "C" const PinName digitalPin[] = {
};

// Analog (Ax) pin number array
extern "C" const uint32_t analogInputPin[] = {
const pin_size_t analogInputPin[] = {
0, // A0, PA0
1, // A1, PA1
2, // A2, PA2
Expand All @@ -82,7 +81,12 @@ extern "C" const uint32_t analogInputPin[] = {
40 // A17, PF1
};

__weak void SystemClock_Config(void)
// ----------------------------------------------------------------------------
#ifdef __cplusplus
extern "C" {
#endif

void SystemClock_Config(void)
{
RCC_OscInitTypeDef RCC_OscInitStruct = {};
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
Expand Down Expand Up @@ -141,4 +145,7 @@ __weak void SystemClock_Config(void)

}

#ifdef __cplusplus
}
#endif
#endif /* ARDUINO_PHOQUE2* */
16 changes: 12 additions & 4 deletions variants/STM32G4xx/G431V(6-8-B)T_G441VBT/variant_PHOQUE1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
*******************************************************************************
*/
#if defined(ARDUINO_PHOQUE1)
#include "variant_PHOQUE1.h"
#include "pinmap.h"
#include "pins_arduino.h"

// Digital PinName array
extern "C" const PinName digitalPin[] = {
Expand Down Expand Up @@ -105,7 +104,7 @@ extern "C" const PinName digitalPin[] = {
};

// Analog (Ax) pin number array
extern "C" const uint32_t analogInputPin[] = {
extern "C" const pin_size_t analogInputPin[] = {
0, // A0, PA0
1, // A1, PA1
2, // A2, PA2
Expand All @@ -131,7 +130,12 @@ extern "C" const uint32_t analogInputPin[] = {
81 // A22, PF1
};

__weak void SystemClock_Config(void)
// ----------------------------------------------------------------------------
#ifdef __cplusplus
extern "C" {
#endif

void SystemClock_Config(void)
{
RCC_OscInitTypeDef RCC_OscInitStruct = {};
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
Expand Down Expand Up @@ -189,4 +193,8 @@ __weak void SystemClock_Config(void)
}

}

#ifdef __cplusplus
}
#endif
#endif
Loading