Diff: main.cpp

Revision:

34:5876fbb1aa62

Parent:

33:8c65879e7d52

Child:

36:ccb188bcfef1

--- a/main.cpp	Mon Jul 27 21:44:07 2015 +0000
+++ b/main.cpp	Wed Sep 02 20:17:38 2015 +0000
@@ -17,8 +17,7 @@
 #include "mbed.h"
 #include "BLE.h"
 #include "EddystoneConfigService.h"
-#include "DFUService.h"
-#include "DeviceInformationService.h"
+
 #include "ConfigParamsPersistence.h"
 
 BLE ble;
@@ -80,16 +79,12 @@
     
     /* Initialize a EddystoneBeaconConfig service providing config params, default URI, and power levels. */
     static EddystoneConfigService::PowerLevels_t defaultAdvPowerLevels = {-20, -4, 0, 10}; // Values for ADV packets related to firmware levels
-    EddystoneBeaconConfig = new EddystoneConfigService(ble, params, !fetchedFromPersistentStorage, "http://mbed.org", uidNamespaceID, uidInstanceID,tlmVersion, defaultAdvPowerLevels);
+    EddystoneBeaconConfig = new EddystoneConfigService(ble, params, !fetchedFromPersistentStorage, defaultAdvPowerLevels, "http://mbed.org", &uidNamespaceID, &uidInstanceID, tlmVersion);
     if (!EddystoneBeaconConfig->configuredSuccessfully()) {
         error("failed to accommodate URI");
     }
     configAdvertisementTimeout.attach(timeout, CONFIG_ADVERTISEMENT_TIMEOUT_SECONDS);
 
-    // Setup auxiliary services to allow over-the-air firmware updates, etc
-    DFUService dfu(ble);
-    DeviceInformationService deviceInfo(ble, "ARM", "UriBeacon", "SN1", "hw-rev1", "fw-rev1", "soft-rev1");
-
     ble.gap().startAdvertising(); /* Set the whole thing in motion. After this call a GAP central can scan the EddystoneBeaconConfig
                                    * service. This can then be switched to the normal URIBeacon functionality after a timeout. */
     printf("Running...\r\n");