diff options
| author | guo <[email protected]> | 2021-12-27 21:10:19 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-27 21:10:19 +0800 |
| commit | 008eaed0f1970935acf1909b2180e320d5e4f808 (patch) | |
| tree | 08c6c143d0aa494142488912ffdfe0aaf0f1ef40 | |
| parent | fd2892b82d10b07b3111339674b7a3c7ae26e586 (diff) | |
| parent | 559d4ef4d6a899f57d6e671472dd9afb495497d1 (diff) | |
Merge pull request #5440 from mysterywolf/l475
[lvgl][simulator]&[l475][arduino] 细节修改
3 files changed, 3 insertions, 3 deletions
diff --git a/bsp/simulator/applications/lvgl/lv_conf.h b/bsp/simulator/applications/lvgl/lv_conf.h index 0d9b3c63bc..e558398800 100644 --- a/bsp/simulator/applications/lvgl/lv_conf.h +++ b/bsp/simulator/applications/lvgl/lv_conf.h @@ -17,7 +17,7 @@ #define USE_WIN32DRV 1 #define WIN32DRV_MONITOR_ZOOM 1 -#define LV_USE_FS_WIN32 1 +//#define LV_USE_FS_WIN32 1 /* music player demo */ #include <rtconfig.h> diff --git a/bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript index b3d32f3717..fa9026dc59 100644 --- a/bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript @@ -7,6 +7,6 @@ inc = [cwd] group = DefineGroup('Arduino', src, depend = ['RT_USING_ARDUINO'], CPPPATH = inc) src = ['arduino_main.cpp'] -group = DefineGroup('Applications', src, depend = ['RT_USING_ARDUINO']) +group += DefineGroup('Applications', src, depend = ['RT_USING_ARDUINO']) Return('group') diff --git a/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.h b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.h index e3b7b8a47a..1ec160b9d7 100644 --- a/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.h +++ b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.h @@ -15,7 +15,7 @@ #define ARDUINO_PWM_HZ 500 /* Arduino UNO's PWM is around 500Hz */ #define ARDUINO_PINOUT_PIN_MAX 20 /* Arduino UNO has 20 pins in total*/ -#define ARDUINO_PINOUT_ADC_MAX 6 /* Arduino UNO has 5 ADC pins */ +#define ARDUINO_PINOUT_ADC_MAX 6 /* Arduino UNO has 6 ADC pins */ #define ARDUINO_PINOUT_PWM_MAX 5 /* Arduino UNO has 5 PWM pins */ #define A0 (14) |