@@ -87,15 +87,15 @@ namespace bluetooth {
87
87
}
88
88
89
89
// %
90
- void uartWriteString (StringData * data) {
90
+ void uartWriteString (String data) {
91
91
startUartService ();
92
- uart->send (ManagedString (data));
92
+ uart->send (MSTR (data));
93
93
}
94
94
95
95
// %
96
- StringData* uartReadUntil (StringData * del) {
96
+ String uartReadUntil (String del) {
97
97
startUartService ();
98
- return uart->readUntil (ManagedString (del)). leakData ( );
98
+ return PSTR ( uart->readUntil (MSTR (del)));
99
99
}
100
100
101
101
/* *
@@ -104,9 +104,9 @@ namespace bluetooth {
104
104
*/
105
105
// % help=bluetooth/on-uart-data-received
106
106
// % weight=18 blockId=bluetooth_on_data_received block="bluetooth|on data received %delimiters=serial_delimiter_conv"
107
- void onUartDataReceived (StringData* delimiters, Action body) {
107
+ void onUartDataReceived (String delimiters, Action body) {
108
108
startUartService ();
109
- uart->eventOn (ManagedString (delimiters));
109
+ uart->eventOn (MSTR (delimiters));
110
110
registerWithDal (MICROBIT_ID_BLE_UART, MICROBIT_UART_S_EVT_DELIM_MATCH, body);
111
111
}
112
112
@@ -142,10 +142,10 @@ namespace bluetooth {
142
142
// % blockId=eddystone_advertise_url block="bluetooth advertise url %url|with power %power|connectable %connectable"
143
143
// % parts=bluetooth weight=11 blockGap=8
144
144
// % help=bluetooth/advertise-url blockExternalInputs=1
145
- void advertiseUrl (StringData* url, int power, bool connectable) {
145
+ void advertiseUrl (String url, int power, bool connectable) {
146
146
power = min (MICROBIT_BLE_POWER_LEVELS-1 , max (0 , power));
147
147
int8_t level = CALIBRATED_POWERS[power];
148
- uBit.bleManager .advertiseEddystoneUrl (ManagedString (url), level, connectable);
148
+ uBit.bleManager .advertiseEddystoneUrl (MSTR (url), level, connectable);
149
149
uBit.bleManager .setTransmitPower (power);
150
150
}
151
151
@@ -157,14 +157,12 @@ namespace bluetooth {
157
157
*/
158
158
// % parts=bluetooth weight=12 advanced=true
159
159
void advertiseUidBuffer (Buffer nsAndInstance, int power, bool connectable) {
160
- ManagedBuffer buf ( nsAndInstance) ;
161
- if (buf. length () != 16 ) return ;
160
+ auto buf = nsAndInstance;
161
+ if (buf-> length != 16 ) return ;
162
162
163
163
power = min (MICROBIT_BLE_POWER_LEVELS-1 , max (0 , power));
164
164
int8_t level = CALIBRATED_POWERS[power];
165
- uint8_t uidNs[10 ]; buf.readBytes (uidNs, 0 , 10 );
166
- uint8_t uidInst[6 ]; buf.readBytes (uidInst, 10 , 6 );
167
- uBit.bleManager .advertiseEddystoneUid ((const char *)uidNs, (const char *)uidInst, level, connectable);
165
+ uBit.bleManager .advertiseEddystoneUid ((const char *)buf->data , (const char *)buf->data + 10 , level, connectable);
168
166
}
169
167
170
168
/* *
0 commit comments