will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working DfuService with quick'n'ugly code

Browse Source
This commit is contained in:
JF 2020-05-01 15:36:48 +02:00
parent 5291bcc7de
commit 0195ece317
3 changed files with 76 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/Components/Ble/DfuService.cpp
View File

@ -86,30 +86,90 @@ int DfuService::OnServiceData(uint16_t connectionHandle, uint16_t attributeHandl
} }
if(attributeHandle == packetCharacteristicHandle) { if(attributeHandle == packetCharacteristicHandle) {
NRF_LOG_INFO("[DFU] Packet Characteristic : %d - %s", attributeHandle, op); NRF_LOG_INFO("[DFU] %s Packet", op);
if(context->op == BLE_GATT_ACCESS_OP_WRITE_CHR) { if(context->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
NRF_LOG_INFO("[DFU] -> Write %dB", context->om->om_len); // NRF_LOG_INFO("[DFU] -> Write %dB", context->om->om_len);
uint8_t data[3] {16, 1, 1}; if(opcode == 1) {
auto* om = ble_hs_mbuf_from_flat(data, 3); uint8_t data[3]{16, opcode, param};
NRF_LOG_INFO("[DFU] -> Send notification: {%d, %d, %d}", data[0], data[1], data[2]);
auto *om = ble_hs_mbuf_from_flat(data, 3);
ble_gattc_notify_custom(connectionHandle, controlPointCharacteristicHandle, om); ble_gattc_notify_custom(connectionHandle, controlPointCharacteristicHandle, om);
} }
if(dataMode){
nbPacketReceived++;
bytesReceived += context->om->om_len;
NRF_LOG_INFO("[DFU] -> Bytes received : %d in %d packets", bytesReceived, nbPacketReceived);
if((nbPacketReceived % nbPacketsToNotify) == 0) {
uint8_t data[5]{17, (uint8_t)(bytesReceived>>24),(uint8_t)(bytesReceived>>16), (uint8_t)(bytesReceived>>8), (uint8_t)(bytesReceived&0x000000FF) };
NRF_LOG_INFO("[DFU] -> Send packet notification: %d bytes received",bytesReceived);
auto *om = ble_hs_mbuf_from_flat(data, 5);
ble_gattc_notify_custom(connectionHandle, controlPointCharacteristicHandle, om);
}
if(bytesReceived == 175280) {
uint8_t data[3]{16, 3, 1};
NRF_LOG_INFO("[DFU] -> Send packet notification : all bytes received!");
auto *om = ble_hs_mbuf_from_flat(data, 3);
ble_gattc_notify_custom(connectionHandle, controlPointCharacteristicHandle, om);
}
}
}
} else if (attributeHandle == controlPointCharacteristicHandle) { } else if (attributeHandle == controlPointCharacteristicHandle) {
NRF_LOG_INFO("[DFU] ControlPoint Characteristic : %d - %s", attributeHandle, op); NRF_LOG_INFO("[DFU] %s ControlPoint", op);
if(context->op == BLE_GATT_ACCESS_OP_WRITE_CHR) { if(context->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
NRF_LOG_INFO("[DFU] -> Write %dB", context->om->om_len); // NRF_LOG_INFO("[DFU] -> Write %dB {%d, %d}", context->om->om_len, context->om->om_data[0], context->om->om_data[1]);
switch(context->om->om_data[0]) { switch(context->om->om_data[0]) {
case 0x01: {// START DFU case 0x01: {// START DFU
NRF_LOG_INFO("[DFU] -> Start DFU, mode = %d", context->om->om_data[1]); NRF_LOG_INFO("[DFU] -> Start DFU, mode = %d", context->om->om_data[1]);
opcode = 0x01;
param = 1;
} }
break;
case 0x02:
NRF_LOG_INFO("[DFU] -> Receive init, state (0=RX, 1=Complete) = %d", context->om->om_data[1]);
opcode = 0x02;
param = context->om->om_data[1];
if(param == 1) {
uint8_t data[3] {16, opcode, param};
NRF_LOG_INFO("[DFU] -> Send notification: {%d, %d, %d}", data[0], data[1], data[2]);
auto *om = ble_hs_mbuf_from_flat(data, 3);
ble_gattc_notify_custom(connectionHandle, controlPointCharacteristicHandle, om);
}
break;
case 0x08:
nbPacketsToNotify = context->om->om_data[1];
NRF_LOG_INFO("[DFU] -> Receive Packet Notification Request, nb packet = %d", nbPacketsToNotify);
break;
case 0x03:
NRF_LOG_INFO("[DFU] -> Starting receive firmware");
dataMode = true;
break;
case 0x04: {
NRF_LOG_INFO("[DFU] -> Validate firmware");
uint8_t data[3]{16, 4, 1};
NRF_LOG_INFO("[DFU] -> Send notification: {%d, %d, %d}", data[0], data[1], data[2]);
auto *om = ble_hs_mbuf_from_flat(data, 3);
ble_gattc_notify_custom(connectionHandle, controlPointCharacteristicHandle, om);
}
break;
case 0x05:
NRF_LOG_INFO("[DFU] -> Activate image and reset!");
break; break;
} }
} }
} else if(attributeHandle == revisionCharacteristicHandle) { } else if(attributeHandle == revisionCharacteristicHandle) {
NRF_LOG_INFO("[DFU] Revision Characteristic : %d - %s", attributeHandle, op); NRF_LOG_INFO("[DFU] %s Revision", op);
if(context->op == BLE_GATT_ACCESS_OP_READ_CHR) { if(context->op == BLE_GATT_ACCESS_OP_READ_CHR) {
int res = os_mbuf_append(context->om, &revision, 2); int res = os_mbuf_append(context->om, &revision, 2);
return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES; return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;

6
src/Components/Ble/DfuService.h
View File

@ -51,6 +51,12 @@ namespace Pinetime {
uint16_t packetCharacteristicHandle; uint16_t packetCharacteristicHandle;
uint16_t controlPointCharacteristicHandle; uint16_t controlPointCharacteristicHandle;
uint16_t revisionCharacteristicHandle; uint16_t revisionCharacteristicHandle;
uint8_t opcode = 0;
uint8_t param = 0;
uint8_t nbPacketsToNotify = 0;
uint32_t nbPacketReceived = 0;
bool dataMode = false;
uint32_t bytesReceived = 0;
}; };
} }
} }

2
src/Components/Ble/NimbleController.cpp
View File

@ -231,7 +231,7 @@ int NimbleController::OnGAPEvent(ble_gap_event *event) {
/* Attribute data is contained in event->notify_rx.attr_data. */ /* Attribute data is contained in event->notify_rx.attr_data. */
default: default:
NRF_LOG_INFO("Advertising event : %d", event->type); // NRF_LOG_INFO("Advertising event : %d", event->type);
break; break;
} }
return 0; return 0;