Massive bluetooth name refactoring, potentially to help with #1445

gfwilliams · gfwilliams · commit 5d76771c117e · 2018-09-03T17:07:23.000+01:00
diff --git a/libs/bluetooth/bluetooth.h b/libs/bluetooth/bluetooth.h
@@ -78,7 +78,7 @@ typedef struct {
 
 typedef enum  {
   BLE_NONE = 0,
-  BLE_IS_SENDING = 1,         //< sending data with jswrap_nrf_transmit_string?
+  BLE_IS_SENDING = 1,         //< sending data with jswrap_ble_transmit_string?
   BLE_IS_SCANNING = 2,        //< scanning for BLE devices?
   BLE_IS_ADVERTISING = 4,     //< currently advertising info? stops when connected
   BLE_NEEDS_SOFTDEVICE_RESTART = 8,  //< We need to reset the services we're reporting, but we can't because we're connected
diff --git a/libs/bluetooth/jswrap_bluetooth.c b/libs/bluetooth/jswrap_bluetooth.c
diff --git a/libs/bluetooth/jswrap_bluetooth.h b/libs/bluetooth/jswrap_bluetooth.h
@@ -51,58 +51,58 @@ JsVar *bleGetActiveBluetoothGattServer();
 #endif
 
 // ------------------------------------------------------------------------------
-void jswrap_nrf_init();
-bool jswrap_nrf_idle();
-void jswrap_nrf_kill();
+void jswrap_ble_init();
+bool jswrap_ble_idle();
+void jswrap_ble_kill();
 // Used to dump bluetooth initialisation info for 'dump'
-void jswrap_nrf_dumpBluetoothInitialisation(vcbprintf_callback user_callback, void *user_data);
+void jswrap_ble_dumpBluetoothInitialisation(vcbprintf_callback user_callback, void *user_data);
 /** Reconfigure the softdevice (on init or after restart) to have all the services/advertising we need */
-void jswrap_nrf_reconfigure_softdevice();
+void jswrap_ble_reconfigure_softdevice();
 // ------------------------------------------------------------------------------
 
 
-void jswrap_nrf_bluetooth_disconnect();
-void jswrap_nrf_bluetooth_sleep();
-void jswrap_nrf_bluetooth_wake();
-void jswrap_nrf_bluetooth_restart();
-JsVar *jswrap_nrf_bluetooth_getAddress();
-void jswrap_nrf_bluetooth_setAddress(JsVar *address);
+void jswrap_ble_disconnect();
+void jswrap_ble_sleep();
+void jswrap_ble_wake();
+void jswrap_ble_restart();
+JsVar *jswrap_ble_getAddress();
+void jswrap_ble_setAddress(JsVar *address);
 
-JsVarFloat jswrap_nrf_bluetooth_getBattery();
-void jswrap_nrf_bluetooth_setAdvertising(JsVar *data, JsVar *options);
-JsVar *jswrap_nrf_bluetooth_getAdvertisingData(JsVar *data, JsVar *options);
-void jswrap_nrf_bluetooth_setScanResponse(JsVar *data);
-void jswrap_nrf_bluetooth_setServices(JsVar *data, JsVar *options);
-void jswrap_nrf_bluetooth_updateServices(JsVar *data);
-void jswrap_nrf_bluetooth_setScan(JsVar *callback, JsVar *options);
-void jswrap_nrf_bluetooth_findDevices(JsVar *callback, JsVar *options);
-void jswrap_nrf_bluetooth_setRSSIHandler(JsVar *callback);
-void jswrap_nrf_bluetooth_setTxPower(JsVarInt pwr);
-void jswrap_nrf_bluetooth_setLowPowerConnection(bool lowPower);
+JsVarFloat jswrap_ble_getBattery();
+void jswrap_ble_setAdvertising(JsVar *data, JsVar *options);
+JsVar *jswrap_ble_getAdvertisingData(JsVar *data, JsVar *options);
+void jswrap_ble_setScanResponse(JsVar *data);
+void jswrap_ble_setServices(JsVar *data, JsVar *options);
+void jswrap_ble_updateServices(JsVar *data);
+void jswrap_ble_setScan(JsVar *callback, JsVar *options);
+void jswrap_ble_findDevices(JsVar *callback, JsVar *options);
+void jswrap_ble_setRSSIHandler(JsVar *callback);
+void jswrap_ble_setTxPower(JsVarInt pwr);
+void jswrap_ble_setLowPowerConnection(bool lowPower);
 
-void jswrap_nrf_nfcURL(JsVar *url);
-void jswrap_nrf_nfcRaw(JsVar *payload);
-JsVar *jswrap_nrf_nfcStart(JsVar *payload);
-void jswrap_nrf_nfcStop();
-void jswrap_nrf_nfcSend(JsVar *payload);
-void jswrap_nrf_sendHIDReport(JsVar *data, JsVar *callback);
+void jswrap_nfc_URL(JsVar *url);
+void jswrap_nfc_raw(JsVar *payload);
+JsVar *jswrap_nfc_start(JsVar *payload);
+void jswrap_nfc_stop();
+void jswrap_nfc_send(JsVar *payload);
+void jswrap_ble_sendHIDReport(JsVar *data, JsVar *callback);
 
-JsVar *jswrap_nrf_bluetooth_requestDevice(JsVar *options);
-JsVar *jswrap_nrf_bluetooth_connect(JsVar *mac, JsVar *options);
-void jswrap_nrf_setWhitelist(bool whitelist);
-void jswrap_nrf_setConnectionInterval(JsVar *interval);
+JsVar *jswrap_ble_requestDevice(JsVar *options);
+JsVar *jswrap_ble_connect(JsVar *mac, JsVar *options);
+void jswrap_ble_setWhitelist(bool whitelist);
+void jswrap_ble_setConnectionInterval(JsVar *interval);
 
 JsVar *jswrap_BluetoothDevice_gatt(JsVar *parent);
-JsVar *jswrap_nrf_BluetoothRemoteGATTServer_connect(JsVar *parent, JsVar *options);
+JsVar *jswrap_ble_BluetoothRemoteGATTServer_connect(JsVar *parent, JsVar *options);
 void jswrap_BluetoothRemoteGATTServer_disconnect(JsVar *parent);
-JsVar *jswrap_nrf_BluetoothRemoteGATTServer_startBonding(JsVar *parent, bool forceRePair);
-JsVar *jswrap_nrf_BluetoothRemoteGATTServer_getSecurityStatus(JsVar *parent);
+JsVar *jswrap_ble_BluetoothRemoteGATTServer_startBonding(JsVar *parent, bool forceRePair);
+JsVar *jswrap_ble_BluetoothRemoteGATTServer_getSecurityStatus(JsVar *parent);
 JsVar *jswrap_BluetoothRemoteGATTServer_getPrimaryService(JsVar *parent, JsVar *service);
 JsVar *jswrap_BluetoothRemoteGATTServer_getPrimaryServices(JsVar *parent);
 void jswrap_BluetoothRemoteGATTServer_setRSSIHandler(JsVar *parent, JsVar *callback);
 JsVar *jswrap_BluetoothRemoteGATTService_getCharacteristic(JsVar *parent, JsVar *characteristic);
 JsVar *jswrap_BluetoothRemoteGATTService_getCharacteristics(JsVar *parent);
-JsVar *jswrap_nrf_BluetoothRemoteGATTCharacteristic_writeValue(JsVar *characteristic, JsVar *data);
-JsVar *jswrap_nrf_BluetoothRemoteGATTCharacteristic_readValue(JsVar *characteristic);
-JsVar *jswrap_nrf_BluetoothRemoteGATTCharacteristic_startNotifications(JsVar *characteristic);
-JsVar *jswrap_nrf_BluetoothRemoteGATTCharacteristic_stopNotifications(JsVar *characteristic);
+JsVar *jswrap_ble_BluetoothRemoteGATTCharacteristic_writeValue(JsVar *characteristic, JsVar *data);
+JsVar *jswrap_ble_BluetoothRemoteGATTCharacteristic_readValue(JsVar *characteristic);
+JsVar *jswrap_ble_BluetoothRemoteGATTCharacteristic_startNotifications(JsVar *characteristic);
+JsVar *jswrap_ble_BluetoothRemoteGATTCharacteristic_stopNotifications(JsVar *characteristic);
diff --git a/libs/hexbadge/jswrap_hexbadge.c b/libs/hexbadge/jswrap_hexbadge.c
@@ -198,7 +198,7 @@ Return an approximate battery percentage remaining based on
 a normal CR2032 battery (2.8 - 2.2v)
 */
 int jswrap_badge_getBatteryPercentage() {
-  JsVarFloat v = jswrap_nrf_bluetooth_getBattery();
+  JsVarFloat v = jswrap_ble_getBattery();
   int pc = (v-2.2)*100/0.6;
   if (pc>100) pc=100;
   if (pc<0) pc=0;
diff --git a/libs/pixljs/jswrap_pixljs.c b/libs/pixljs/jswrap_pixljs.c
@@ -540,7 +540,7 @@ void jswrap_pixljs_init() {
   }
   graphicsDrawString(&gfx,28,39,JS_VERSION);
   // Write MAC address in bottom right
-  JsVar *addr = jswrap_nrf_bluetooth_getAddress();
+  JsVar *addr = jswrap_ble_getAddress();
   char buf[20];
   jsvGetString(addr, buf, sizeof(buf));
   jsvUnLock(addr);
diff --git a/libs/puckjs/jswrap_puck.c b/libs/puckjs/jswrap_puck.c
@@ -523,7 +523,7 @@ JsVarFloat jswrap_puck_light() {
       delay = 50000;
     jshDelayMicroseconds(delay);
   }
-  JsVarFloat v = jswrap_nrf_bluetooth_getBattery();
+  JsVarFloat v = jswrap_ble_getBattery();
   JsVarFloat f = jshPinAnalog(LED1_PININDEX)*v/(3*0.45);
   if (f>1) f=1;
   // turn the red LED back on if it was on before
diff --git a/src/jsinteractive.c b/src/jsinteractive.c
@@ -711,7 +711,7 @@ void jsiDumpHardwareInitialisation(vcbprintf_callback user_callback, void *user_
   }
 #ifdef BLUETOOTH
   if (humanReadableDump)
-    jswrap_nrf_dumpBluetoothInitialisation(user_callback, user_data);
+    jswrap_ble_dumpBluetoothInitialisation(user_callback, user_data);
 #endif
 }
 
diff --git a/targets/esp32/bluetooth.c b/targets/esp32/bluetooth.c
@@ -84,7 +84,7 @@ void jsble_restart_softdevice(){
 	if (bleStatus & BLE_IS_SCANNING) {
 		bluetooth_gap_setScan(false);
 	}
-	jswrap_nrf_reconfigure_softdevice();
+	jswrap_ble_reconfigure_softdevice();
 }
 
 void jsble_advertising_start(){
diff --git a/targets/nrf5x/bluetooth.c b/targets/nrf5x/bluetooth.c
@@ -2208,12 +2208,12 @@ void jsble_advertising_stop() {
    advertising_init();
    conn_params_init();
 
-   jswrap_nrf_bluetooth_wake();
+   jswrap_ble_wake();
 }
 
 /** Completely deinitialise the BLE stack */
 void jsble_kill() {
-  jswrap_nrf_bluetooth_sleep();
+  jswrap_ble_sleep();
 
   // BLE NUS doesn't need deinitialising (no ble_nus_kill)
   bleStatus &= ~BLE_NUS_INITED;
@@ -2241,7 +2241,7 @@ void jsble_restart_softdevice() {
   jsble_kill();
   jsble_init();
   // reinitialise everything
-  jswrap_nrf_reconfigure_softdevice();
+  jswrap_ble_reconfigure_softdevice();
 }
 
 uint32_t jsble_set_scanning(bool enabled) {

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ void jswrap_pixljs_init() {`
`540`	`540`	`}`
`541`	`541`	`graphicsDrawString(&gfx,28,39,JS_VERSION);`
`542`	`542`	`// Write MAC address in bottom right`
`543`		`- JsVar *addr = jswrap_nrf_bluetooth_getAddress();`
	`543`	`+ JsVar *addr = jswrap_ble_getAddress();`
`544`	`544`	`char buf[20];`
`545`	`545`	`jsvGetString(addr, buf, sizeof(buf));`
`546`	`546`	`jsvUnLock(addr);`
Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ JsVarFloat jswrap_puck_light() {`
`523`	`523`	`delay = 50000;`
`524`	`524`	`jshDelayMicroseconds(delay);`
`525`	`525`	`}`
`526`		`- JsVarFloat v = jswrap_nrf_bluetooth_getBattery();`
	`526`	`+ JsVarFloat v = jswrap_ble_getBattery();`
`527`	`527`	`JsVarFloat f = jshPinAnalog(LED1_PININDEX)v/(30.45);`
`528`	`528`	`if (f>1) f=1;`
`529`	`529`	`// turn the red LED back on if it was on before`
Original file line number	Diff line number	Diff line change
`@@ -711,7 +711,7 @@ void jsiDumpHardwareInitialisation(vcbprintf_callback user_callback, void *user_`
`711`	`711`	`}`
`712`	`712`	`#ifdef BLUETOOTH`
`713`	`713`	`if (humanReadableDump)`
`714`		`- jswrap_nrf_dumpBluetoothInitialisation(user_callback, user_data);`
	`714`	`+ jswrap_ble_dumpBluetoothInitialisation(user_callback, user_data);`
`715`	`715`	`#endif`
`716`	`716`	`}`
`717`	`717`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void jsble_restart_softdevice(){`
`84`	`84`	`if (bleStatus & BLE_IS_SCANNING) {`
`85`	`85`	`bluetooth_gap_setScan(false);`
`86`	`86`	`}`
`87`		`- jswrap_nrf_reconfigure_softdevice();`
	`87`	`+ jswrap_ble_reconfigure_softdevice();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`void jsble_advertising_start(){`