Add CMake component support (#3)

* fix compiler warning for RTC Signed-off-by: Martin Strob <mwiechmann@techfak.uni-bielefeld.de> * add CMakeLists.txt for esp-idf CMake component mode Signed-off-by: Martin Strob <mwiechmann@techfak.uni-bielefeld.de> * fix compiler warning for missing case in switch 'hzk16Type' Signed-off-by: Martin Strob <mwiechmann@techfak.uni-bielefeld.de>
m5stack · May 22, 2019 · a40ca45 · a40ca45
1 parent 4b44e69
commit a40ca45
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(COMPONENT_SRCDIRS src 
+                      src/Fonts
+                      src/utility)
+
+set(COMPONENT_ADD_INCLUDEDIRS src)
+
+set(COMPONENT_PRIV_INCLUDEDIRS src/Fonts 
+                               src/Fonts/Custom 
+                               src/Fonts/GFXFF 
+                               src/Fonts/TrueType 
+                               src/utility)
+
+set(COMPONENT_PRIV_REQUIRES arduino)
+
+register_component()
diff --git a/src/M5Display.cpp b/src/M5Display.cpp
@@ -170,6 +170,10 @@ bool M5Display::initHzk16(boolean use, const char *HZK16Path,
 
   }
 
+  default: {
+    break;
+  }
+
   }
 
   return hzk16Type != DontUsedHzk16;

diff --git a/src/RTC.cpp b/src/RTC.cpp
@@ -70,7 +70,7 @@ void RTC::Bcd2asc(void)
   uint8_t i,j;
   for (j=0,i=0; i<7; i++){
     asc[j++] =(trdata[i]&0xf0)>>4|0x30 ;/*格式为: 秒 分 时 日 月 星期 年 */
-    asc[j++] =trdata[i]&0x0f|0x30;
+    asc[j++] =(trdata[i]&0x0f)|0x30;
   }
 }