Merge branch 'develop'

Author: GOB52

examples/UnitUnified/UnitExtIO2/AnaDigInput/main/AnaDigInput.cpp

@@ -103,7 +103,7 @@ void analog8_function()
         }
         latest = at;
         render_status(v);
-        M5_LOGI("ANA8:%3u,%3u,%3u,%3u,%3u,%3u,%3u,%3u", v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]);
+        M5.Log.printf("ANA8:%3u,%3u,%3u,%3u,%3u,%3u,%3u,%3u\n", v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]);
     }
 }
 
@@ -119,7 +119,7 @@ void analog12_function()
         }
         latest = at;
         render_status(v);
-        M5_LOGI("ANA12:%4u,%4u,%4u,%4u,%4u,%4u,%4u,%4u", v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]);
+        M5.Log.printf("ANA12:%4u,%4u,%4u,%4u,%4u,%4u,%4u,%4u\n", v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]);
     }
 }
 
@@ -135,7 +135,7 @@ void digital_function()
         }
         latest = at;
         render_status(high_bits);
-        M5_LOGI("DIG:%X", high_bits);
+        M5.Log.printf("DIG:%X\n", high_bits);
     }
 }
 }  // namespace

examples/UnitUnified/UnitExtIO2/DigOutput/main/DigOutput.cpp

@@ -70,7 +70,7 @@ void setup()
 
     unit.writeAllMode(Mode::DigitalOutput);
     unit.writeAllDigitalOutput(false);  // All pins to LOW
-    M5_LOGI("Current Pin:%u", current);
+    M5.Log.printf("Current Pin:%u\n", current);
 }
 
 void loop()
@@ -83,12 +83,12 @@ void loop()
     if (M5.BtnA.wasClicked() || touch.wasClicked()) {
         // Toggle HIGH/LOW
         state ^= (1U << current);
-        M5_LOGI("Change Pin:%u to %s", current, (state & (1U << current)) ? "HIGH" : "LOW");
+        M5.Log.printf("Change Pin:%u to %s\n", current, (state & (1U << current)) ? "HIGH" : "LOW");
         dirty = true;
     } else if (M5.BtnA.wasHold() || touch.wasHold()) {
         // Change current to next
         current = (current + 1) % UnitExtIO2::NUMBER_OF_PINS;
-        M5_LOGI("Current Pin:%u", current);
+        M5.Log.printf("Current Pin:%u\n", current);
         dirty = true;
     }
 
@@ -97,9 +97,9 @@ void loop()
             M5_LOGE("Failed to output");
         }
         render();
-        M5_LOGI("Output Pin0:%u%u%u%u%u%u%u%u:Pin7", (bool)(state & 0x01), (bool)(state & 0x02), (bool)(state & 0x04),
-                (bool)(state & 0x08), (bool)(state & 0x10), (bool)(state & 0x20), (bool)(state & 0x40),
-                (bool)(state & 0x80));
+        M5.Log.printf("Output Pin0:%u%u%u%u%u%u%u%u:Pin7\n", (bool)(state & 0x01), (bool)(state & 0x02),
+                      (bool)(state & 0x04), (bool)(state & 0x08), (bool)(state & 0x10), (bool)(state & 0x20),
+                      (bool)(state & 0x40), (bool)(state & 0x80));
 
         dirty = false;
     }

examples/UnitUnified/UnitExtIO2/LEDControl/main/LEDControl.cpp

@@ -102,7 +102,7 @@ void loop()
 
     lcd.setCursor(16, 32 + 16);
     lcd.printf("RGB(%3u,%3u,%3u)", r, g, b);
-    M5_LOGI("RGB(%3u,%3u,%3u)", r, g, b);
+    M5.Log.printf("RGB(%3u,%3u,%3u)\n", r, g, b);
     lcd.fillRect(16, 32 * 2, lcd.width(), 16, (uint16_t)lgfx::rgb565_t(r, g, b));
 
     ++counter;

examples/UnitUnified/UnitExtIO2/ServoControl/main/ServoControl.cpp

@@ -89,6 +89,7 @@ void loop()
         }
         lcd.setCursor(16, 48);
         lcd.printf("Angle:%3u(deg)", deg);
+        M5.Log.printf("Angle:%3u(deg)\n", deg);
         m5::utility::delay(500);
     }
     m5::utility::delay(1000);

library.json

@@ -11,9 +11,9 @@
         "url": "https://github.com/m5stack/M5Unit-EXTIO.git"
     },
     "dependencies": {
-        "M5UnitUnified": "https://github.com/m5stack/M5UnitUnified.git@^0.0.5"
+        "m5stack/M5UnitUnified": ">=0.1.0"
     },
-    "version": "0.0.1",
+    "version": "0.1.0",
     "frameworks": [
         "arduino"
     ],
@@ -27,4 +27,4 @@
             "docs/html"
         ]
     }
-}
+}

library.properties

@@ -1,5 +1,5 @@
 name=M5Unit-EXTIO
-version=0.0.1
+version=0.1.0
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5Stack UNIT EXTIO using M5UnitUnified

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/unit/unit_ExtIO2.cpp

@@ -35,7 +35,7 @@ namespace unit {
 // class UnitExtIO2
 const char UnitExtIO2::name[] = "UnitExtIO2";
 const types::uid_t UnitExtIO2::uid{"UnitExtIO2"_mmh3};
-const types::uid_t UnitExtIO2::attr{0};
+const types::attr_t UnitExtIO2::attr{attribute::AccessI2C};
 
 bool UnitExtIO2::begin()
 {