Merge pull request #4 from lovyan03/unstable

Update: v0.2.0

Author: lovyan03

LovyanLauncher/LovyanLauncher.ino

@@ -61,7 +61,7 @@ void drawFrame() {
   M5.Lcd.setTextFont(0);
   M5.Lcd.setTextColor(0x8410,0);
   M5.Lcd.drawString("- LovyanLauncher -", 207, 191, 1);
-  M5.Lcd.drawString("@lovyan03    v0.1.9", 204, 201, 1);
+  M5.Lcd.drawString("@lovyan03    v0.2.0", 204, 201, 1);
   M5.Lcd.drawString("http://git.io/fhdJV", 204, 211, 1);
 }
 

LovyanLauncher/build/LovyanLauncher.bin

@@ -13,7 +13,7 @@ class I2CRegistry
     menuItem = mi;
     treeView = ((M5TreeView*)(mi->topItem()));
     M5.Lcd.fillScreen(0);
-    btnDrawer.setText("Back","","");
+    btnDrawer.setText("Back","Mode","Mode");
     btnDrawer.draw(true);
     if (setup()) {
       while (loop());
@@ -42,25 +42,38 @@ class I2CRegistry
       M5.Lcd.setCursor(20+i*19, 30);
       M5.Lcd.printf("x%01X", i);
     }
+    step = 0;
+
     return true;
   }
 
   bool loop()
   {
     M5.update();
     if (M5.BtnA.wasReleased()) return false;
-
+    if (M5.BtnB.wasReleased() || M5.BtnC.wasReleased() || step == 0) {
+      step = M5.BtnB.wasReleased() ? step << 1 : step >> 1;
+      if (step == 0) step = 16;
+      else if (step >= 32) step = 1;
+      M5.Lcd.setTextFont(2);
+      M5.Lcd.setTextSize(1);
+      M5.Lcd.setCursor(32, 160);
+      M5.Lcd.setTextColor(0xFFFF, 0);
+      M5.Lcd.printf("%2d Byte read mode ", step);
+    }
     Header.draw();
     btnDrawer.draw();
 
     M5.Lcd.setTextFont(1);
     M5.Lcd.setTextSize(1);
+    bool enabled;
     for (byte row = 0; row < regMax/16; ++row) {
-      Wire.beginTransmission(addr);
-      Wire.write(row * 16);
-      bool enabled = (Wire.endTransmission(false) == 0 && Wire.requestFrom(addr, (uint8_t)16));
-
       for (byte col = 0; col < 16; ++col) {
+        if ((col % step) == 0) {
+          Wire.beginTransmission(addr);
+          Wire.write(row * 16 + col);
+          enabled = (Wire.endTransmission(false) == 0 && Wire.requestFrom(addr, (uint8_t)(step ? step:16)));
+        }
         int reg = col + row * 16;
         int x = 20 + col * 19;
         int y = 42 + row * 14;
@@ -89,6 +102,7 @@ class I2CRegistry
   M5ButtonDrawer btnDrawer;
   M5TreeView* treeView;
   MenuItem* menuItem;
+  uint8_t step = 0;
 
   virtual String getTitle() {
     return "I2C 0x" + String(addr,HEX) + " REGISTRY ";

LovyanLauncher/src/I2CRegistry.h

@@ -42,7 +42,7 @@ class I2CScanner : public MenuCallBack
       if (exist) ex.push_back(adr);
       uint16_t color = exist ? 0xFFFF : 0x39E7;
       M5.Lcd.setTextColor(color, 0);
-      if (_addr == adr) {
+      if (exist && _addr == adr) {
         color = 0x421F;
       }
       M5.Lcd.drawRect(x,y,19,19, color);

LovyanLauncher/src/I2CScanner.h

@@ -10,6 +10,8 @@ class SystemInfo : public MenuCallBack
 public:
   bool setup()
   {
+    lcd_version = lcd_ver();
+    M5.Lcd.begin();
     btnDrawer.setText(1, "Page");
     btnDrawer.setText(2, "Page");
     page = 0;
@@ -29,6 +31,7 @@ class SystemInfo : public MenuCallBack
   }
 
 private:
+  bool lcd_version;
   int page;
   const int pageCount = 2;
   void title(const char* title) {
@@ -71,11 +74,13 @@ class SystemInfo : public MenuCallBack
       print("Flash Frequency", "%3d MHz", ESP.getFlashChipSpeed() / 1000000);
       print("Flash Chip Size", "%d Byte", ESP.getFlashChipSize());
       print("ESP-IDF version", "%s",    esp_get_idf_version());
+      print("LCD Type",        "%s",    lcd_version ? "IPS" : "TN");
+      print("IMU Type",        "%s",    get_imu_type().c_str());
 
       title("Mac Address");
       uint8_t mac[6];
       esp_base_mac_addr_get(mac);            print("Base Mac Address");printMac(mac);
-      esp_efuse_mac_get_default(mac);        print("Default");printMac(mac);
+      //esp_efuse_mac_get_default(mac);        print("Default");printMac(mac);
       esp_read_mac(mac, ESP_MAC_WIFI_STA);   print("Wi-Fi Station");printMac(mac);
       esp_read_mac(mac, ESP_MAC_WIFI_SOFTAP);print("Wi-Fi Soft AP");printMac(mac);
       esp_read_mac(mac, ESP_MAC_BT);         print("Bluetooth");printMac(mac);
@@ -107,6 +112,45 @@ class SystemInfo : public MenuCallBack
   void printMac(uint8_t* mac) {
     M5.Lcd.printf("%02X:%02X:%02X:%02X:%02X:%02X\r\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
   }
+
+  bool lcd_ver() const {
+    bool res = 0;
+    pinMode(TFT_RST, INPUT_PULLDOWN);
+    delay(1);
+    if (digitalRead(TFT_RST)) {
+      res = 1;
+    } 
+    pinMode(TFT_RST, OUTPUT);
+    return res;
+  }
+
+  String get_imu_type() const {
+    String res;
+    uint8_t tmp;
+    if (M5.I2C.readByte(0x68, 0x75, &tmp)) {
+      switch (tmp) {
+      case 0x19: res = "MPU-6886"; break;
+      case 0x68: res = "MPU-6050"; break;
+      case 0x71: res = "MPU-9250"; break;
+      default:   res = "MPU-????"; break;
+      }
+    } else if (M5.I2C.readByte(0x6C, 0x30, &tmp)) {
+      switch (tmp) {
+      case 0x18: res = "SH200Q";
+      default:   res = "SH????";
+      }
+    } else {
+      res = "not found";
+    }
+
+    if (M5.I2C.readByte(0x0E, 0x07, &tmp)) {
+      res += " + MAG3110";
+    }
+    if (M5.I2C.readByte(0x10, 0x40, &tmp)) {
+      res += " + BMM150";
+    }
+    return res;
+  }
 };
 
 #endif