diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-03-19 13:12:30 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-03-19 13:12:30 +0000 |
| commit | 494600bc996ff46ae9081148590eb749ea6123af (patch) | |
| tree | b4df8d296ee1689a87d9714c4e848e4476fc6be9 | |
| parent | e2e9011253a61502ac31f144312257c14506a815 (diff) | |
| download | micropython-494600bc996ff46ae9081148590eb749ea6123af.tar.gz micropython-494600bc996ff46ae9081148590eb749ea6123af.zip | |
stmhal: Add lcd.c to Makefile, and init LCD in main.
| -rw-r--r-- | stmhal/Makefile | 2 | ||||
| -rw-r--r-- | stmhal/main.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/stmhal/Makefile b/stmhal/Makefile index 6442f5f1fb..9f3e365a19 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -83,8 +83,8 @@ SRC_C = \ file.c \ sdcard.c \ diskio.c \ + lcd.c \ -# lcd.c \ # servo.c \ # accel.c \ # timer.c \ diff --git a/stmhal/main.c b/stmhal/main.c index d63f5df308..d77733429b 100644 --- a/stmhal/main.c +++ b/stmhal/main.c @@ -32,9 +32,9 @@ #include "storage.h" #include "sdcard.h" #include "ff.h" +#include "lcd.h" #if 0 #include "servo.h" -#include "lcd.h" #include "accel.h" #include "timer.h" #include "pybwlan.h" @@ -64,11 +64,9 @@ void flash_error(int n) { void __fatal_error(const char *msg) { #if MICROPY_HW_HAS_LCD -#if 0 lcd_print_strn("\nFATAL ERROR:\n", 14); lcd_print_strn(msg, strlen(msg)); #endif -#endif for (;;) { flash_error(1); } @@ -260,12 +258,12 @@ soft_reset: switch_init(); #endif -#if 0 #if MICROPY_HW_HAS_LCD // LCD init (just creates class, init hardware by calling LCD()) lcd_init(); #endif +#if 0 #if MICROPY_HW_ENABLE_SERVO // servo servo_init(); |