Browse Source

Merge pull request #5440 from mysterywolf/l475

[lvgl][simulator]&[l475][arduino] 细节修改
guo 3 years ago
parent
commit
008eaed0f1

+ 1 - 1
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>

+ 1 - 1
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')

+ 1 - 1
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)