Diff: HIDController_BLE.cpp

Revision:

59:2d6c0bff2151

Parent:

58:64df960619ce

Child:

60:b899414e1d34

--- a/HIDController_BLE.cpp	Tue Aug 30 14:44:24 2016 +0000
+++ b/HIDController_BLE.cpp	Wed Aug 31 12:31:14 2016 +0000
@@ -8,6 +8,7 @@
 #include "DFUService.h"
 #include "HIDController_BLE.h"
 
+static const char MANUFACTURERERS_NAME[] = "lowreal.net";
 static const char MODEL_NAME[] = "keble";
 static const char SERIAL_NUMBER[] = "X00000";
 static const char HARDWARE_REVISION[] = "0.1";
@@ -15,7 +16,6 @@
 static const char SOFTWARE_REVISION[] = "0.0";
 
 static const uint8_t DEVICE_NAME[] = "Keble";
-// static const uint8_t SHORT_DEVICE_NAME[] = "Keble";
 
 static const bool ENABLE_BONDING = true;
 static const bool REQUIRE_MITM = true;
@@ -32,6 +32,7 @@
 static DeviceInformationService* deviceInformationService;
 // static DFUService* dfuService;
 
+
 static BLEProtocol::Address_t peerAddress;
 
 static volatile Status_t controllerStatus;
@@ -131,7 +132,7 @@
 	// DEBUG_PRINTF_BLE("new KeyboardService\r\n");
 	keyboardService = new KeyboardService(ble);
 	// DEBUG_PRINTF_BLE("new DeviceInformationService\r\n");
-	deviceInformationService = new DeviceInformationService(ble, "lowreal.net", MODEL_NAME, SERIAL_NUMBER, HARDWARE_REVISION, FIRMWARE_REVISION, SOFTWARE_REVISION);
+	deviceInformationService = new DeviceInformationService(ble, MANUFACTURERERS_NAME, MODEL_NAME, SERIAL_NUMBER, HARDWARE_REVISION, FIRMWARE_REVISION, SOFTWARE_REVISION);
 	// DEBUG_PRINTF_BLE("new BatteryService\r\n");
 	batteryService = new BatteryService(ble, 100);
 	/** TODO
@@ -215,12 +216,12 @@
 }
 
 const char* HIDController::statusString() {
-	static const char* disconnected = "disconnected";
-	static const char* connecting = "connecting";
-	static const char* connected = "connected";
-	static const char* timeout = "timeout";
-	static const char* advertising = "advertising";
-	static const char* unknown = "unknown";
+	static const char* const disconnected = "disconnected";
+	static const char* const connecting = "connecting";
+	static const char* const connected = "connected";
+	static const char* const timeout = "timeout";
+	static const char* const advertising = "advertising";
+	static const char* const unknown = "unknown";
 
 	return controllerStatus == DISCONNECTED ? disconnected:
 	       controllerStatus == CONNECTING ? connecting: