Lorenzo Invidia
This software setup a central node of a star topology network
Dependencies: MQTT target_st_bluenrg
Fork of
ble-star-mbed
by 
Lorenzo Invidia
Revision 3:3f35e80ed848, committed 2018-03-13
- Comitter:
- lorevee
- Date:
- Tue Mar 13 16:31:07 2018 +0000
- Parent:
- 2:1525f4848cf2
- Child:
- 4:4af40af2530e
- Commit message:
- Bug fixing 1
Changed in this revision
--- a/source/BleMasterService.cpp Mon Feb 26 12:29:03 2018 +0000
+++ b/source/BleMasterService.cpp Tue Mar 13 16:31:07 2018 +0000
@@ -502,7 +502,7 @@
perDevs.connection_handle[index] = handle;
perDevs.is_disconnected[index] = false;
- printf("\r\n\nConnected to peripheral: [%02x %02x %02x %02x %02x %02x] (%d/%d - 0x%04x) (role: %s)\n",
+ printf("\r\nConnected to peripheral: [%02x %02x %02x %02x %02x %02x] (%d/%d - 0x%04x) (role: %s)\n",
tempAddr[5], tempAddr[4], tempAddr[3], tempAddr[2],
tempAddr[1], tempAddr[0], index+1, perDevs.connDevices+1, handle, (role == 1 ? "slave" : "master"));
@@ -527,9 +527,9 @@
slaveDev.is_discoverable = false;
- printf("\r\n\nConnected to master: [%02x %02x %02x %02x %02x %02x] (role: %s) (adv: %d)\n",
+ printf("\r\nConnected to master: [%02x %02x %02x %02x %02x %02x] (role: %s)\n",
tempAddr[5], tempAddr[4], tempAddr[3], tempAddr[2],
- tempAddr[1], tempAddr[0], (role == 1 ? "slave" : "master"), ble.gap().getState().advertising);
+ tempAddr[1], tempAddr[0], (role == 1 ? "slave" : "master"));
}//if-SLAVE
@@ -1450,7 +1450,6 @@
if ((stackBusy == 0) && (writeDescriptorCompleted ==1)){
notifyMaster(ATTR_HEAD_LEN+WUP_DATA_LEN, star_attr_value, slave_attr_handle);
}else {
- //disableAllNotifications();
return;
}
@@ -1484,7 +1483,6 @@
if ((stackBusy == 0) && (writeDescriptorCompleted ==1)){
notifyMaster(ATTR_HEAD_LEN+MIC_DATA_LEN, star_attr_value, slave_attr_handle);
}else {
- //disableAllNotifications();
return;
}
}
@@ -1511,7 +1509,6 @@
if ((stackBusy == 0) && (writeDescriptorCompleted ==1)){
notifyMaster(ATTR_HEAD_LEN+PRX_DATA_LEN, star_attr_value, slave_attr_handle);
}else {
- //disableAllNotifications();
return;
}
}
@@ -1558,7 +1555,6 @@
if ((stackBusy == 0) && (writeDescriptorCompleted ==1)){
notifyMaster(ATTR_HEAD_LEN+data_len, star_attr_value, slave_attr_handle);
}else {
- //disableAllNotifications();
return;
}
@@ -1593,7 +1589,6 @@
if ((stackBusy == 0) && (writeDescriptorCompleted ==1)){
notifyMaster(ATTR_HEAD_LEN+SFUSION_DATA_LEN, star_attr_value, slave_attr_handle);
}else {
- //disableAllNotifications();
return;
}
perDevs.sfusion_char_read[index] = 1;
@@ -1633,7 +1628,6 @@
notifyMaster(ATTR_HEAD_LEN+PRESS_DATA_LEN+(3*TYPE_ID_LEN)+HUM_DATA_LEN+(2*TEMP_DATA_LEN),
star_attr_value, slave_attr_handle);
}else {
- //disableAllNotifications();
return;
}
}
@@ -1662,7 +1656,6 @@
if ((stackBusy == 0) && (writeDescriptorCompleted ==1)){
notifyMaster(ATTR_HEAD_LEN+LED_DATA_LEN, star_attr_value, slave_attr_handle);
}else {
- //disableAllNotifications();
return;
}
}
@@ -1688,7 +1681,6 @@
if ((stackBusy == 0) && (writeDescriptorCompleted ==1)){
notifyMaster(ATTR_HEAD_LEN+LUX_DATA_LEN, star_attr_value, slave_attr_handle);
}else {
- //disableAllNotifications();
return;
}
}
--- a/source/BleSlaveService.cpp Mon Feb 26 12:29:03 2018 +0000
+++ b/source/BleSlaveService.cpp Tue Mar 13 16:31:07 2018 +0000
@@ -586,14 +586,14 @@
notifyP->conn_handle = conn_handle;
notifyP->i = i;
notifyP->feature_mask = FEATURE_MASK_ACC;
- notifyP->frequency = notification_freq*SENDING_INTERVAL_100MS_MULTIPLE;
+ notifyP->frequency = SENDING_INTERVAL_100MS_MULTIPLE;
/* Then, call the Change_Notification_Status from the readCallback with these params */
}else if (readCompleted == 1) {
//notificationPending = 0;
- Change_Notification_Status(att_data, attr_value, conn_handle, i, FEATURE_MASK_ACC, notification_freq*SENDING_INTERVAL_100MS_MULTIPLE);
+ Change_Notification_Status(att_data, attr_value, conn_handle, i, FEATURE_MASK_ACC, SENDING_INTERVAL_100MS_MULTIPLE);
}
perDevs.agm_on[i] = attr_value[0];
@@ -635,13 +635,13 @@
notifyP->conn_handle = conn_handle;
notifyP->i = i;
notifyP->feature_mask = FEATURE_MASK_SENSORFUSION;
- notifyP->frequency = notification_freq*SENDING_INTERVAL_100MS_MULTIPLE;
+ notifyP->frequency = SENDING_INTERVAL_100MS_MULTIPLE;
/* Then, call the Change_Notification_Status from the readCallback with these params */
}else if (readCompleted == 1) {
//notificationPending = 0;
- Change_Notification_Status(att_data, attr_value, conn_handle, i, FEATURE_MASK_SENSORFUSION, notification_freq*SENDING_INTERVAL_100MS_MULTIPLE);
+ Change_Notification_Status(att_data, attr_value, conn_handle, i, FEATURE_MASK_SENSORFUSION, SENDING_INTERVAL_100MS_MULTIPLE);
}
perDevs.sfusion_on[i] = attr_value[0];
@@ -745,7 +745,6 @@
}
-// if ((discoveryCompleted == 1)){
ble_error_t err;
@@ -759,9 +758,6 @@
}
-
-
-
/* WUP notification enable/disable */
if(attr_value[0]==0x00){
for (uint8_t j=0; j<(perDevs.connDevices+perDevs.discDevices); j++) {
@@ -771,8 +767,7 @@
setNotificationProperty(perDevs.connection_handle[j], j, FEATURE_MASK_WAKEUP_EVENTS, WAKEUP_NOTIFICATION_CMD, 1);
- if (discoveryCompleted == 1){
-
+// if (discoveryCompleted == 1){
writeDescriptorCompleted=0;
ble_error_t wupErrOn = writeCharacDescriptorWithError(perDevs.connection_handle[j], attr_handle, value_len, attr_value);
@@ -783,11 +778,11 @@
} else {
printf("\r\nWrite WUP char descriptor failed! (%d)\n", wupErrOn);
-
+ writeDescriptorCompleted=1;
}//if-else
- writeDescriptorCompleted=1;
+
- }//if-else-discovery-completed
+// }//if-else-discovery-completed
}//if
}//for
@@ -804,8 +799,7 @@
attr_value[0] = 0x00;
- if (discoveryCompleted == 1){
-
+// if (discoveryCompleted == 1){
writeDescriptorCompleted=0;
ble_error_t wupErrOff = writeCharacDescriptorWithError(perDevs.connection_handle[j], attr_handle, value_len, attr_value);
@@ -816,11 +810,11 @@
} else {
printf("\r\nWrite WUP char descriptor failed! (%d)\n", wupErrOff);
-
+ writeDescriptorCompleted=1;
}
- writeDescriptorCompleted=1;
+
- }//if-discovery-completed
+// }//if-discovery-completed
}//if
}//for
--- a/source/main.cpp Mon Feb 26 12:29:03 2018 +0000
+++ b/source/main.cpp Tue Mar 13 16:31:07 2018 +0000
@@ -80,7 +80,7 @@
ble.gap().onDisconnection(disconnectionCallback);
/* connection */
ble.gap().onConnection(connectionCallback);
- ble.gap().setScanParams(600, 200); //(scanInterval,scanWindow)ms
+ ble.gap().setScanParams(400, 200); //(scanInterval,scanWindow)ms
ble.gap().setScanTimeout(0x0004); //stop scanning after N sec
ble.gap().onTimeout(onStopScan); //callback when scan stops