Merge pull request #150 from sieren/m5stack-fixes

sieren · web-flow · commit 9e07d03952a9 · 2021-02-10T17:08:58.000+01:00
Fix M5Stack Core1
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -147,8 +147,9 @@ file(REMOVE ${CMAKE_SOURCE_DIR}/main/libraries/TFT_eSPI/User_Setup.h)
 if(BOARD STREQUAL "M5STACK")
   message(STATUS "Compiling for M5Stack")
   list(APPEND compile_definitions "M5Stack")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DM5Stack")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DM5Stack")
+  list(APPEND compile_definitions "M5StackCore1")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DM5Stack -DM5StackCore1")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DM5Stack -DM5StackCore1")
   file(COPY ${CMAKE_SOURCE_DIR}/main/config/TFT_eSPI/M5Stack/User_Setup.h
     DESTINATION ${CMAKE_SOURCE_DIR}/main/libraries/TFT_eSPI)
 endif(BOARD STREQUAL "M5STACK")
diff --git a/main/config/Config.h b/main/config/Config.h
@@ -15,7 +15,7 @@ static const unsigned long MinsBeforeScreenSleep = 10; // Minutes before putting
 //                                                           
 //  
 
-#if defined(M5StackCore1) || defined(BUTTONSASS)
+#if defined(M5StackCore1) || defined(BUTTONS)
   // Define Button PINs
   #define BUTTON_A_PIN 39
   #define BUTTON_B_PIN 38
diff --git a/main/touch/ButtonDriver.h b/main/touch/ButtonDriver.h
@@ -12,6 +12,7 @@ namespace gfx
 {
   struct ButtonDriver
   {
+    using InnerDriver = TFT_eSPI;
     ButtonDriver(TFT_eSPI* tftDriver);
     void updateHardwareConfig(config::HardwareConfig& hwConfig) { }; // noop
 

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ namespace gfx`
`12`	`12`	`{`
`13`	`13`	`struct ButtonDriver`
`14`	`14`	`{`
	`15`	`+ using InnerDriver = TFT_eSPI;`
`15`	`16`	`ButtonDriver(TFT_eSPI* tftDriver);`
`16`	`17`	`void updateHardwareConfig(config::HardwareConfig& hwConfig) { }; // noop`
`17`	`18`