@@ -36,6 +36,8 @@

 #include <EEPROM.h>

 #define EEPROM_SIZE 1 // To save BeaconType upon restart

+//#define DISABLE_BT //For Battery charging test

+

 BLEAdvertising *pAdvertising;

 void setBeacon() {

@@ -86,10 +88,10 @@ void setup() {

   #ifdef _M5STICKC_H_

   M5.begin();

   M5.Lcd.setRotation(3);

-  double BatteryOrUSB   = M5.Axp.GetIusbinData() * 0.375;

-  backlight_level=15;

+  double BatteryOrUSB = M5.Axp.GetIusbinData();

+  backlight_level = DEFAULT_BACKLIGHT;

   if(0 == BatteryOrUSB) {

-    backlight_level=7;//Minimum backlight

+    backlight_level = MIN_BACKLIGHT;//Minimum backlight

   }

   M5.Axp.ScreenBreath(backlight_level);

   #endif //_M5STICKC_H_

@@ -160,12 +162,17 @@ void setup() {

   } 

   // Create the BLE Device

+  #ifndef DISABLE_BT

   BLEDevice::init(BEACON_NAME);

+  #endif //DISABLE_BT

 }

 void loop() {

   Serial.println("DeviceAddress: "+String(macStr));

+  beacon_count++;

+

+  #ifndef DISABLE_BT

   // Create the BLE Server

   pAdvertising = BLEDevice::getAdvertising();

   BLEDevice::startAdvertising();

@@ -173,7 +180,6 @@ void loop() {

   // Start advertising

   pAdvertising->addServiceUUID(BLEUUID(BEACON_SERVICE_UUID));

-  beacon_count++;

   ad_running = 1;

   DisplayButtonStatus();

   pAdvertising->start();

@@ -183,9 +189,16 @@ void loop() {

   ad_running = 0;

   DisplayButtonStatus();

   Serial.println("Advertizing stopped.");

+  #else

+  DisplayButtonStatus();

+  #endif //DISABLE_BT

   //PRG Button

   pollPrg();

+  #ifndef DISABLE_BT

   delay(BEACON_SLEEP_ADV);

+  #else

+  delay(5*BEACON_SLEEP_ADV);

+  #endif //DISABLE_BT

 }

@@ -14,11 +14,21 @@

 #else

   #define LINE6 60 //M5Only

   #define LINEBOTTOM 72

+  //Battery see : http://community.m5stack.com/topic/1361/ischarging-and-getbatterylevel/5

+  //#define VMAX 3500.0f //

+  #define VMAX 3900.0f // Observed Maximum: 3943.5 after 7h charge

+  #define VMIN 2973.0f // Observed Minimum: 2973.0

+  #define COLUMN_BAT 80

 #endif //_M5STICKC_H_  

 //-----------------------------------------------------------------------------------

 #ifdef _M5STICKC_H_

-uint8_t backlight_level = 15; //15 High Luminosity, 7 lowest luminosity

+//uint8_t backlight_level = 15; //15 High Luminosity, 7 lowest luminosity

+#define MIN_BACKLIGHT 7

+#define MID_BACKLIGHT 11

+#define MAX_BACKLIGHT 15

+#define DEFAULT_BACKLIGHT MID_BACKLIGHT

+uint8_t backlight_level = DEFAULT_BACKLIGHT; //15 High Luminosity, 7 lowest luminosity

 #endif //_M5STICKC_H_

 //-----------------------------------------------------------------------------------

@@ -30,11 +40,20 @@ char macStr[18] = "";

 int ad_running = 0;

 uint32_t beacon_count = 0;

+#ifdef _M5STICKC_H_

+float getBatteryLevel(void)

+{

+  uint16_t vbatData = M5.Axp.GetVbatData();

+  float vbat = vbatData * 1.1;

+  //return 100.0 * ((vbat - 3000) / (4070 - 3000));

+  return 100.0 * ((vbat - VMIN) / (VMAX - VMIN));

+}

+#endif //_M5STICKC_H_

 //---------------------------------------------------------------------

 void DisplayButtonStatus() {

   #ifdef _HELTEC_H_

   Heltec.display->clear();

-  Heltec.display->drawString(0, LINE1, "MAC: "+String(macStr));

+  Heltec.display->drawString(0, LINE1, "BT: "+String(macStr));

   Heltec.display->drawString(0, LINE2, "I : "+String(instanceStr));

   Heltec.display->drawString(0, LINE4, beaconTypeStr);

   Heltec.display->drawString(0, LINEBOTTOM, "Cnt: "+String(beacon_count));

@@ -46,16 +65,30 @@ void DisplayButtonStatus() {

   #endif //_HELTEC_H_

   #ifdef _M5STICKC_H_

   //M5.Lcd.fillScreen(BLACK);

-  M5.Lcd.setCursor(0, LINE1, 1);M5.Lcd.setTextColor(WHITE, BLACK);  M5.Lcd.println("MAC: "+String(macStr));

-  M5.Lcd.setCursor(0, LINE2, 1);M5.Lcd.setTextColor(WHITE, BLACK);  M5.Lcd.println("I : "+String(instanceStr));

+  M5.Lcd.setTextColor(0x7bef, BLACK);

+  M5.Lcd.setCursor(0, LINE1, 1);M5.Lcd.println("BT: "+String(macStr));

+  M5.Lcd.setCursor(0, LINE2, 1);M5.Lcd.println("I : "+String(instanceStr));

   M5.Lcd.setCursor(0, LINE4, 1);M5.Lcd.setTextColor(GREEN, BLACK);  M5.Lcd.println(beaconTypeStr);

-  M5.Lcd.setCursor(0, LINE6, 1);M5.Lcd.setTextColor(BLUE, BLACK);  M5.Lcd.println( "Cnt: "+String(beacon_count));

-  String running="X";

+  M5.Lcd.setCursor(0, LINE6, 1);M5.Lcd.setTextColor(0x7bef, BLACK);  M5.Lcd.println( "Cnt: "+String(beacon_count));

   if( 1 == ad_running ) {

     M5.Lcd.setCursor(150, LINEBOTTOM, 1);M5.Lcd.setTextColor(WHITE, GREEN); M5.Lcd.println(String("X"));

   } else {

-    M5.Lcd.fillRect(150, LINEBOTTOM, 10, 10, BLACK);

+    M5.Lcd.fillRect(150, LINEBOTTOM, 160, 10, BLACK);

   }

+  float BatteryValue    = M5.Axp.GetVbatData() * 1.1;// mV

+  float BatteryPercent  = 100*(BatteryValue-VMIN)/ (VMAX-VMIN);

+  float BatteryLevel = getBatteryLevel();

+  if( BatteryPercent > 100 ) BatteryPercent = 100;

+  M5.Lcd.setTextColor(0x7bef, BLACK);

+  M5.Lcd.setCursor(0, LINEBOTTOM, 1);

+  M5.Lcd.fillRect(0, LINEBOTTOM, 50, 10, BLACK);

+  M5.Lcd.fillRect(COLUMN_BAT, LINEBOTTOM, 60, 10, BLACK);

+  M5.Lcd.printf("%.1fmV",BatteryValue);

+  if( BatteryPercent <= 80 ) { M5.Lcd.setCursor(COLUMN_BAT, LINEBOTTOM, 1);M5.Lcd.setTextColor(0x7bef, BLACK);M5.Lcd.printf("%.0f%%",BatteryPercent); }

+  else if( BatteryPercent > 80 ) { M5.Lcd.setCursor(COLUMN_BAT, LINEBOTTOM, 1);M5.Lcd.setTextColor(0x7bef, BLACK);M5.Lcd.printf("%.1f%%",BatteryPercent); }

+  else if( BatteryPercent > 90 ) { M5.Lcd.setCursor(COLUMN_BAT, LINEBOTTOM, 1);M5.Lcd.setTextColor(0x7bef, BLACK);M5.Lcd.printf("%.2f%%",BatteryPercent); }

+  else if( BatteryPercent > 95 ) { M5.Lcd.setCursor(COLUMN_BAT, LINEBOTTOM, 1);M5.Lcd.setTextColor(0x7bef, BLACK);M5.Lcd.printf("%.3f%%",BatteryPercent); }

+  Serial.println(BatteryValue);

   #endif //_M5STICKC_H_

 }

 #endif //_DISPLAY_H