Merge branch 'develop'

Author: GOB52

.gitignore

@@ -31,9 +31,21 @@
 *.out
 *.app
 
-# PlatformIO
-.pio
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/ipch
+# Executables
+*.exe
+*.out
+*.app
+
+#pio
+/.pio/
+
+#VsCode
+/.vscode/
+
+# Doxygen
+/html
+
+# 
+debug.cfg
+debug_custom.json
+*.svd

README.ja.md

@@ -70,29 +70,27 @@ begin で指定、または changeAppearance で変更できます。
 |---|---|
 |bottom| 画面下側にボタンを表示 (default)|
 |top|画面上側にボタンを表示|
-|custom|独自にボタンをカスタマイズ(下記参照)|
 |transparent\_bottom|bottom と同様の位置に透明ボタンを配置|
 |transparent\_top|top と同様の位置に透明ボタンを配置|
 |transparent_all|画面全体に透明ボタンを配置(縦3分割)|
 
 ## ボタンのカスタマイズ
-goblib::UnifiedButton::appearance\_t::custom を指定した後であれば、
-getButoonA / getButtonB / getButtonC で LGFX_Button\* を取得できます。  
+LGFX_Button\* を取得できます。  
 ```cpp
 void setup()
 {
     M5.begin();
-    unifiedButton.begin(&M5.Display, goblib::UnifiedButton::appearance_t::custom);
+    unifiedButton.begin(&M5.Display);
 
     auto btnA = unifiedButton.getButtonA();
-    auto btnB = unifiedButton.getButtonB();
-    auto btnC = unifiedButton.getButtonC();
-
     // 独自形状、色、テキストのボタンを再作成
     btnA->initButton(unifiedButton.gfx(), 40, 120, 80, 240 ,TFT_GREEN, TFT_BLUE, TFT_WHITE, "[A]");
-    ...
+    // ラベル変更
+	btnA->setLabelText("Own");
 }
 ```
+LGFX_Button については[こちら](https://github.com/m5stack/M5GFX/blob/master/src/lgfx/v1/LGFX_Button.hpp)を参照してください。
+
 
 ## ドキュメント
 [Doxygen](https://www.doxygen.nl/) 用の[設定ファイル](doc/Doxyfile)と[シェルスクリプト](doc/doxy.sh)で作成できます。  

README.md

@@ -69,28 +69,25 @@ You can specify it with begin or change it with changeAppearance.
 |---|---|
 |bottom| Display buttons at the bottom of the screen (default)|
 |top|Display buttons at the top of the screen|
-|custom|Customize your own buttons|
 |transparent\_bottom|Transparent buttons on the bottom of the screen|
 |transparent\_top|Transparent buttons on the top of the screen|
 |transparent_all|Transparent buttons are placed on the entire screen (three vertical sections)|
 
 ## Customize Buttons
-If after specifying goblib::UnifiedButton::appearance\_t::custom,
-getButtonA / getButtonB / getButtonC to get LGFX_Button\*.
+You can get LGFX_Button\*.
 
 ```cpp
 void setup()
 {
     M5.begin();
-    unifiedButton.begin(&M5.Display, goblib::UnifiedButton::appearance_t::custom);
+    unifiedButton.begin(&M5.Display);
 
     auto btnA = unifiedButton.getButtonA();
-    auto btnB = unifiedButton.getButtonB();
-    auto btnC = unifiedButton.getButtonC();
 
     // Re-create buttons with unique shape, color, and text
     btnA->initButton(unifiedButton.gfx(), 40, 120, 80, 240 ,TFT_GREEN, TFT_BLUE, TFT_WHITE, "[A]");
-    ...
+    // Change label text
+    btnA->setLabelText("Own");
 }
 ```
 

examples/customButton/customButton_main.cpp

@@ -4,13 +4,14 @@
  */
 #include <M5Unified.h>
 #include <gob_unifiedButton.hpp>
+#include "esp_random.h"
 
 goblib::UnifiedButton unifiedButton; // gob_unifiedButton instance
 
 void setup()
 {
     M5.begin();
-    unifiedButton.begin(&M5.Display, goblib::UnifiedButton::appearance_t::custom);
+    unifiedButton.begin(&M5.Display);
     M5.Display.clear(TFT_DARKGREEN);
 
     // Customize buttons
@@ -32,33 +33,42 @@ void setup()
     btnC->initButtonUL(unifiedButton.gfx(),
                      M5.Display.width()/2, M5.Display.height()/4, M5.Display.width()/2, M5.Display.height()*3/4,
                      TFT_CYAN, TFT_MAGENTA, TFT_RED, " CCC", 3.0f, 3.0f);
-
 }
 
 void loop()
 {
+    bool force{};
+
     M5.update();
     unifiedButton.update();
 
-    // Core/Core2/CoreS3 Can work with common code.
-    if(M5.BtnA.wasHold())
-    {
-        M5_LOGI("A button was hold");
-    }
-    else if(M5.BtnA.wasClicked())
+    auto btnA = unifiedButton.getButtonA();
+    auto btnB = unifiedButton.getButtonB();
+
+    static bool pa{};
+    bool ba = M5.BtnA.isPressed();
+    if(pa != ba)
     {
-        M5_LOGI("A button was clicked");
+        M5_LOGI("A button was changed");
+        btnA->setLabelText(M5.BtnA.isPressed() ? "Pressed" : "Released");
+        force = true;
     }
+    pa = ba;
 
-    if(M5.BtnB.pressedFor(1000))
+    if(M5.BtnB.wasClicked())
     {
-        M5_LOGI("B button pressed for 1000 ms");
+        M5_LOGI("B button was clicked");
+        uint16_t clr = esp_random() & 0xFFFF;
+        btnB->setOutlineColor(clr);
+        btnB->setFillColor(clr ^ 0xFFFF);
+        btnB->setTextColor(clr ^ 0xFF00);
+        force = true;
     }
 
     if(M5.BtnC.wasReleased())
     {
         M5_LOGI("C button was released");
     }
 
-    unifiedButton.draw();
+    unifiedButton.draw(force /*Force drawing to immediately reflect changes to LGFX_Button if true*/ );
 }

library.json

@@ -11,12 +11,12 @@
     "type": "git",
     "url": "https://github.com/GOB52/gob_unifiedButton.git"
   },
-  "version": "0.1.1",
+  "version": "0.1.2",
   "headers": "gob_unifiedButton.hpp",
   "license": "MIT",
   "platforms": "espressif32",
   "frameworks": "arduino",
   "dependencies": {
-    "m5stack/M5Unified": "^0.1.10"
+    "m5stack/M5Unified": "^0.1.13"
   }
-}
+}

library.properties

@@ -1,5 +1,5 @@
 name=gob_unifiedButton
-version=0.1.1
+version=0.1.2
 author=GOB 
 maintainer=GOB
 sentence=Add touch buttons for CoreS3 and commonality with conventional buttons (M5.BtnX)
@@ -8,4 +8,4 @@ category=Other
 url=https://github.com/GOB52/gob_unifiedButton.git
 architectures=esp32,esp32s3
 includes=gob_unifiedButton.hpp
-depends=M5Unified,M5GFX
+depends=M5Unified (>= 0.1.13), M5GFX (>= 0.1.13)

src/gob_unifiedButton.hpp

@@ -38,7 +38,6 @@ class UnifiedButton
     {
         bottom,             //!< Display buttons at the bottom of the screen (default)
         top,                //!< Display buttons at the top of the screen
-        custom,             //!< Customize your own buttons
         transparent_bottom = 0x40, //!< Transparent buttons on the bottom of the screen
         transparent_top,    //!< Transparent buttons on the top of the screen
         transparent_all,    //!< Transparent buttons are placed on the entire screen (three vertical sections)
@@ -95,15 +94,14 @@ class UnifiedButton
         }
     }
 
-    ///@name For customize buttons
-    ///@warning Must be appearance is custom.
+    ///@name Gets the LGFX_Button
     ///@{
-    LGFX_Button* getButtonA() { return _appearance == appearance_t::custom ? &_btns[0] : nullptr; } //!< @brief Gets the LGFX_Button A
-    LGFX_Button* getButtonB() { return _appearance == appearance_t::custom ? &_btns[1] : nullptr; } //!< @brief Gets the LGFX_Button B
-    LGFX_Button* getButtonC() { return _appearance == appearance_t::custom ? &_btns[2] : nullptr; } //!< @brief Gets the LGFX_Button C
+    LGFX_Button* getButtonA() { return  &_btns[0]; } //!< @brief Gets the button A
+    LGFX_Button* getButtonB() { return  &_btns[1]; } //!< @brief Gets the button B
+    LGFX_Button* getButtonC() { return  &_btns[2]; } //!< @brief Gets the button C
     ///@}
 
-    /// @cond 0
+    /// @cond
     [[deprecated("please use show(const bool)")]]
     inline void showButtons(const bool b) { show(b); }
     [[deprecated("please use show()")]]

src/gob_unifiedButton_version.hpp

@@ -3,7 +3,7 @@
 
 #define GOBLIB_UNIFIED_BUTTON_VERSION_MAJOR 0
 #define GOBLIB_UNIFIED_BUTTON_VERSION_MINOR 1
-#define GOBLIB_UNIFIED_BUTTON_VERSION_PATCH 1
+#define GOBLIB_UNIFIED_BUTTON_VERSION_PATCH 2
 
 #define GOBLIB_UNIFIED_BUTTON_VERSION_STRINGIFY_AGAIN(x) #x
 #define GOBLIB_UNIFIED_BUTTON_VERSION_STRINGIFY(x) GOBLIB_UNIFIED_BUTTON_VERSION_STRINGIFY_AGAIN(x)