[GLOBAL] Refactor: HAL

.clang-format

@@ -0,0 +1,46 @@
+BasedOnStyle: LLVM
+UseTab: Never
+IndentWidth: 4
+TabWidth: 2
+BreakBeforeBraces: Allman
+IncludeBlocks: Regroup
+ColumnLimit: 0
+AccessModifierOffset: -4
+NamespaceIndentation: All
+FixNamespaceComments: true 
+BitFieldColonSpacingStyle: Both
+AllowShortIfStatementsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortNamespacesOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
+AlignConsecutiveDeclarations: true
+AlignArrayOfStructures: Left
+AlignConsecutiveBitFields:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: true
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: false
+AlignConsecutiveShortCaseStatements:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: true
+  AlignCaseColons: true
+AlignConsecutiveTableGenDefinitionColons: true
+AlignTrailingComments: true
+AlignConsecutiveAssignments:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: true
+SortUsingDeclarations: LexicographicNumeric
+SpaceBeforeCaseColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeJsonColon: true
+IndentCaseLabels: true
+IndentPPDirectives: BeforeHash
+IndentExternBlock: Indent

.clang-tidy

@@ -0,0 +1 @@
+Checks: '-*,clang-analyzer-cplusplus*,llvm-header-guard'

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+3208150197b1bd422021c608f57b9b3e4e7040f9
+
+1b84d09669504d4c0c6ab25678ed7c15bd610432

.gitignore

@@ -4,6 +4,7 @@
 .vscode/launch.json
 .vscode/extensions.json
 .vscode/ipch
+.vscode/settings.json
 Bruce3_*.bin
 bruce.conf
 _*.sh

.vscode/settings.json

@@ -1,5 +1,4 @@
 {
-    "idf.portWin": "COM4",
     "files.associations": {
         "iosfwd": "cpp",
         "iostream": "cpp",
@@ -57,10 +56,12 @@
         "iomanip": "cpp",
         "chrono": "cpp",
         "ratio": "cpp",
-        "*.tpp": "cpp"
+        "*.tpp": "cpp",
+        "condition_variable": "cpp",
+        "mutex": "cpp",
+        "thread": "cpp"
     },
     "githubPullRequests.ignoredPullRequestBranches": [
         "main"
-    ],
-    "cmake.sourceDirectory": "C:/Projetos/Bruce/lib/M5GFX"
+    ]
 }

boards/lilygo-t-embed-cc1101.ini

@@ -18,6 +18,5 @@ build_flags =
 
 lib_deps =
 	${env.lib_deps}
-	lewisxhe/XPowersLib @0.2.6
 	mathertel/RotaryEncoder @1.5.3
 	fastled/FastLED @3.9.4

boards/lilygo-t-embed-cc1101/interface.cpp

@@ -11,9 +11,9 @@ IRAM_ATTR void checkPosition();
 #if defined(T_EMBED_1101)
     // Power handler for battery detection
     #include <Wire.h>
-    #include <XPowersLib.h>
+    #include <HAL.hpp>
     #include <esp32-hal-dac.h>
-    XPowersPPM PPM;
+    PMIC pmic;
 #elif defined(T_EMBED)
     #include <driver/adc.h>
     #include <esp_adc_cal.h>
@@ -25,6 +25,7 @@ IRAM_ATTR void checkPosition();
     #include <bq27220.h>
     BQ27220 bq;
 #endif
+TwoWire* myWire = &Wire;
 /***************************************************************************************
 ** Function name: _setup_gpio()
 ** Description:   initial setup for the device
@@ -47,22 +48,22 @@ void _setup_gpio() {
       pinMode(PIN_POWER_ON, OUTPUT);
       digitalWrite(PIN_POWER_ON, HIGH);  // Power on CC1101 and LED
       bool pmu_ret = false;
-      Wire.begin(GROVE_SDA, GROVE_SCL);
-      pmu_ret = PPM.init(Wire, GROVE_SDA, GROVE_SCL, BQ25896_SLAVE_ADDRESS);
+      myWire->begin(GROVE_SDA, GROVE_SCL);
+      pmu_ret = pmic.init(Wire, GROVE_SDA, GROVE_SCL, BQ25896_SLAVE_ADDRESS);
       if(pmu_ret) {
-          PPM.setSysPowerDownVoltage(3300);
-          PPM.setInputCurrentLimit(3250);
-          Serial.printf("getInputCurrentLimit: %d mA\n",PPM.getInputCurrentLimit());
-          PPM.disableCurrentLimitPin();
-          PPM.setChargeTargetVoltage(4208);
-          PPM.setPrechargeCurr(64);
-          PPM.setChargerConstantCurr(832);
-          PPM.getChargerConstantCurr();
-          Serial.printf("getChargerConstantCurr: %d mA\n",PPM.getChargerConstantCurr());
-          PPM.enableADCMeasure();
-          PPM.enableCharge();
-          PPM.enableOTG();
-          PPM.disableOTG();
+          pmic.setSysPowerDownVoltage(3300);
+          pmic.setInputCurrentLimit(3250);
+          Serial.printf("getInputCurrentLimit: %d mA\n",pmic.getInputCurrentLimit());
+          pmic.disableCurrentLimitPin();
+          pmic.setChargeTargetVoltage(4208);
+          pmic.setPrechargeCurr(64);
+          pmic.setChargerConstantCurr(832);
+          pmic.getChargerConstantCurr();
+          Serial.printf("getChargerConstantCurr: %d mA\n",pmic.getChargerConstantCurr());
+          pmic.enableMeasure(HAL::PMIC::MeasureMode::CONTINUOUS);
+          pmic.enableCharge();
+          pmic.enableOTG();
+          pmic.disableOTG();
       }
     #else
       pinMode(BAT_PIN,INPUT); // Battery value

boards/lilygo-t-embed.ini

@@ -19,6 +19,5 @@ build_flags =
 
 lib_deps =
 	${env.lib_deps}
-	lewisxhe/XPowersLib @0.2.6
 	mathertel/RotaryEncoder @1.5.3
 	fastled/FastLED @3.9.4

boards/m5stack-cores3/interface.cpp

@@ -3,6 +3,8 @@
 #include "core/utils.h"
 
 #include <M5Unified.h>
+#include <HAL.hpp>
+PMIC pmic;
 
 /***************************************************************************************
 ** Function name: _setup_gpio()
@@ -21,7 +23,7 @@ void _setup_gpio() {
 ***************************************************************************************/
 int getBattery() { 
   int percent;
-  percent = M5.Power.getBatteryLevel();
+  percent = pmic.getBatteryPercent();
   return  (percent < 0) ? 0
       : (percent >= 100) ? 100
       :  percent;
@@ -88,7 +90,9 @@ void InputHandler(void) {
 ** location: mykeyboard.cpp
 ** Turns off the device (or try to)
 **********************************************************************/
-void powerOff() { }
+void powerOff() { 
+  pmic.shutdown();
+}
 
 
 /*********************************************************************

boards/pinouts/lilygo-t-embed-cc1101.h

@@ -5,6 +5,10 @@
 #include <stdint.h>
 #include "soc/soc_caps.h"
 
+//HAL Definitions
+#define HAL_PMIC
+#define PMIC_BQ25896
+
 // Main I2C Bus
 #define SPI_SS_PIN      8
 #define SPI_MOSI_PIN    9

boards/pinouts/m5stack-cores3.h

@@ -60,6 +60,9 @@ static const uint8_t G46 = 46;
 
 static const uint8_t ADC = 10;
 
+#define HAL_PMIC
+#define PMIC_AXP2101
+
 #define HAS_RTC 
 #define USB_as_HID
 

boards/pinouts/m5stack-cplus1_1.h

@@ -35,4 +35,6 @@ static const uint8_t DAC2 = 26;
 static const uint8_t ADC1 = 35;
 static const uint8_t ADC2 = 36;
 
+#define PMIC_AXP192
+
 #endif /* Pins_Arduino_h */

boards/pinouts/smoochiee-board.h

@@ -1,5 +1,5 @@
-#ifndef Pins_Arduino_h
-#define Pins_Arduino_h
+#ifndef __SMOOCHIEE_BOARD__
+#define __SMOOCHIEE_BOARD__
 
 #include <stdint.h>
 #include "soc/soc_caps.h"
@@ -46,6 +46,10 @@ static const uint8_t G46 = 46;
 static const uint8_t ADC1 = 7;
 static const uint8_t ADC2 = 8;
 
+// HAL Definitions
+#define HAL_PMIC
+#define PMIC_BQ25896
+
 #define SERIAL_RX 2
 #define SERIAL_TX 1
 #define BAD_RX SERIAL_RX
@@ -121,4 +125,4 @@ static const uint8_t ADC2 = 8;
 #define SPI_MISO_PIN	11
 #define SPI_SS_PIN	    43
 
-#endif /* Pins_Arduino_h */
+#endif  /* __SMOOCHIEE_BOARD__ */

boards/smoochiee-board.ini

@@ -25,5 +25,4 @@ build_flags =
 	-DRF_RX_PINS='{{"M5 RF433R", GROVE_SCL}, {"Groove W", GROVE_SCL}, {"GROVE Y", GROVE_SDA}, {"GPIO 1", 1}, {"GPIO 2", 2}}'
 
 lib_deps =
-	${env.lib_deps}
-	lewisxhe/XPowersLib @0.2.6
+	${env.lib_deps}

boards/smoochiee-board/interface.cpp

@@ -14,8 +14,8 @@
 
 // Power handler for battery detection
 #include <Wire.h>
-#include <XPowersLib.h>
-XPowersPPM PPM;
+#include <HAL.hpp>
+PMIC pmic;
 
 
 void _setup_gpio() { 
@@ -42,21 +42,21 @@ void _setup_gpio() {
 
     bool pmu_ret = false;
       Wire.begin(GROVE_SDA, GROVE_SCL);
-      pmu_ret = PPM.init(Wire, GROVE_SDA, GROVE_SCL, BQ25896_SLAVE_ADDRESS);
+      pmu_ret = pmic.init(Wire, GROVE_SDA, GROVE_SCL, BQ25896_SLAVE_ADDRESS);
       if(pmu_ret) {
-          PPM.setSysPowerDownVoltage(3300);
-          PPM.setInputCurrentLimit(3250);
-          Serial.printf("getInputCurrentLimit: %d mA\n",PPM.getInputCurrentLimit());
-          PPM.disableCurrentLimitPin();
-          PPM.setChargeTargetVoltage(4208);
-          PPM.setPrechargeCurr(64);
-          PPM.setChargerConstantCurr(832);
-          PPM.getChargerConstantCurr();
-          Serial.printf("getChargerConstantCurr: %d mA\n",PPM.getChargerConstantCurr());
-          PPM.enableADCMeasure();
-          PPM.enableCharge();
-          PPM.enableOTG();
-          PPM.disableOTG();
+          pmic.setSysPowerDownVoltage(3300);
+          pmic.setInputCurrentLimit(3250);
+          Serial.printf("getInputCurrentLimit: %d mA\n",pmic.getInputCurrentLimit());
+          pmic.disableCurrentLimitPin();
+          pmic.setChargeTargetVoltage(4208);
+          pmic.setPrechargeCurr(64);
+          pmic.setChargerConstantCurr(832);
+          pmic.getChargerConstantCurr();
+          Serial.printf("getChargerConstantCurr: %d mA\n",pmic.getChargerConstantCurr());
+          pmic.enableMeasure(HAL::PMIC::MeasureMode::CONTINUOUS);
+          pmic.enableCharge();
+          pmic.enableOTG();
+          pmic.disableOTG();
       }
 
 }
@@ -69,7 +69,7 @@ void _setup_gpio() {
 ***************************************************************************************/
 int getBattery() { 
     uint8_t percent=0;
-    percent=(PPM.getSystemVoltage()-3300)*100/(float)(4150-3350);
+    percent=(pmic.getSystemVoltage()-3300)*100/(float)(4150-3350);
 
     return  (percent < 0) ? 0
         : (percent >= 100) ? 100

lib/HAL/BUS/I2C/I2C_Device.tpp

@@ -0,0 +1,84 @@
+#include <Wire.h>
+#include <Arduino.h>
+namespace HAL::BUS
+{
+    template <class Device>
+    class I2C_Device
+    {
+        public:
+        int readRegister(uint8_t reg)
+        {
+            uint8_t val = 0;
+            return readRegister(reg, &val, 1) == -1 ? -1 : val;
+        }
+
+        int writeRegister(uint8_t reg, uint8_t val)
+        {
+            return writeRegister(reg, &val, 1);
+        }
+
+        int readRegister(uint8_t reg, uint8_t *buf, uint8_t length = 1)
+        {
+            if (myWire)
+            {
+                myWire->beginTransmission(myADDR);
+                myWire->write(reg);
+                if (myWire->endTransmission() != 0)
+                {
+                    return -1;
+                }
+                myWire->requestFrom(myADDR, length);
+                return myWire->readBytes(buf, length) == length ? 0 : -1;
+            }
+            return -1;
+        }
+
+        int writeRegister(uint8_t reg, uint8_t *buf, uint8_t length)
+        {
+            if (myWire)
+            {
+                myWire->beginTransmission(myADDR);
+                myWire->write(reg);
+                myWire->write(buf, length);
+                return (myWire->endTransmission() == 0) ? 0 : -1;
+            }
+            return -1;
+        }
+
+        bool inline clrRegisterBit(uint8_t registers, uint8_t bit)
+        {
+            int val = readRegister(registers);
+            if (val == -1)
+            {
+                return false;
+            }
+            return writeRegister(registers, (val & (~_BV(bit)))) == 0;
+        }
+
+        bool inline setRegisterBit(uint8_t registers, uint8_t bit)
+        {
+            int val = readRegister(registers);
+            if (val == -1)
+            {
+                return false;
+            }
+            return writeRegister(registers, (val | (_BV(bit)))) == 0;
+        }
+
+        bool inline getRegisterBit(uint8_t registers, uint8_t bit)
+        {
+            int val = readRegister(registers);
+            if (val == -1)
+            {
+                return false;
+            }
+            return val & _BV(bit);
+        }
+
+        protected:
+        TwoWire      *myWire  = NULL;
+        int           mySDA   = -1;
+        int           mySCL   = -1;
+        uint8_t       myADDR  = 0xFF;
+    };
+}