Merge pull request #8 from sysdevmike/develop

Develop

.gitignore

@@ -0,0 +1 @@
+.DS_Store

firmware/HID.cpp

@@ -217,6 +217,7 @@ uint8_t const desc_hid_report[] =
 {
   TUD_HID_REPORT_DESC_KEYBOARD(),
 };
+
 Adafruit_USBD_HID usb_hid;
 
 void HID::begin(void) {
@@ -225,8 +226,8 @@ void HID::begin(void) {
   Bluefruit.setTxPower(0);
   Bluefruit.autoConnLed(false);
 
-  bleDIS.setManufacturer("TODO");
-  bleDIS.setModel("TODO");
+  bleDIS.setManufacturer("Bluetooth");
+  bleDIS.setModel("Bluetooth");
 
   bleDIS.begin();
   bleHID.begin();
@@ -247,6 +248,8 @@ void HID::begin(void) {
   usb_hid.setPollInterval(2);
   usb_hid.setReportDescriptor(desc_hid_report, sizeof(desc_hid_report));
   usb_hid.begin(); 
+  USBDevice.setProductDescriptor("Kinesis BLEx");
+  USBDevice.setManufacturerDescriptor("USB");
 }
 
 void HID::sendKeys(
@@ -300,13 +303,17 @@ void HID::sendKeys(
     }
   }
 
-  if (memcmp(&report, &oldReport, sizeof(report))) {        
-    if(usb_hid.ready()) {
-      usb_hid.sendReport(0, &report, sizeof(report));
-    } else {
-      bleHID.keyboardReport(&report);      
-    }
+  bool setReport = memcmp(&report, &oldReport, sizeof(report));
+  if(!setReport) {
+    return;
   }
+
+  if(usb_hid.ready()) {
+    usb_hid.sendReport(0, &report, sizeof(report));
+    return;
+  }
+
+  bleHID.keyboardReport(&report);      
 }
 
 bool HID::isUSB(void) {

firmware/Keyboard.cpp

@@ -1,4 +1,5 @@
 #include "Keyboard.h"
+#include "config.h"
 
 Keyboard::Keyboard(void)
 : matrix(), keymap(), hid(), power(), restTimer() {
@@ -26,9 +27,10 @@ void Keyboard::update(void) {
   led.process();
 
   #if REST_TIMER
-  restCheck();
+    restCheck();
   #endif
 
+
   sleepCheck();
 }
 

firmware/Power.cpp

@@ -22,7 +22,7 @@ int Power::VBATReading(void) {
   analogReference(AR_DEFAULT);
   analogReadResolution(10);
 
-  return raw;
+  return raw * MV_PER_LSB * VBAT_DIVIDER_COMP;
 }
 
 uint8_t Power::percentageFrom(float mvolts) {

firmware/Power.h

@@ -11,8 +11,8 @@ class Power {
 
   private:
     const float MV_PER_LSB = 0.73242188F;
-    const float VBAT_DIVIDER = 0.71275837F;
-    const float VBAT_DIVIDER_COMP = 1.403F;
+    const float VBAT_DIVIDER = 0.5F;
+    const float VBAT_DIVIDER_COMP = 2.0F;
     const uint8_t VBAT_PIN = A6;
     const uint8_t USB_PIN = A7;