Correct init once

Author: 0x1abin

src/M5Stack.cpp

@@ -3,51 +3,59 @@
 
 #include "M5Stack.h"
 
-void M5Stack::begin(bool LCDEnable, bool SDEnable) {
-    
-    // UART 
-    Serial.begin(115200);
-    Serial.flush();
-    Serial.print("M5Stack initializing...");
-
-    // I2C Startup BUG?
-    // pinMode(SCL, OUTPUT);
-    // digitalWrite(SCL, 1);
-
-    // TONE
-    Speaker.begin();
-
-    // Setup the button with an internal pull-up
-    pinMode(BUTTON_A_PIN, INPUT_PULLUP);
-    pinMode(BUTTON_B_PIN, INPUT_PULLUP);
-    pinMode(BUTTON_C_PIN, INPUT_PULLUP);
-
-    // M5 LCD INITs
-    if (LCDEnable) Lcd.begin();
-
-    // TF Card
-    if (SDEnable) SD.begin(TFCARD_CS_PIN, SPI, 40000000);
-    
-    // Set wakeup button
-    setWakeupButton(BUTTON_A_PIN);
-
-    // MPU9250
-    #ifdef MPU9250_INSDE
-    Wire.begin();
-    #endif
-
-    Serial.println("OK");
+M5Stack::M5Stack() : isInited(0) {
+
+}
+
+void M5Stack::begin(bool LCDEnable, bool SDEnable, bool SerialEnable) {
+
+	// Correct init once
+	if (isInited) return;
+	else isInited = true;
+
+	// UART
+	if (SerialEnable) {
+		Serial.begin(115200);
+		Serial.flush();
+		delay(50);
+		Serial.print("M5Stack initializing...");
+	}
+
+	// LCD INIT
+	if (LCDEnable) {
+		Lcd.begin();
+	}
+
+	// TF Card
+	if (SDEnable) {
+		SD.begin(TFCARD_CS_PIN, SPI, 40000000);
+	}
+
+	// TONE
+	Speaker.begin();
+
+	// Set wakeup button
+	setWakeupButton(BUTTON_A_PIN);
+
+	// I2C init
+	#ifdef M5STACK_FIRE
+	Wire.begin(21, 22);
+	#endif
+
+	if (SerialEnable) {
+		Serial.println("OK");
+	}
 }
 
 void M5Stack::update() {
 
-    //Button update
-    BtnA.read();
-    BtnB.read();
-    BtnC.read();
+	//Button update
+	BtnA.read();
+	BtnB.read();
+	BtnC.read();
 
-    //Speaker update
-    Speaker.update();
+	//Speaker update
+	Speaker.update();
 }
 
 #ifdef M5STACK_FIRE
@@ -59,52 +67,49 @@ void M5Stack::update() {
 
 void M5Stack::setPowerBoostKeepOn(bool en)
 {
-  Wire.beginTransmission(IP5306_ADDR);
-  Wire.write(IP5306_REG_SYS_CTL0);
-  if (en) Wire.write(0x37); // Set bit1: 1 enable 0 disable boost keep on
-  else Wire.write(0x35);    // 0x37 is default reg value
-  Wire.endTransmission();
+	Wire.beginTransmission(IP5306_ADDR);
+	Wire.write(IP5306_REG_SYS_CTL0);
+	if (en) Wire.write(0x37); // Set bit1: 1 enable 0 disable boost keep on
+	else Wire.write(0x35);    // 0x37 is default reg value
+	Wire.endTransmission();
 }
 
 uint8_t M5Stack::isChargeFull()
 {
-  uint8_t data;
-  Wire.beginTransmission(IP5306_ADDR);
-  Wire.write(IP5306_REG_READ1);
-  Wire.endTransmission(false);
-  Wire.requestFrom(IP5306_ADDR, 1);
-  data = Wire.read();
-  if (data & (1 << CHARGE_FULL_BIT)) return true;
-  else return false;
+	uint8_t data;
+	Wire.beginTransmission(IP5306_ADDR);
+	Wire.write(IP5306_REG_READ1);
+	Wire.endTransmission(false);
+	Wire.requestFrom(IP5306_ADDR, 1);
+	data = Wire.read();
+	if (data & (1 << CHARGE_FULL_BIT)) return true;
+	else return false;
 }
 #endif
 
 // ================== Low power mode =====================
 void M5Stack::setWakeupButton(uint8_t button) {
-    _wakeupPin = button;
+	_wakeupPin = button;
 }
 
 void M5Stack::powerOFF() {
 
-    #ifdef M5STACK_FIRE
-    // Keep power keep boost on
-    setPowerBoostKeepOn(true);
-    #endif
-
-    // power off the Lcd
-    Lcd.setBrightness(0);
-    Lcd.sleep();
-
-    // ESP32 into deep sleep
-    USE_SERIAL.printf("Enabling EXT0 wakeup on pins GPIO%d\n", _wakeupPin);
-    esp_sleep_enable_ext0_wakeup((gpio_num_t)_wakeupPin , LOW);
-    
-    while(digitalRead(_wakeupPin) == LOW) {
-        delay(10);
-    }
-    USE_SERIAL.println("On deep sleep mode.");
-    esp_deep_sleep_start();
-    USE_SERIAL.println("On power OFF fail!");
+	#ifdef M5STACK_FIRE
+	// Keep power keep boost on
+	setPowerBoostKeepOn(true);
+	#endif
+
+	// power off the Lcd
+	Lcd.setBrightness(0);
+	Lcd.sleep();
+
+	// ESP32 into deep sleep
+	esp_sleep_enable_ext0_wakeup((gpio_num_t)_wakeupPin , LOW);
+
+	while(digitalRead(_wakeupPin) == LOW) {
+		delay(10);
+	}
+	esp_deep_sleep_start();
 }
 
 

src/M5Stack.h

@@ -95,18 +95,14 @@
 #include "utility/Config.h"
 #include "utility/Button.h"
 #include "utility/Speaker.h"
-// #include "utility/M5Timer.h"
-
-#ifdef MPU9250_INSDE
-#include "utility/MPU9250.h"
-#include "utility/quaternionFilters.h"
-#endif
 
 
 class M5Stack {
 
  public:
-    void begin(bool LCDEnable=true, bool SDEnable=true);
+    M5Stack();
+
+    void begin(bool LCDEnable=true, bool SDEnable=true, bool SerialEnable=true);
     void update();
 
     #ifdef M5STACK_FIRE
@@ -139,6 +135,7 @@ class M5Stack {
 #endif
 
  private:
+    bool isInited;
     uint8_t _wakeupPin;
 };