Merge branch 'develop'

Author: GOB52

examples/UnitUnified/PlotToSerial/main/PlotToSerial.cpp

@@ -60,10 +60,10 @@ void setup()
     M5_LOGI("M5UnitUnified has been begun");
     M5_LOGI("%s", Units.debugInfo().c_str());
 #if defined(USING_UNIT_CARDKB)
-    M5_LOGI("Hardware:%02X Firmware:%02X", unit.hardwareType(), unit.firmwareVersion());
+    M5.Log.printf("Hardware:%02X Firmware:%02X\n", unit.hardwareType(), unit.firmwareVersion());
 #endif
 #if defined(USING_UNIT_FACES_QWERTY)
-    M5_LOGI("FacesType:%02X Firmware:%02X", unit.facesType(), unit.firmwareVersion());
+    M5.Log.printf("FacesType:%02X Firmware:%02X\n", unit.facesType(), unit.firmwareVersion());
 #endif
     lcd.fillScreen(TFT_DARKGREEN);
 

examples/UnitUnified/SimpleDisplay/main/SimpleDisplay.cpp

@@ -70,10 +70,10 @@ void setup()
     M5_LOGI("M5UnitUnified has been begun");
     M5_LOGI("%s", Units.debugInfo().c_str());
 #if defined(USING_UNIT_CARDKB)
-    M5_LOGI("Hardware:%02X Firmware:%02X", unit.hardwareType(), unit.firmwareVersion());
+    M5.Log.printf("Hardware:%02X Firmware:%02X\n", unit.hardwareType(), unit.firmwareVersion());
 #endif
 #if defined(USING_UNIT_FACES_QWERTY)
-    M5_LOGI("FacesType:%02X Firmware:%02X", unit.facesType(), unit.firmwareVersion());
+    M5.Log.printf("FacesType:%02X Firmware:%02X\n", unit.facesType(), unit.firmwareVersion());
 #endif
 
     lcd.setFont(&fonts::AsciiFont8x16);

library.json

@@ -10,8 +10,9 @@
         "type": "git",
         "url": "https://github.com/m5stack/M5Unit-KEYBOARD.git"
     },
-    "dependencies": {
-        "M5UnitUnified": "https://github.com/m5stack/M5UnitUnified.git@^0.0.5"
+    "dependencies":
+    {
+	"m5stack/M5UnitUnified": ">=0.1.0"
     },
     "version": "0.0.1",
     "frameworks": [

platformio.ini

@@ -10,7 +10,7 @@ lib_ldf_mode = deep
 test_framework = googletest
 test_build_src = true
 lib_deps=m5stack/M5Unified
-  m5stack/M5UnitUnified@^0.0.5
+  m5stack/M5UnitUnified@>=0.1.0
 
 ; --------------------------------
 [m5base]

src/M5UnitUnifiedKEYBOARD.h

@@ -7,8 +7,8 @@
   @file M5UnitUnifiedKEYBOARD.h
   @brief Main header of M5UnitKEYBOARD using M5UnitUnfied
 */
-#ifndef M5_UNIT_UNIFIED_KEYBARD_H
-#define M5_UNIT_UNIFIED_KEYBARD_H
+#ifndef M5_UNIT_UNIFIED_KEYBOARD_H
+#define M5_UNIT_UNIFIED_KEYBOARD_H
 #ifdef __cplusplus
 #include "M5UnitUnifiedKEYBOARD.hpp"
 #else

src/unit/unit_CardKB.cpp

@@ -225,7 +225,7 @@ namespace unit {
 // class UnitCardKB
 const char UnitCardKB::name[] = "UnitCardKB";
 const types::uid_t UnitCardKB::uid{"UnitCardKB"_mmh3};
-const types::uid_t UnitCardKB::attr{0};
+const types::attr_t UnitCardKB::attr{attribute::AccessI2C};
 
 key_index_t UnitCardKB::character_to_key_index(const char ch)
 {

src/unit/unit_CardKB.hpp

@@ -7,8 +7,8 @@
   @file unit_CardKB.hpp
   @brief CardKB Unit for M5UnitUnified
 */
-#ifndef M5_UNIT_KEYBOARD_UNIT_CARDKB_HPP
-#define M5_UNIT_KEYBOARD_UNIT_CARDKB_HPP
+#ifndef M5_UNIT_KEYBOARD_UNIT_CARD_KB_HPP
+#define M5_UNIT_KEYBOARD_UNIT_CARD_KB_HPP
 
 #include "unit_Keyboard.hpp"
 #include <m5_utility/container/circular_buffer.hpp>

src/unit/unit_FacesQWERTY.cpp

@@ -226,7 +226,7 @@ namespace unit {
 // class UnitFacesQWERTY
 const char UnitFacesQWERTY::name[] = "UnitFacesQWERTY";
 const types::uid_t UnitFacesQWERTY::uid{"UnitFacesQWERTY"_mmh3};
-const types::uid_t UnitFacesQWERTY::attr{0};
+const types::attr_t UnitFacesQWERTY::attr{attribute::AccessI2C};
 
 key_index_t UnitFacesQWERTY::character_to_key_index(const char ch)
 {
@@ -300,7 +300,7 @@ bool UnitFacesQWERTY::begin()
 #if defined(ARDUINO)
 #if defined(digitalPinToInterrupt)
     if (_handle_irq) {
-        adapter()->pinMode(INTERRUPT_PIN, INPUT_PULLUP);
+        pinMode(INTERRUPT_PIN, INPUT_PULLUP);
         attachInterrupt(digitalPinToInterrupt(INTERRUPT_PIN), handle_faces_qwerty, FALLING);
     }
 #else

src/unit/unit_Keyboard.cpp

@@ -21,7 +21,7 @@ namespace unit {
 // class UnitKeyboard
 const char UnitKeyboard::name[] = "UnitKeyboard";
 const types::uid_t UnitKeyboard::uid{"UnitKeyboard"_mmh3};
-const types::uid_t UnitKeyboard::attr{0};
+const types::attr_t UnitKeyboard::attr{attribute::AccessI2C};
 
 bool UnitKeyboard::begin()
 {
@@ -46,7 +46,7 @@ void UnitKeyboard::update(const bool force)
 // class UnitKeyboardBitwise
 const char UnitKeyboardBitwise::name[] = "UnitKeyboardBitwise";
 const types::uid_t UnitKeyboardBitwise::uid{"UnitKeyboardBitwise"_mmh3};
-const types::uid_t UnitKeyboardBitwise::attr{0};
+const types::attr_t UnitKeyboardBitwise::attr{attribute::AccessI2C};
 
 void UnitKeyboardBitwise::update(const bool force)
 {

test/embedded/test_cardkb/cardkb_test.cpp

@@ -84,7 +84,7 @@ TEST_P(TestCardKB, M5UnitUnifiedFirmware)
     EXPECT_TRUE(unit->readHardwareType(htype));
     EXPECT_EQ(htype, unit->hardwareType());
     EXPECT_TRUE(htype == TYPE_CARDKB || htype == TYPE_CARDKB_V11);
-    
+
     Mode mode{};
     for (auto&& m : mode_table) {
         EXPECT_TRUE(unit->writeMode(m));