Add power api, Set battery charging init in M5.Power.begin()

EeeeBin · EeeeBin · commit f9953af75084 · 2019-08-29T14:31:06.000+08:00
1. Reduce  battery charging current to 650ma
2. Set battery charging voltage to 4.2v
diff --git a/examples/Basics/Button/Button.ino b/examples/Basics/Button/Button.ino
@@ -9,6 +9,14 @@
 void setup() {
   // init lcd, serial, but don't init sd card
   M5.begin(true, false, true);
+  
+  /*
+    Power chip connected to gpio21, gpio22, I2C device
+    Set battery charging voltage and current
+    If used battery, please call this function in your project
+  */
+  M5.Power.begin();
+
   M5.Lcd.clear(BLACK);
   M5.Lcd.setTextColor(YELLOW);
   M5.Lcd.setTextSize(2);
@@ -22,6 +30,7 @@ void setup() {
 
 // Add the main program code into the continuous loop() function
 void loop() {
+  // update button state
   M5.update();
  
   // if you want to use Releasefor("was released for"), use .wasReleasefor(int time) below
diff --git a/examples/Basics/Display/Display.ino b/examples/Basics/Display/Display.ino
@@ -6,6 +6,13 @@ void setup() {
   // initialize the M5Stack object
   M5.begin();
 
+  /*
+    Power chip connected to gpio21, gpio22, I2C device
+    Set battery charging voltage and current
+    If used battery, please call this function in your project
+  */
+  M5.Power.begin();
+  
   // Lcd display
   M5.Lcd.fillScreen(WHITE);
   delay(500);
diff --git a/examples/Basics/FactoryTest/FactoryTest.ino b/examples/Basics/FactoryTest/FactoryTest.ino
@@ -469,6 +469,13 @@ void setup() {
     // initialize the M5Stack object
     M5.begin();
 
+    /*
+      Power chip connected to gpio21, gpio22, I2C device
+      Set battery charging voltage and current
+      If used battery, please call this function in your project
+    */
+    M5.Power.begin();
+    
     // dac test
     // if (gpio_test_flg)
     // {
diff --git a/examples/Basics/HelloWorld/HelloWorld.ino b/examples/Basics/HelloWorld/HelloWorld.ino
@@ -6,6 +6,13 @@ void setup(){
   // Initialize the M5Stack object
   M5.begin();
 
+  /*
+    Power chip connected to gpio21, gpio22, I2C device
+    Set battery charging voltage and current
+    If used battery, please call this function in your project
+  */
+  M5.Power.begin();
+    
   // LCD display
   M5.Lcd.print("Hello World");
 }
diff --git a/examples/Basics/PowerOFF/PowerOFF.ino b/examples/Basics/PowerOFF/PowerOFF.ino
@@ -5,6 +5,13 @@ void setup(){
 
   // initialize the M5Stack object
   M5.begin();
+  
+  /*
+    Power chip connected to gpio21, gpio22, I2C device
+    Set battery charging voltage and current
+    If used battery, please call this function in your project
+  */
+  M5.Power.begin();
 
   // Lcd display
   M5.Lcd.println("This is software power off demo");
diff --git a/examples/Basics/Sleep/Sleep.ino b/examples/Basics/Sleep/Sleep.ino
@@ -2,6 +2,12 @@
 
 void setup() {
   M5.begin();
+
+  /*
+    Power chip connected to gpio21, gpio22, I2C device
+    Set battery charging voltage and current
+    If used battery, please call this function in your project
+  */
   M5.Power.begin();
   M5.Lcd.setBrightness(200);
 
diff --git a/examples/Basics/Speaker/Speaker.ino b/examples/Basics/Speaker/Speaker.ino
@@ -30,6 +30,13 @@ void setup() {
   // Initialize the M5Stack object
   M5.begin();
   
+  /*
+    Power chip connected to gpio21, gpio22, I2C device
+    Set battery charging voltage and current
+    If used battery, please call this function in your project
+  */
+  M5.Power.begin();
+
   M5.Lcd.printf("M5Stack Speaker test:\r\n");
 }
 
diff --git a/examples/Unit/ADC_ADS1100/ADC_ADS1100.ino b/examples/Unit/ADC_ADS1100/ADC_ADS1100.ino
@@ -11,8 +11,8 @@ ADS1100 ads;
 void setup(void)
 {
     M5.begin(true, false, false);
+    M5.Power.begin();
     Serial.begin(115200);
-
     M5.Lcd.fillScreen(BLACK);
     M5.Lcd.setTextColor(ORANGE);
 
diff --git a/examples/Unit/ANGLE/ANGLE.ino b/examples/Unit/ANGLE/ANGLE.ino
@@ -8,6 +8,7 @@ int cur_sensorValue = 0;
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
   pinMode(sensorPin, INPUT);
   dacWrite(25, 0);
   M5.Lcd.setTextSize(2);
diff --git a/examples/Unit/BUTTON/BUTTON.ino b/examples/Unit/BUTTON/BUTTON.ino
@@ -6,6 +6,7 @@ int cur_value = 0;
 void setup() {
   // init lcd
   M5.begin();
+  M5.Power.begin();
   Serial.begin(115200);
   pinMode(36, INPUT);
   M5.Lcd.clear(BLACK);
diff --git a/examples/Unit/CardKB/CardKB.ino b/examples/Unit/CardKB/CardKB.ino
@@ -6,6 +6,7 @@
 void setup()
 {
   M5.begin();
+  M5.Power.begin();
   Serial.begin(115200);
   Wire.begin();
   pinMode(5, INPUT);
diff --git a/examples/Unit/Color/Color.ino b/examples/Unit/Color/Color.ino
@@ -31,6 +31,7 @@ void setup() {
   delay(100);
 
   M5.begin(true, false, false);
+  M5.Power.begin();
   Serial.begin(115200);
   Serial.println("Color View Test!");
   while(!tcs.begin()){
diff --git a/examples/Unit/DAC_MCP4725/DAC_MCP4725.ino b/examples/Unit/DAC_MCP4725/DAC_MCP4725.ino
@@ -11,6 +11,7 @@ Adafruit_MCP4725 dac;
 
 void setup(void) {
     M5.begin(true, false, false);
+    M5.Power.begin();
     Serial.begin(115200);
     Serial.println("Hello!");
     M5.Lcd.setTextFont(4);
diff --git a/examples/Unit/Dual_Button/Dual_Button.ino b/examples/Unit/Dual_Button/Dual_Button.ino
@@ -11,6 +11,7 @@ int cur_value_blue = 0;
 void setup() {
   // init lcd
   M5.begin();
+  M5.Power.begin();
   pinMode(26, INPUT);
   pinMode(36, INPUT);
   M5.Lcd.clear(BLACK);
diff --git a/examples/Unit/ENV/ENV.ino b/examples/Unit/ENV/ENV.ino
@@ -13,6 +13,7 @@ Adafruit_BMP280 bme;
 
 void setup() {
     M5.begin();
+    M5.Power.begin();
     Wire.begin();
 
     M5.Lcd.setBrightness(10);
diff --git a/examples/Unit/EXT_IO/EXT_IO.ino b/examples/Unit/EXT_IO/EXT_IO.ino
@@ -7,6 +7,7 @@ uint8_t res;
 void setup()
 {
   M5.begin();
+  M5.Power.begin();
   Wire.begin();
   M5.Lcd.clear(BLACK);
   M5.Lcd.setTextSize(2);
diff --git a/examples/Unit/Earth/Earth.ino b/examples/Unit/Earth/Earth.ino
@@ -2,6 +2,7 @@
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
   //disable the speak noise
   dacWrite(25, 0);
 
diff --git a/examples/Unit/Fingerprint/Fingerprint.ino b/examples/Unit/Fingerprint/Fingerprint.ino
@@ -17,6 +17,7 @@ void CleanScreen()
 
 void setup() {
     M5.begin();
+    M5.Power.begin();
     Serial.begin(115200);
     Serial2.begin(19200, SERIAL_8N1, 16, 17);
     M5.Lcd.clear(BLACK);
diff --git a/examples/Unit/GPS/GPSRaw/GPSRaw.ino b/examples/Unit/GPS/GPSRaw/GPSRaw.ino
@@ -5,6 +5,7 @@ HardwareSerial GPSRaw(2);
 void setup() {
   
   M5.begin();
+  M5.Power.begin();
   GPSRaw.begin(9600);
 
   Serial.println("hello");
diff --git a/examples/Unit/HEART/MAX30100_RawData/MAX30100_RawData.ino b/examples/Unit/HEART/MAX30100_RawData/MAX30100_RawData.ino
@@ -45,6 +45,7 @@ MAX30100 sensor;
 void setup()
 {
     Serial.begin(115200);
+    M5.Power.begin();
     M5.begin();
     Serial.print("Initializing MAX30100..");
 
diff --git a/examples/Unit/HEX/HEX.ino b/examples/Unit/HEX/HEX.ino
@@ -12,6 +12,7 @@ uint8_t gHue = 0;
 
 void setup() {
   Serial.begin(115200);
+  M5.Power.begin();
   M5.begin();
   M5.Lcd.clear(BLACK);
   M5.Lcd.setTextColor(YELLOW); M5.Lcd.setTextSize(2); M5.Lcd.setCursor(40, 0);
diff --git a/examples/Unit/IR/IR.ino b/examples/Unit/IR/IR.ino
@@ -7,6 +7,7 @@ int cur_recv_value = 0;
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
   Serial.begin(115200);
   pinMode(ir_recv_pin, INPUT);
   pinMode(ir_send_pin, OUTPUT);
diff --git a/examples/Unit/Joystick/Joystick.ino b/examples/Unit/Joystick/Joystick.ino
@@ -4,6 +4,7 @@
 #define JOY_ADDR 0x52
 void setup() {
   M5.begin();
+  M5.Power.begin();
   M5.Lcd.clear();
 
   M5.Lcd.setTextFont(4);
diff --git a/examples/Unit/LASER/LASER.ino b/examples/Unit/LASER/LASER.ino
@@ -18,7 +18,7 @@ char ch;
 void setup() {
 
   M5.begin();
-
+  M5.Power.begin();
   Serial.begin(115200);
 
   // Serial2.begin(unsigned long baud, uint32_t config, int8_t rxPin, int8_t txPin, bool invert)
diff --git a/examples/Unit/Light/Light.ino b/examples/Unit/Light/Light.ino
@@ -2,6 +2,7 @@
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
   //disable the speak noise
   dacWrite(25, 0);
 
diff --git a/examples/Unit/MLX90640/MLX90640.ino b/examples/Unit/MLX90640/MLX90640.ino
@@ -115,6 +115,7 @@ long loopTime, startTime, endTime, fps;
 void setup()
 {
   M5.begin();
+  M5.Power.begin();
   Wire.begin();
   Wire.setClock(450000); //Increase I2C clock speed to 400kHz
   Serial.begin(115200);
diff --git a/examples/Unit/Makey/Makey.ino b/examples/Unit/Makey/Makey.ino
@@ -15,6 +15,7 @@ void setup() {
   // Power ON Stabilizing...
   delay(500);
   M5.begin();
+  M5.Power.begin();
   pinMode(39, INPUT);
   pinMode(38, INPUT);
   // Init I2C
diff --git a/examples/Unit/NCIR/NCIR.ino b/examples/Unit/NCIR/NCIR.ino
@@ -2,9 +2,8 @@
 #include <Wire.h>
 
 void setup() {
-  Wire.begin();
-  Serial.begin(115200);
   M5.begin();
+  M5.Power.begin();
   M5.Lcd.setTextColor(WHITE);
   M5.Lcd.setTextSize(3);
   M5.Lcd.clear(BLACK);
diff --git a/examples/Unit/NEOFLASH/NEOFLASH.ino b/examples/Unit/NEOFLASH/NEOFLASH.ino
@@ -164,8 +164,9 @@ void InitWifi()
 }
 void setup() {
   delay(3000); // 3 second delay for recovery
-  Serial.begin(115200);
   M5.begin();
+  M5.Power.begin();
+
   M5.Lcd.clear(BLACK);
   M5.Lcd.setTextColor(YELLOW); M5.Lcd.setTextSize(2); M5.Lcd.setCursor(40, 0);
   M5.Lcd.println("Neoflash example");
diff --git a/examples/Unit/NEOPIXEL/display_rainbow/display_rainbow.ino b/examples/Unit/NEOPIXEL/display_rainbow/display_rainbow.ino
@@ -14,8 +14,9 @@ static TaskHandle_t FastLEDshowTaskHandle = 0;
 static TaskHandle_t userTaskHandle = 0;
 
 void setup() {
-  Serial.begin(115200);
   M5.begin();
+  M5.Power.begin();
+
   M5.Lcd.clear(BLACK);
   M5.Lcd.setTextColor(YELLOW); M5.Lcd.setTextSize(2); M5.Lcd.setCursor(40, 0);
   M5.Lcd.println("Neopixel Example");
diff --git a/examples/Unit/PIR/pir.ino b/examples/Unit/PIR/pir.ino
@@ -2,6 +2,8 @@
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
+
   Serial.begin(115200);
   M5.Lcd.clear(BLACK);
   M5.Lcd.setTextColor(YELLOW);
diff --git a/examples/Unit/PaHUB/PaHUB.ino b/examples/Unit/PaHUB/PaHUB.ino
@@ -16,6 +16,8 @@ ClosedCube::Wired::TCA9548A tca9548a;
 void setup()
 {
 	M5.begin();
+	M5.Power.begin();
+
     Wire.begin();
 	M5.Lcd.fillScreen(TFT_BLACK); 
     tca9548a.address(PaHub_I2C_ADDRESS);
diff --git a/examples/Unit/PbHUB/PbHUB.ino b/examples/Unit/PbHUB/PbHUB.ino
@@ -10,6 +10,7 @@ uint8_t HUB_ADDR[6]={HUB1_ADDR,HUB2_ADDR,HUB3_ADDR,HUB4_ADDR,HUB5_ADDR,HUB6_ADDR
 
 void setup() {
     M5.begin(true, false, true);
+  	M5.Power.begin();
     porthub.begin();
     M5.Lcd.clear(BLACK);
     M5.Lcd.setTextColor(WHITE);
diff --git a/examples/Unit/RFID/RFID.ino b/examples/Unit/RFID/RFID.ino
@@ -7,6 +7,7 @@ MFRC522 mfrc522(0x28);   // Create MFRC522 instance.
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
   M5.Lcd.fillScreen( BLACK );
   M5.Lcd.setCursor(0, 0);
   M5.Lcd.setTextColor(YELLOW);  
diff --git a/examples/Unit/RGB/RGB.ino b/examples/Unit/RGB/RGB.ino
@@ -22,6 +22,8 @@ int delayval = 150; // delay for half a second
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
+
   pixels.begin(); // This initializes the NeoPixel library.
   M5.Lcd.setTextFont(4);
   M5.Lcd.setCursor(70, 100, 4);
diff --git a/examples/Unit/RS485/RS485_A/RS485_A.ino b/examples/Unit/RS485/RS485_A/RS485_A.ino
@@ -22,6 +22,7 @@ void header(const char *string, uint16_t color){
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
 
   header("RS485 A", TFT_BLACK);
   M5.Lcd.setTextFont(2);
diff --git a/examples/Unit/RS485/RS485_B/RS485_B.ino b/examples/Unit/RS485/RS485_B/RS485_B.ino
@@ -21,6 +21,7 @@ void header(const char *string, uint16_t color){
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
 
   header("RS485 B", TFT_BLACK);
   M5.Lcd.setTextFont(2);
diff --git a/examples/Unit/Relay/Relay.ino b/examples/Unit/Relay/Relay.ino
@@ -2,6 +2,7 @@
 
 void setup() {
   M5.begin();
+  M5.Power.begin();
   M5.Lcd.clear(BLACK);
   M5.Lcd.setTextFont(4);
   M5.Lcd.setTextColor(YELLOW, BLACK);
diff --git a/examples/Unit/TOF_VL53L0X/TOF_VL53L0X.ino b/examples/Unit/TOF_VL53L0X/TOF_VL53L0X.ino
@@ -25,6 +25,7 @@ void setup() {
 
   //---osmar
   M5.begin();
+  M5.Power.begin();
   M5.Lcd.fillScreen(BLACK);
   M5.Lcd.setTextColor(YELLOW);
   M5.Lcd.setCursor(50, 0, 4);
diff --git a/examples/Unit/TRACE/TRACE.ino b/examples/Unit/TRACE/TRACE.ino
@@ -7,6 +7,8 @@ int SensorArray[4] = {0};
 
 void setup() {
     m5.begin();
+    M5.Power.begin();
+
     Serial.begin(115200);
     Wire.begin();
     M5.Lcd.clear(BLACK);
diff --git a/examples/Unit/USB/USB.ino b/examples/Unit/USB/USB.ino
@@ -63,6 +63,8 @@ void Mouse_Pointer(int PotDataX,int PotDataY)
 void setup()
 {
   M5.begin();
+  M5.Power.begin();
+
   Serial.println("M5USB_Demo Start...");
 
   if (Usb.Init() == -1)
diff --git a/examples/Unit/WEIGHT/WEIGHT.ino b/examples/Unit/WEIGHT/WEIGHT.ino
diff --git a/src/utility/Power.cpp b/src/utility/Power.cpp
diff --git a/src/utility/Power.h b/src/utility/Power.h

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ ADS1100 ads;`
`11`	`11`	`void setup(void)`
`12`	`12`	`{`
`13`	`13`	`M5.begin(true, false, false);`
	`14`	`+ M5.Power.begin();`
`14`	`15`	`Serial.begin(115200);`
`15`		`-`
`16`	`16`	`M5.Lcd.fillScreen(BLACK);`
`17`	`17`	`M5.Lcd.setTextColor(ORANGE);`
`18`	`18`