Put a bit of order in the src directory, group and name things appropriately

src/detect/axpDebug.h

@@ -0,0 +1,19 @@
+#if 0
+// Turn off for now
+uint32_t axpDebugRead()
+{
+  axp.debugCharging();
+  DEBUG_MSG("vbus current %f\n", axp.getVbusCurrent());
+  DEBUG_MSG("charge current %f\n", axp.getBattChargeCurrent());
+  DEBUG_MSG("bat voltage %f\n", axp.getBattVoltage());
+  DEBUG_MSG("batt pct %d\n", axp.getBattPercentage());
+  DEBUG_MSG("is battery connected %d\n", axp.isBatteryConnect());
+  DEBUG_MSG("is USB connected %d\n", axp.isVBUSPlug());
+  DEBUG_MSG("is charging %d\n", axp.isChargeing());
+
+  return 30 * 1000;
+}
+
+Periodic axpDebugOutput(axpDebugRead);
+axpDebugOutput.setup();
+#endif

src/detect/einkScan.h

@@ -0,0 +1,60 @@
+#include "../configuration.h"
+
+#ifdef RAK4630
+#include "../main.h"
+#include <SPI.h>
+
+void d_writeCommand(uint8_t c)
+{
+  SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
+  if (PIN_EINK_DC >= 0) digitalWrite(PIN_EINK_DC, LOW);
+  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, LOW);
+  SPI1.transfer(c);
+  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, HIGH);
+  if (PIN_EINK_DC >= 0) digitalWrite(PIN_EINK_DC, HIGH);
+  SPI1.endTransaction();
+}
+
+void d_writeData(uint8_t d)
+{
+  SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
+  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, LOW);
+  SPI1.transfer(d);
+  if (PIN_EINK_CS >= 0) digitalWrite(PIN_EINK_CS, HIGH);
+  SPI1.endTransaction();
+}
+
+unsigned long d_waitWhileBusy(uint16_t busy_time)
+{
+  if (PIN_EINK_BUSY >= 0)
+  {
+    delay(1); // add some margin to become active
+    unsigned long start = micros();
+    while (1)
+    {
+      if (digitalRead(PIN_EINK_BUSY) != HIGH) break;
+      delay(1);
+      if (digitalRead(PIN_EINK_BUSY) != HIGH) break;
+      if (micros() - start > 10000000) break;
+    }
+    unsigned long elapsed = micros() - start;
+    (void) start;
+    return elapsed;
+  }
+  else return busy_time;
+}
+
+void scanEInkDevice(void)
+{
+    SPI1.begin();
+    d_writeCommand(0x22);
+    d_writeData(0x83);
+    d_writeCommand(0x20);
+    eink_found = (d_waitWhileBusy(150) > 0) ? true : false;
+    if(eink_found)
+       DEBUG_MSG("EInk display found\n");
+    else
+       DEBUG_MSG("EInk display not found\n");
+    SPI1.end();
+}
+#endif

src/detect/i2cScan.h

@@ -0,0 +1,163 @@
+#include "../configuration.h"
+#include "../main.h"
+#include <Wire.h>
+#include "mesh/generated/telemetry.pb.h"
+
+#ifdef HAS_AXP192
+#include "axp20x.h"
+#endif
+
+#if HAS_WIRE
+uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
+    uint16_t value = 0x00;
+    Wire.beginTransmission(address);
+    Wire.write(reg);
+    Wire.endTransmission();
+    delay(20);
+    Wire.requestFrom(address, length);
+    DEBUG_MSG("Wire.available() = %d\n", Wire.available());
+    if (Wire.available() == 2) {
+        // Read MSB, then LSB
+        value = (uint16_t)Wire.read() << 8;  
+        value |= Wire.read();
+    } else if (Wire.available()) {
+        value = Wire.read();
+    }
+    return value;
+}
+
+uint8_t oled_probe(byte addr)
+{
+    uint8_t r = 0;
+    uint8_t r_prev = 0;
+    uint8_t c = 0;
+    uint8_t o_probe = 0;
+    do {
+        r_prev = r;
+        Wire.beginTransmission(addr);
+        Wire.write(0x00);
+        Wire.endTransmission();
+        Wire.requestFrom((int)addr, 1);
+        if (Wire.available()) {
+            r = Wire.read();
+        }
+        r &= 0x0f;
+
+        if (r == 0x08 || r == 0x00) {
+            o_probe = 2; // SH1106
+        } else if ( r == 0x03 || r == 0x06 || r == 0x07) {
+            o_probe = 1; // SSD1306
+        }
+        c++;
+    } while ((r != r_prev) && (c < 4));
+    DEBUG_MSG("0x%x subtype probed in %i tries \n", r, c);
+    return o_probe;
+}
+
+void scanI2Cdevice(void)
+{
+    byte err, addr;
+    uint16_t registerValue = 0x00;
+    int nDevices = 0;
+    for (addr = 1; addr < 127; addr++) {
+        Wire.beginTransmission(addr);
+        err = Wire.endTransmission();
+        if (err == 0) {
+            DEBUG_MSG("I2C device found at address 0x%x\n", addr);
+
+            nDevices++;
+
+            if (addr == SSD1306_ADDRESS) {
+                screen_found = addr;
+                screen_model = oled_probe(addr);
+                if (screen_model == 1){
+                    DEBUG_MSG("ssd1306 display found\n");
+                } else if (screen_model == 2){
+                    DEBUG_MSG("sh1106 display found\n");
+                } else {
+                    DEBUG_MSG("unknown display found\n");
+                }
+            }
+#ifdef RV3028_RTC
+            if (addr == RV3028_RTC){
+                rtc_found = addr;
+                DEBUG_MSG("RV3028 RTC found\n");
+                Melopero_RV3028 rtc;
+                rtc.initI2C();
+                rtc.writeToRegister(0x35,0x07); // no Clkout
+                rtc.writeToRegister(0x37,0xB4);
+            }
+#endif
+#ifdef PCF8563_RTC
+            if (addr == PCF8563_RTC){
+                rtc_found = addr;
+                DEBUG_MSG("PCF8563 RTC found\n");
+            }
+#endif
+            if (addr == CARDKB_ADDR) {
+                cardkb_found = addr;
+                // Do we have the RAK14006 instead?
+                registerValue = getRegisterValue(addr, 0x04, 1);
+                if (registerValue == 0x02) { // KEYPAD_VERSION
+                    DEBUG_MSG("RAK14004 found\n");
+                    kb_model = 0x02;
+                } else {
+                    DEBUG_MSG("m5 cardKB found\n");
+                    kb_model = 0x00;
+                }
+            }
+            if (addr == FACESKB_ADDR) {
+                faceskb_found = addr;
+                DEBUG_MSG("m5 Faces found\n");
+            }
+            if (addr == ST7567_ADDRESS) {
+                screen_found = addr;
+                DEBUG_MSG("st7567 display found\n");
+            }
+#ifdef HAS_AXP192
+            if (addr == AXP192_SLAVE_ADDRESS) {
+                axp192_found = true;
+                DEBUG_MSG("axp192 PMU found\n");
+            }
+#endif
+        if (addr == BME_ADDR || addr == BME_ADDR_ALTERNATE) {
+            registerValue = getRegisterValue(addr, 0xD0, 1); // GET_ID
+            if (registerValue == 0x61) {
+                DEBUG_MSG("BME-680 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_BME680] = addr;
+            } else if (registerValue == 0x60) {
+                DEBUG_MSG("BME-280 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_BME280] = addr;
+            } else {
+                DEBUG_MSG("BMP-280 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_BMP280] = addr;
+            }
+        }
+        if (addr == INA_ADDR || addr == INA_ADDR_ALTERNATE) {
+            registerValue = getRegisterValue(addr, 0xFE, 2);
+            DEBUG_MSG("Register MFG_UID: 0x%x\n", registerValue);
+            if (registerValue == 0x5449) {
+                DEBUG_MSG("INA260 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_INA260] = addr;
+            } else { // Assume INA219 if INA260 ID is not found
+                DEBUG_MSG("INA219 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_INA219] = addr;
+            }
+        }
+        if (addr == MCP9808_ADDR) {
+            nodeTelemetrySensorsMap[TelemetrySensorType_MCP9808] = addr;
+            DEBUG_MSG("MCP9808 sensor found at address 0x%x\n", (uint8_t)addr);
+        }
+        } else if (err == 4) {
+            DEBUG_MSG("Unknow error at address 0x%x\n", addr);
+        }
+    }
+
+    if (nDevices == 0)
+        DEBUG_MSG("No I2C devices found\n");
+    else
+        DEBUG_MSG("%i I2C devices found\n",nDevices);
+}
+#else
+void scanI2Cdevice(void) {}
+#endif