Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit83d872f

Browse files
committed
[HWSerial] Review Serial definition
Review Serial menu, 3 options: - Enabled with generic Serial: default, define HAL_UART_MODULE_ENABLED and instanciate Serial using SERIAL_UART_INSTANCE and PIN_SERIAL_RX/PIN_SERIAL_Tx - Enabled without generic Serial: define HAL_UART_MODULE_ENABLED - Disabled (No Serial): HAL_UART_MODULE_ENABLED not definedAllow to build without HAL_UART_MODULE_ENABLED (save memory)Now, HAL_UART_MODULE_ENABLED should not be defined in stm32yyxx_hal_conf.hSigned-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parentf040c55 commit83d872f

File tree

31 files changed

+88
-108
lines changed

31 files changed

+88
-108
lines changed

‎boards.txt‎

Lines changed: 35 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -472,53 +472,41 @@ Maple.menu.upload_method.serialMethod.upload.tool=serial_upload
472472

473473
################################################################################
474474
# Serialx activation
475-
Nucleo_144.menu.xserial.generic=Generic Serial
476-
Nucleo_144.menu.xserial.none=No Serial
477-
Nucleo_144.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
478-
Nucleo_144.menu.xserial.all=All (up to 10)
479-
Nucleo_144.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
480-
Nucleo_144.menu.xserial.third=Enable first third (USART1 to 3 if available)
481-
Nucleo_144.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
482-
483-
Nucleo_64.menu.xserial.generic=Generic Serial
484-
Nucleo_64.menu.xserial.none=No Serial
485-
Nucleo_64.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
486-
Nucleo_64.menu.xserial.all=All (up to 10)
487-
Nucleo_64.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
488-
Nucleo_64.menu.xserial.third=Enable first third (USART1 to 3 if available)
489-
Nucleo_64.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
490-
491-
Nucleo_32.menu.xserial.generic=Generic Serial
492-
Nucleo_32.menu.xserial.none=No Serial
493-
Nucleo_32.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
494-
Nucleo_32.menu.xserial.all=All (up to 10)
495-
Nucleo_32.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
496-
Nucleo_32.menu.xserial.third=Enable first third (USART1 to 3 if available)
497-
Nucleo_32.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
498-
499-
Disco.menu.xserial.generic=Generic Serial
500-
Disco.menu.xserial.none=No Serial
501-
Disco.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
502-
Disco.menu.xserial.all=All (up to 10)
503-
Disco.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
504-
Disco.menu.xserial.third=Enable first third (USART1 to 3 if available)
505-
Disco.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
506-
507-
GenF103.menu.xserial.generic=Generic Serial
508-
GenF103.menu.xserial.none=No Serial
509-
GenF103.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
510-
GenF103.menu.xserial.all=All (up to 10)
511-
GenF103.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
512-
GenF103.menu.xserial.third=Enable first third (USART1 to 3 if available)
513-
GenF103.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
514-
515-
Maple.menu.xserial.generic=Generic Serial
516-
Maple.menu.xserial.none=No Serial
517-
Maple.menu.xserial.none.build.xSerial=-DNO_HWSERIAL
518-
Maple.menu.xserial.all=All (up to 10)
519-
Maple.menu.xserial.all.build.xSerial=-DALL_HWSERIAL
520-
Maple.menu.xserial.third=Enable first third (USART1 to 3 if available)
521-
Maple.menu.xserial.third.build.xSerial=-DFIRST_THIRD_HWSERIAL
475+
Nucleo_144.menu.xserial.generic=Enabled with generic Serial
476+
Nucleo_144.menu.xserial.none=Enabled without generic Serial
477+
Nucleo_144.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
478+
Nucleo_144.menu.xserial.disabled=Disabled (No Serial)
479+
Nucleo_144.menu.xserial.disabled.build.xSerial=
480+
481+
Nucleo_64.menu.xserial.generic=Enabled with generic Serial
482+
Nucleo_64.menu.xserial.none=Enabled without generic Serial
483+
Nucleo_64.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
484+
Nucleo_64.menu.xserial.disabled=Disabled (No Serial)
485+
Nucleo_64.menu.xserial.disabled.build.xSerial=
486+
487+
Nucleo_32.menu.xserial.generic=Enabled with generic Serial
488+
Nucleo_32.menu.xserial.none=Enabled without generic Serial
489+
Nucleo_32.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
490+
Nucleo_32.menu.xserial.disabled=Disabled (No Serial)
491+
Nucleo_32.menu.xserial.disabled.build.xSerial=
492+
493+
Disco.menu.xserial.generic=Enabled with generic Serial
494+
Disco.menu.xserial.none=Enabled without generic Serial
495+
Disco.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
496+
Disco.menu.xserial.disabled=Disabled (No Serial)
497+
Disco.menu.xserial.disabled.build.xSerial=
498+
499+
GenF103.menu.xserial.generic=Enabled with generic Serial
500+
GenF103.menu.xserial.none=Enabled without generic Serial
501+
GenF103.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
502+
GenF103.menu.xserial.disabled=Disabled (No Serial)
503+
GenF103.menu.xserial.disabled.build.xSerial=
504+
505+
Maple.menu.xserial.generic=Enabled with generic Serial
506+
Maple.menu.xserial.none=Enabled without generic Serial
507+
Maple.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
508+
Maple.menu.xserial.disabled=Disabled (No Serial)
509+
Maple.menu.xserial.disabled.build.xSerial=
522510

523511
# USB connectivity
524512
Nucleo_144.menu.usb.none=None

‎cores/arduino/HardwareSerial.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include"Arduino.h"
3131
#include"HardwareSerial.h"
3232

33-
#if!defined(NO_HWSERIAL)
33+
#if defined(HAL_UART_MODULE_ENABLED)
3434
#if defined(HAVE_HWSERIAL1) || defined(HAVE_HWSERIAL2) || defined(HAVE_HWSERIAL3) ||\
3535
defined(HAVE_HWSERIAL4) || defined(HAVE_HWSERIAL5) || defined(HAVE_HWSERIAL6) ||\
3636
defined(HAVE_HWSERIAL7) || defined(HAVE_HWSERIAL8) || defined(HAVE_HWSERIAL8) ||\
@@ -102,6 +102,7 @@
102102
HardwareSerialSerial10(UART10);
103103
voidserialEvent10() __attribute__((weak));
104104
#endif
105+
#endif// HAVE_HWSERIALx
105106

106107
voidserialEventRun(void)
107108
{
@@ -391,5 +392,4 @@ void HardwareSerial::setRx(PinName _rx) {
391392
voidHardwareSerial::setTx(PinName _tx){
392393
_serial.pin_tx = _tx;
393394
}
394-
#endif// HAVE_HWSERIALx
395-
#endif// !NO_HWSERIAL
395+
#endif// HAL_UART_MODULE_ENABLED

‎cores/arduino/stm32/low_power.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
extern"C" {
4646
#endif
4747

48-
#ifdefUART_IT_WUF
48+
#if defined(UART_IT_WUF)&& defined(HAL_UART_MODULE_ENABLED)
4949
/* Save UART handler for callback */
5050
staticUART_HandleTypeDef*WakeUpUart=NULL;
5151
#endif
@@ -201,7 +201,7 @@ void LowPower_sleep(uint32_t regulator){
201201
voidLowPower_stop(serial_t*obj){
202202
__disable_irq();
203203

204-
#ifdefUART_IT_WUF
204+
#if defined(UART_IT_WUF)&& defined(HAL_UART_MODULE_ENABLED)
205205
if (WakeUpUart!=NULL) {
206206
HAL_UARTEx_EnableStopMode(WakeUpUart);
207207
}
@@ -224,7 +224,7 @@ void LowPower_stop(serial_t *obj){
224224

225225
/* Exit Stop mode reset clocks */
226226
SystemClock_Config();
227-
#ifdefUART_IT_WUF
227+
#if defined(UART_IT_WUF)&& defined(HAL_UART_MODULE_ENABLED)
228228
if (WakeUpUart!=NULL) {
229229
/* In case of WakeUp from UART, reset its clock source to HSI */
230230
uart_config_lowpower(obj);
@@ -290,7 +290,7 @@ void LowPower_shutdown(){
290290
* @retval None
291291
*/
292292
voidLowPower_EnableWakeUpUart(serial_t*serial,void (*FuncPtr)(void ) ) {
293-
#ifdefUART_IT_WUF
293+
#if defined(UART_IT_WUF)&& defined(HAL_UART_MODULE_ENABLED)
294294
UART_WakeUpTypeDefWakeUpSelection;
295295
if(serial==NULL) {
296296
return;

‎cores/arduino/stm32/uart.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
#ifdef__cplusplus
5454
extern"C" {
5555
#endif
56+
#if defined(HAL_UART_MODULE_ENABLED)
5657

5758
// if DEBUG_UART is not defined assume this is the one
5859
// linked to PIN_SERIAL_TX
@@ -946,6 +947,7 @@ void HAL_UARTEx_WakeupCallback(UART_HandleTypeDef *huart)
946947

947948
HAL_UART_Receive_IT(huart,&(obj->recv),1);
948949
}
950+
#endif/* HAL_UART_MODULE_ENABLED */
949951

950952
#ifdef__cplusplus
951953
}

‎cores/arduino/stm32/uart.h‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,11 @@
4747
extern"C" {
4848
#endif
4949

50-
#if !defined(NO_HWSERIAL)
51-
#if defined(ALL_HWSERIAL)|| defined(FIRST_THIRD_HWSERIAL)
52-
#defineENABLE_HWSERIAL1
53-
#defineENABLE_HWSERIAL2
54-
#defineENABLE_HWSERIAL3
55-
#if !defined(FIRST_THIRD_HWSERIAL)
56-
#defineENABLE_HWSERIAL4
57-
#defineENABLE_HWSERIAL5
58-
#defineENABLE_HWSERIAL6
59-
#defineENABLE_HWSERIAL7
60-
#defineENABLE_HWSERIAL8
61-
#defineENABLE_HWSERIAL9
62-
#defineENABLE_HWSERIAL10
63-
#endif// FIRST_THIRD_HWSERIAL
64-
#endif// ALL_HWSERIAL || FIRST_THIRD_HWSERIAL
65-
#ifdefSERIAL_UART_INSTANCE
50+
#if !defined(HAL_UART_MODULE_ENABLED)
51+
#defineserial_t void*
52+
#else
53+
#if !defined(HWSERIAL_NONE)&& defined(SERIAL_UART_INSTANCE)
54+
6655
#ifSERIAL_UART_INSTANCE==1
6756
#defineENABLE_HWSERIAL1
6857
#if !defined(Serial)
@@ -123,13 +112,12 @@
123112
#defineSerial Serial10
124113
#defineserialEvent serialEvent10
125114
#endif
126-
#endif// SERIAL_UART_INSTANCE == x
127115
#else
128116
#if !defined(Serial)
129117
#warning "No generic 'Serial' defined!"
130118
#endif
131-
#endif// SERIAL_UART_INSTANCE
132-
#endif//NO_HWSERIAL
119+
#endif// SERIAL_UART_INSTANCE == x
120+
#endif//!HWSERIAL_NONE && SERIAL_UART_INSTANCE
133121

134122
#if defined(ENABLE_HWSERIAL1)
135123
#if defined(USART1_BASE)
@@ -292,6 +280,7 @@ uint8_t serial_rx_active(serial_t *obj);
292280

293281
size_tuart_debug_write(uint8_t*data,uint32_tsize);
294282

283+
#endif/* HAL_UART_MODULE_ENABLED */
295284
#ifdef__cplusplus
296285
}
297286
#endif

‎platform.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ build.usb_manufacturer="Unknown"
7979
build.info.flags=-D{build.series} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DBOARD_NAME="{build.board}"
8080

8181
# Defaults config
82-
build.xSerial=
82+
build.xSerial=-DHAL_UART_MODULE_ENABLED
8383
build.enable_usb=
8484
build.flags.optimize=
8585
build.flags.ldspecs=

‎variants/BLUEPILL_F103C8/stm32f1xx_hal_conf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
#defineHAL_SPI_MODULE_ENABLED
7979
/*#define HAL_SRAM_MODULE_ENABLED*/
8080
#defineHAL_TIM_MODULE_ENABLED
81-
#defineHAL_UART_MODULE_ENABLED
81+
/*#define HAL_UART_MODULE_ENABLED*/
8282
/*#define HAL_USART_MODULE_ENABLED*/
8383
/*#define HAL_WWDG_MODULE_ENABLED*/
8484
#defineHAL_MMC_MODULE_ENABLED

‎variants/DISCO_F030R8/stm32f0xx_hal_conf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
#defineHAL_SPI_MODULE_ENABLED
7373
#defineHAL_TIM_MODULE_ENABLED
7474
/*#define HAL_TSC_MODULE_ENABLED */
75-
#defineHAL_UART_MODULE_ENABLED
75+
/*#define HAL_UART_MODULE_ENABLED */
7676
/*#define HAL_USART_MODULE_ENABLED */
7777
/*#define HAL_WWDG_MODULE_ENABLED */
7878

‎variants/DISCO_F100RB/stm32f1xx_hal_conf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
#defineHAL_SPI_MODULE_ENABLED
7979
/*#define HAL_SRAM_MODULE_ENABLED*/
8080
#defineHAL_TIM_MODULE_ENABLED
81-
#defineHAL_UART_MODULE_ENABLED
81+
/*#define HAL_UART_MODULE_ENABLED */
8282
/*#define HAL_USART_MODULE_ENABLED*/
8383
/*#define HAL_WWDG_MODULE_ENABLED*/
8484
#defineHAL_MMC_MODULE_ENABLED

‎variants/DISCO_F407VG/stm32f4xx_hal_conf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
/* #define HAL_SD_MODULE_ENABLED */
8282
#defineHAL_SPI_MODULE_ENABLED
8383
#defineHAL_TIM_MODULE_ENABLED
84-
#defineHAL_UART_MODULE_ENABLED
84+
/*#define HAL_UART_MODULE_ENABLED */
8585
/* #define HAL_USART_MODULE_ENABLED */
8686
/* #define HAL_IRDA_MODULE_ENABLED */
8787
/* #define HAL_SMARTCARD_MODULE_ENABLED */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp