summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Components/Ble/AlertNotificationClient.cpp4
-rw-r--r--src/Components/Ble/AlertNotificationClient.h1
-rw-r--r--src/Components/Ble/BleController.cpp16
-rw-r--r--src/Components/Ble/BleController.h12
-rw-r--r--src/Components/Ble/CurrentTimeClient.cpp4
-rw-r--r--src/Components/Ble/CurrentTimeClient.h1
-rw-r--r--src/Components/Ble/DfuService.cpp251
-rw-r--r--src/Components/Ble/DfuService.h103
-rw-r--r--src/Components/Ble/NimbleController.cpp19
-rw-r--r--src/Components/Ble/NimbleController.h10
-rw-r--r--src/DisplayApp/DisplayApp.cpp12
-rw-r--r--src/DisplayApp/DisplayApp.h2
-rw-r--r--src/DisplayApp/Screens/FirmwareUpdate.cpp49
-rw-r--r--src/DisplayApp/Screens/FirmwareUpdate.h39
-rw-r--r--src/SystemTask/SystemTask.cpp22
-rw-r--r--src/SystemTask/SystemTask.h6
-rw-r--r--src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h2
-rw-r--r--src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h2
-rw-r--r--src/sdk_config.h6
20 files changed, 435 insertions, 130 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd9f3b42..2a9614e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -305,6 +305,7 @@ list(APPEND SOURCE_FILES
DisplayApp/Screens/Brightness.cpp
DisplayApp/Screens/ScreenList.cpp
DisplayApp/Screens/Label.cpp
+ DisplayApp/Screens/FirmwareUpdate.cpp
main.cpp
drivers/St7789.cpp
drivers/SpiMaster.cpp
@@ -319,6 +320,7 @@ list(APPEND SOURCE_FILES
Components/Ble/DeviceInformationService.cpp
Components/Ble/CurrentTimeClient.cpp
Components/Ble/AlertNotificationClient.cpp
+ Components/Ble/DfuService.cpp
drivers/Cst816s.cpp
FreeRTOS/port.c
FreeRTOS/port_cmsis_systick.c
@@ -353,6 +355,7 @@ set(INCLUDE_FILES
DisplayApp/Screens/Brightness.h
DisplayApp/Screens/ScreenList.h
DisplayApp/Screens/Label.h
+ DisplayApp/Screens/FirmwareUpdate.h
drivers/St7789.h
drivers/SpiMaster.h
drivers/Watchdog.h
@@ -366,6 +369,7 @@ set(INCLUDE_FILES
Components/Ble/DeviceInformationService.h
Components/Ble/CurrentTimeClient.h
Components/Ble/AlertNotificationClient.h
+ Components/Ble/DfuService.h
drivers/Cst816s.h
FreeRTOS/portmacro.h
FreeRTOS/portmacro_cmsis.h
diff --git a/src/Components/Ble/AlertNotificationClient.cpp b/src/Components/Ble/AlertNotificationClient.cpp
index 6e096353..bf4d851c 100644
--- a/src/Components/Ble/AlertNotificationClient.cpp
+++ b/src/Components/Ble/AlertNotificationClient.cpp
@@ -42,10 +42,6 @@ bool AlertNotificationClient::OnDiscoveryEvent(uint16_t connectionHandle, const
return false;
}
-void AlertNotificationClient::Init() {
-
-}
-
int AlertNotificationClient::OnCharacteristicsDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error,
const ble_gatt_chr *characteristic) {
if(error->status != 0 && error->status != BLE_HS_EDONE) {
diff --git a/src/Components/Ble/AlertNotificationClient.h b/src/Components/Ble/AlertNotificationClient.h
index 7a085b7e..ca4f4e94 100644
--- a/src/Components/Ble/AlertNotificationClient.h
+++ b/src/Components/Ble/AlertNotificationClient.h
@@ -16,7 +16,6 @@ namespace Pinetime {
public:
explicit AlertNotificationClient(Pinetime::System::SystemTask &systemTask,
Pinetime::Controllers::NotificationManager &notificationManager);
- void Init();
bool OnDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error, const ble_gatt_svc *service);
int OnCharacteristicsDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error,
diff --git a/src/Components/Ble/BleController.cpp b/src/Components/Ble/BleController.cpp
index 5fa51688..2b396e12 100644
--- a/src/Components/Ble/BleController.cpp
+++ b/src/Components/Ble/BleController.cpp
@@ -12,4 +12,20 @@ void Ble::Disconnect() {
isConnected = false;
}
+void Ble::StartFirmwareUpdate() {
+ isFirmwareUpdating = true;
+}
+
+void Ble::StopFirmwareUpdate() {
+ isFirmwareUpdating = false;
+}
+
+void Ble::FirmwareUpdateTotalBytes(uint32_t totalBytes) {
+ firmwareUpdateTotalBytes = totalBytes;
+}
+
+void Ble::FirmwareUpdateCurrentBytes(uint32_t currentBytes) {
+ firmwareUpdateCurrentBytes = currentBytes;
+}
+
diff --git a/src/Components/Ble/BleController.h b/src/Components/Ble/BleController.h
index f2bd77e0..65a5ef8f 100644
--- a/src/Components/Ble/BleController.h
+++ b/src/Components/Ble/BleController.h
@@ -12,8 +12,20 @@ namespace Pinetime {
bool IsConnected() const {return isConnected;}
void Connect();
void Disconnect();
+
+ void StartFirmwareUpdate();
+ void StopFirmwareUpdate();
+ void FirmwareUpdateTotalBytes(uint32_t totalBytes);
+ void FirmwareUpdateCurrentBytes(uint32_t currentBytes);
+
+ bool IsFirmwareUpdating() const { return isFirmwareUpdating; }
+ uint32_t FirmwareUpdateTotalBytes() const { return firmwareUpdateTotalBytes; }
+ uint32_t FirmwareUpdateCurrentBytes() const { return firmwareUpdateCurrentBytes; }
private:
bool isConnected = false;
+ bool isFirmwareUpdating = false;
+ uint32_t firmwareUpdateTotalBytes = 0;
+ uint32_t firmwareUpdateCurrentBytes = 0;
};
}
diff --git a/src/Components/Ble/CurrentTimeClient.cpp b/src/Components/Ble/CurrentTimeClient.cpp
index fdebc084..caec39d1 100644
--- a/src/Components/Ble/CurrentTimeClient.cpp
+++ b/src/Components/Ble/CurrentTimeClient.cpp
@@ -10,10 +10,6 @@ CurrentTimeClient::CurrentTimeClient(DateTime& dateTimeController) : dateTimeCon
}
-void CurrentTimeClient::Init() {
-
-}
-
bool CurrentTimeClient::OnDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error, const ble_gatt_svc *service) {
if(service == nullptr && error->status == BLE_HS_EDONE) {
NRF_LOG_INFO("CTS Discovery complete");
diff --git a/src/Components/Ble/CurrentTimeClient.h b/src/Components/Ble/CurrentTimeClient.h
index 2278ef15..76caff9f 100644
--- a/src/Components/Ble/CurrentTimeClient.h
+++ b/src/Components/Ble/CurrentTimeClient.h
@@ -10,7 +10,6 @@ namespace Pinetime {
class CurrentTimeClient {
public:
explicit CurrentTimeClient(DateTime& dateTimeController);
- void Init();
bool OnDiscoveryEvent(uint16_t connectionHandle, const ble_gatt_error *error, const ble_gatt_svc *service);
int OnCharacteristicDiscoveryEvent(uint16_t conn_handle, const ble_gatt_error *error,
const ble_gatt_chr *characteristic);
diff --git a/src/Components/Ble/DfuService.cpp b/src/Components/Ble/DfuService.cpp
index 3099b1bf..2870d7f0 100644
--- a/src/Components/Ble/DfuService.cpp
+++ b/src/Components/Ble/DfuService.cpp
@@ -1,101 +1,216 @@
-#include "DeviceInformationService.h"
+#include <Components/Ble/BleController.h>
+#include <SystemTask/SystemTask.h>
+#include "DfuService.h"
using namespace Pinetime::Controllers;
-constexpr ble_uuid16_t DeviceInformationService::manufacturerNameUuid;
-constexpr ble_uuid16_t DeviceInformationService::modelNumberUuid;
-constexpr ble_uuid16_t DeviceInformationService::serialNumberUuid;
-constexpr ble_uuid16_t DeviceInformationService::fwRevisionUuid;
-constexpr ble_uuid16_t DeviceInformationService::deviceInfoUuid;
-constexpr ble_uuid16_t DeviceInformationService::hwRevisionUuid;
+constexpr ble_uuid128_t DfuService::serviceUuid;
+constexpr ble_uuid128_t DfuService::controlPointCharacteristicUuid;
+constexpr ble_uuid128_t DfuService::revisionCharacteristicUuid;
+constexpr ble_uuid128_t DfuService::packetCharacteristicUuid;
-int DeviceInformationCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
- auto deviceInformationService = static_cast<DeviceInformationService*>(arg);
- return deviceInformationService->OnDeviceInfoRequested(conn_handle, attr_handle, ctxt);
+int DfuServiceCallback(uint16_t conn_handle, uint16_t attr_handle,
+ struct ble_gatt_access_ctxt *ctxt, void *arg) {
+ auto dfuService = static_cast<DfuService*>(arg);
+ return dfuService->OnServiceData(conn_handle, attr_handle, ctxt);
}
-void DeviceInformationService::Init() {
- ble_gatts_count_cfg(serviceDefinition);
- ble_gatts_add_svcs(serviceDefinition);
-}
-
-
-int DeviceInformationService::OnDeviceInfoRequested(uint16_t conn_handle, uint16_t attr_handle,
- struct ble_gatt_access_ctxt *ctxt) {
- const char *str;
-
- switch (ble_uuid_u16(ctxt->chr->uuid)) {
- case manufacturerNameId:
- str = manufacturerName;
- break;
- case modelNumberId:
- str = modelNumber;
- break;
- case serialNumberId:
- str = serialNumber;
- break;
- case fwRevisionId:
- str = fwRevision;
- break;
- case hwRevisionId:
- str = hwRevision;
- break;
- default:
- return BLE_ATT_ERR_UNLIKELY;
- }
-
- int res = os_mbuf_append(ctxt->om, str, strlen(str));
- return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
-}
-
-DeviceInformationService::DeviceInformationService() :
+DfuService::DfuService(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::Ble& bleController) :
+ systemTask{systemTask},
+ bleController{bleController},
characteristicDefinition{
{
- .uuid = (ble_uuid_t *) &manufacturerNameUuid,
- .access_cb = DeviceInformationCallback,
+ .uuid = (ble_uuid_t *) &packetCharacteristicUuid,
+ .access_cb = DfuServiceCallback,
.arg = this,
- .flags = BLE_GATT_CHR_F_READ,
+ .flags = BLE_GATT_CHR_F_WRITE_NO_RSP,
+ .val_handle = nullptr,
},
{
- .uuid = (ble_uuid_t *) &modelNumberUuid,
- .access_cb = DeviceInformationCallback,
+ .uuid = (ble_uuid_t *) &controlPointCharacteristicUuid,
+ .access_cb = DfuServiceCallback,
.arg = this,
- .flags = BLE_GATT_CHR_F_READ,
- },
- {
- .uuid = (ble_uuid_t *) &serialNumberUuid,
- .access_cb = DeviceInformationCallback,
- .arg = this,
- .flags = BLE_GATT_CHR_F_READ,
- },
- {
- .uuid = (ble_uuid_t *) &fwRevisionUuid,
- .access_cb = DeviceInformationCallback,
- .arg = this,
- .flags = BLE_GATT_CHR_F_READ,
+ .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_NOTIFY,
+ .val_handle = nullptr,
},
{
- .uuid = (ble_uuid_t *) &hwRevisionUuid,
- .access_cb = DeviceInformationCallback,
+ .uuid = (ble_uuid_t *) &revisionCharacteristicUuid,
+ .access_cb = DfuServiceCallback,
.arg = this,
.flags = BLE_GATT_CHR_F_READ,
+ .val_handle = &revision,
+
},
{
0
}
+
},
- serviceDefinition{
+ serviceDefinition {
{
/* Device Information Service */
.type = BLE_GATT_SVC_TYPE_PRIMARY,
- .uuid = (ble_uuid_t *) &deviceInfoUuid,
+ .uuid = (ble_uuid_t *) &serviceUuid,
.characteristics = characteristicDefinition
},
{
0
},
}
- {
+ {
+
+}
+
+void DfuService::Init() {
+ ble_gatts_count_cfg(serviceDefinition);
+ ble_gatts_add_svcs(serviceDefinition);
+}
+
+int DfuService::OnServiceData(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt *context) {
+
+ ble_gatts_find_chr((ble_uuid_t*)&serviceUuid, (ble_uuid_t*)&packetCharacteristicUuid, nullptr, &packetCharacteristicHandle);
+ ble_gatts_find_chr((ble_uuid_t*)&serviceUuid, (ble_uuid_t*)&controlPointCharacteristicUuid, nullptr, &controlPointCharacteristicHandle);
+ ble_gatts_find_chr((ble_uuid_t*)&serviceUuid, (ble_uuid_t*)&revisionCharacteristicUuid, nullptr, &revisionCharacteristicHandle);
+
+ if(attributeHandle == packetCharacteristicHandle) {
+ if(context->op == BLE_GATT_ACCESS_OP_WRITE_CHR)
+ return WritePacketHandler(connectionHandle, context->om);
+ else return 0;
+ } else if(attributeHandle == controlPointCharacteristicHandle) {
+ if(context->op == BLE_GATT_ACCESS_OP_WRITE_CHR)
+ return ControlPointHandler(connectionHandle, context->om);
+ else return 0;
+ } else if(attributeHandle == revisionCharacteristicHandle) {
+ if(context->op == BLE_GATT_ACCESS_OP_READ_CHR)
+ return SendDfuRevision(context->om);
+ else return 0;
+ } else {
+ NRF_LOG_INFO("[DFU] Unknown Characteristic : %d", attributeHandle);
+ return 0;
+ }
+}
+
+int DfuService::SendDfuRevision(os_mbuf *om) const {
+ int res = os_mbuf_append(om, &revision, sizeof(revision));
+ return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
+}
+
+int DfuService::WritePacketHandler(uint16_t connectionHandle, os_mbuf *om) {
+ switch(state) {
+ case States::Start: {
+ uint8_t data[] {16, 1, 1};
+ SendNotification(connectionHandle, data, 3);
+ }
+ return 0;
+ case States::Data: {
+ nbPacketReceived++;
+ bytesReceived += om->om_len;
+ bleController.FirmwareUpdateCurrentBytes(bytesReceived);
+ NRF_LOG_INFO("[DFU] -> Bytes received : %d in %d packets", bytesReceived, nbPacketReceived);
+
+ if((nbPacketReceived % nbPacketsToNotify) == 0) {
+ uint8_t data[5]{static_cast<uint8_t>(Opcodes::PacketReceiptNotification),
+ (uint8_t)(bytesReceived>>24u),(uint8_t)(bytesReceived>>16u), (uint8_t)(bytesReceived>>8u), (uint8_t)(bytesReceived&0x000000FFu) };
+ NRF_LOG_INFO("[DFU] -> Send packet notification: %d bytes received",bytesReceived);
+ SendNotification(connectionHandle, data, 5);
+ }
+ if(bytesReceived == 175280) {
+ uint8_t data[3]{static_cast<uint8_t>(Opcodes::Response),
+ static_cast<uint8_t>(Opcodes::ReceiveFirmwareImage),
+ static_cast<uint8_t>(ErrorCodes::NoError)};
+ NRF_LOG_INFO("[DFU] -> Send packet notification : all bytes received!");
+ SendNotification(connectionHandle, data, 3);
+ state = States::Validate;
+ }
+ }
+ return 0;
+ default:
+ // Invalid state
+ return 0;
+ }
+ return 0;
}
+int DfuService::ControlPointHandler(uint16_t connectionHandle, os_mbuf *om) {
+ auto opcode = static_cast<Opcodes>(om->om_data[0]);
+ switch(opcode) {
+ case Opcodes::StartDFU: {
+ if(state != States::Idle) {
+ NRF_LOG_INFO("[DFU] -> Start DFU requested, but we are not in Idle state");
+ return 0;
+ }
+ auto imageType = static_cast<ImageTypes>(om->om_data[1]);
+ if(imageType == ImageTypes::Application) {
+ NRF_LOG_INFO("[DFU] -> Start DFU, mode = Application");
+ state = States::Start;
+ bleController.StartFirmwareUpdate();
+ bleController.FirmwareUpdateTotalBytes(175280);
+ bleController.FirmwareUpdateCurrentBytes(0);
+ systemTask.PushMessage(Pinetime::System::SystemTask::Messages::BleFirmwareUpdateStarted);
+ return 0;
+ } else {
+ NRF_LOG_INFO("[DFU] -> Start DFU, mode %d not supported!", imageType);
+ return 0;
+ }
+ }
+ break;
+ case Opcodes::InitDFUParameters: {
+ if (state != States::Start) {
+ NRF_LOG_INFO("[DFU] -> Init DFU requested, but we are not in Start state");
+ return 0;
+ }
+ bool isInitComplete = (om->om_data[1] != 0);
+ NRF_LOG_INFO("[DFU] -> Init DFU parameters %s", isInitComplete ? " complete" : " not complete");
+
+ if (isInitComplete) {
+ uint8_t data[3]{static_cast<uint8_t>(Opcodes::Response),
+ static_cast<uint8_t>(Opcodes::InitDFUParameters),
+ (isInitComplete ? uint8_t{1} : uint8_t{0})};
+ SendNotification(connectionHandle, data, 3);
+ return 0;
+ }
+ }
+ return 0;
+ case Opcodes::PacketReceiptNotificationRequest:
+ nbPacketsToNotify = om->om_data[1];
+ NRF_LOG_INFO("[DFU] -> Receive Packet Notification Request, nb packet = %d", nbPacketsToNotify);
+ return 0;
+ case Opcodes::ReceiveFirmwareImage:
+ if(state != States::Start) {
+ NRF_LOG_INFO("[DFU] -> Receive firmware image requested, but we are not in Start state");
+ return 0;
+ }
+ NRF_LOG_INFO("[DFU] -> Starting receive firmware");
+ state = States::Data;
+ return 0;
+ case Opcodes::ValidateFirmware: {
+ if(state != States::Validate) {
+ NRF_LOG_INFO("[DFU] -> Validate firmware image requested, but we are not in Data state");
+ return 0;
+ }
+ NRF_LOG_INFO("[DFU] -> Validate firmware");
+ state = States::Validated;
+ uint8_t data[3]{static_cast<uint8_t>(Opcodes::Response),
+ static_cast<uint8_t>(Opcodes::ValidateFirmware),
+ static_cast<uint8_t>(ErrorCodes::NoError)};
+ SendNotification(connectionHandle, data, 3);
+ return 0;
+ }
+ case Opcodes::ActivateImageAndReset:
+ if(state != States::Validated) {
+ NRF_LOG_INFO("[DFU] -> Activate image and reset requested, but we are not in Validated state");
+ return 0;
+ }
+ NRF_LOG_INFO("[DFU] -> Activate image and reset!");
+ bleController.StopFirmwareUpdate();
+ systemTask.PushMessage(Pinetime::System::SystemTask::Messages::BleFirmwareUpdateFinished);
+ return 0;
+ default: return 0;
+ }
+}
+
+void DfuService::SendNotification(uint16_t connectionHandle, const uint8_t *data, const size_t size) {
+ auto *om = ble_hs_mbuf_from_flat(data, size);
+ ble_gattc_notify_custom(connectionHandle, controlPointCharacteristicHandle, om);
+}
diff --git a/src/Components/Ble/DfuService.h b/src/Components/Ble/DfuService.h
index 6249893d..7077bf02 100644
--- a/src/Components/Ble/DfuService.h
+++ b/src/Components/Ble/DfuService.h
@@ -5,63 +5,90 @@
#include <host/ble_gap.h>
namespace Pinetime {
+ namespace System {
+ class SystemTask;
+ }
namespace Controllers {
- class DeviceInformationService {
+ class Ble;
+ class DfuService {
public:
- DeviceInformationService();
+ DfuService(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::Ble& bleController);
void Init();
- int OnDeviceInfoRequested(uint16_t conn_handle, uint16_t attr_handle,
- struct ble_gatt_access_ctxt *ctxt);
-
+ int OnServiceData(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt *context);
private:
- static constexpr uint16_t deviceInfoId {0x180a};
- static constexpr uint16_t manufacturerNameId {0x2a29};
- static constexpr uint16_t modelNumberId {0x2a24};
- static constexpr uint16_t serialNumberId {0x2a25};
- static constexpr uint16_t fwRevisionId {0x2a26};
- static constexpr uint16_t hwRevisionId {0x2a27};
-
- static constexpr char* manufacturerName = "Codingfield";
- static constexpr char* modelNumber = "1";
- static constexpr char* serialNumber = "9.8.7.6.5.4";
- static constexpr char* fwRevision = "0.5.0";
- static constexpr char* hwRevision = "1.0.0";
-
- static constexpr ble_uuid16_t deviceInfoUuid {
- .u { .type = BLE_UUID_TYPE_16 },
- .value = deviceInfoId
+ Pinetime::System::SystemTask& systemTask;
+ Pinetime::Controllers::Ble& bleController;
+
+ static constexpr uint16_t dfuServiceId {0x1530};
+ static constexpr uint16_t packetCharacteristicId {0x1532};
+ static constexpr uint16_t controlPointCharacteristicId {0x1531};
+ static constexpr uint16_t revisionCharacteristicId {0x1534};
+
+ uint16_t revision {0x0008};
+
+ static constexpr ble_uuid128_t serviceUuid {
+ .u { .type = BLE_UUID_TYPE_128},
+ .value = {0x23, 0xD1, 0xBC, 0xEA, 0x5F, 0x78, 0x23, 0x15,
+ 0xDE, 0xEF, 0x12, 0x12, 0x30, 0x15, 0x00, 0x00}
};
- static constexpr ble_uuid16_t manufacturerNameUuid {
- .u { .type = BLE_UUID_TYPE_16 },
- .value = manufacturerNameId
+ static constexpr ble_uuid128_t packetCharacteristicUuid {
+ .u { .type = BLE_UUID_TYPE_128},
+ .value = {0x23, 0xD1, 0xBC, 0xEA, 0x5F, 0x78, 0x23, 0x15,
+ 0xDE, 0xEF, 0x12, 0x12, 0x32, 0x15, 0x00, 0x00}
};
- static constexpr ble_uuid16_t modelNumberUuid {
- .u { .type = BLE_UUID_TYPE_16 },
- .value = modelNumberId
+ static constexpr ble_uuid128_t controlPointCharacteristicUuid {
+ .u { .type = BLE_UUID_TYPE_128},
+ .value = {0x23, 0xD1, 0xBC, 0xEA, 0x5F, 0x78, 0x23, 0x15,
+ 0xDE, 0xEF, 0x12, 0x12, 0x31, 0x15, 0x00, 0x00}
};
- static constexpr ble_uuid16_t serialNumberUuid {
- .u { .type = BLE_UUID_TYPE_16 },
- .value = serialNumberId
+ static constexpr ble_uuid128_t revisionCharacteristicUuid {
+ .u { .type = BLE_UUID_TYPE_128},
+ .value = {0x23, 0xD1, 0xBC, 0xEA, 0x5F, 0x78, 0x23, 0x15,
+ 0xDE, 0xEF, 0x12, 0x12, 0x34, 0x15, 0x00, 0x00}
};
- static constexpr ble_uuid16_t fwRevisionUuid {
- .u { .type = BLE_UUID_TYPE_16 },
- .value = fwRevisionId
+ struct ble_gatt_chr_def characteristicDefinition[4];
+ struct ble_gatt_svc_def serviceDefinition[2];
+ uint16_t packetCharacteristicHandle;
+ uint16_t controlPointCharacteristicHandle;
+ uint16_t revisionCharacteristicHandle;
+
+ enum class States : uint8_t {Idle, Init, Start, Data, Validate, Validated};
+ States state = States::Idle;
+
+ enum class ImageTypes : uint8_t {
+ NoImage = 0x00,
+ SoftDevice = 0x01,
+ Bootloader = 0x02,
+ SoftDeviceAndBootloader = 0x03,
+ Application = 0x04
};
- static constexpr ble_uuid16_t hwRevisionUuid {
- .u {.type = BLE_UUID_TYPE_16},
- .value = hwRevisionId
+ enum class Opcodes : uint8_t {
+ StartDFU = 0x01,
+ InitDFUParameters = 0x02,
+ ReceiveFirmwareImage = 0x03,
+ ValidateFirmware = 0x04,
+ ActivateImageAndReset = 0x05,
+ PacketReceiptNotificationRequest = 0x08,
+ Response = 0x10,
+ PacketReceiptNotification = 0x11
};
- struct ble_gatt_chr_def characteristicDefinition[6];
- struct ble_gatt_svc_def serviceDefinition[2];
+ enum class ErrorCodes { NoError = 0x01};
+ uint8_t nbPacketsToNotify = 0;
+ uint32_t nbPacketReceived = 0;
+ uint32_t bytesReceived = 0;
+ int SendDfuRevision(os_mbuf *om) const;
+ void SendNotification(uint16_t connectionHandle, const uint8_t *data, const size_t size);
+ int WritePacketHandler(uint16_t connectionHandle, os_mbuf *om);
+ int ControlPointHandler(uint16_t connectionHandle, os_mbuf *om);
};
}
} \ No newline at end of file
diff --git a/src/Components/Ble/NimbleController.cpp b/src/Components/Ble/NimbleController.cpp
index 64ec379d..23bd3e2f 100644
--- a/src/Components/Ble/NimbleController.cpp
+++ b/src/Components/Ble/NimbleController.cpp
@@ -29,6 +29,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
bleController{bleController},
dateTimeController{dateTimeController},
notificationManager{notificationManager},
+ dfuService{systemTask, bleController},
currentTimeClient{dateTimeController},
alertNotificationClient{systemTask, notificationManager} {
@@ -73,7 +74,7 @@ void NimbleController::Init() {
ble_svc_gatt_init();
deviceInformationService.Init();
- currentTimeClient.Init();
+ dfuService.Init();
int res;
res = ble_hs_util_ensure_addr(0);
ASSERT(res == 0);
@@ -110,8 +111,9 @@ void NimbleController::StartAdvertising() {
// fields.uuids128 = BLE_UUID128(BLE_UUID128_DECLARE(
// 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
// 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff));
- fields.num_uuids128 = 0;
- fields.uuids128_is_complete = 0;;
+ fields.uuids128 = &dfuServiceUuid;
+ fields.num_uuids128 = 1;
+ fields.uuids128_is_complete = 1;
fields.tx_pwr_lvl = BLE_HS_ADV_TX_PWR_LVL_AUTO;
rsp_fields.name = (uint8_t *)"Pinetime-JF";
@@ -159,8 +161,9 @@ int NimbleController::OnGAPEvent(ble_gap_event *event) {
bleController.Disconnect();
} else {
bleController.Connect();
+ systemTask.PushMessage(Pinetime::System::SystemTask::Messages::BleConnected);
connectionHandle = event->connect.conn_handle;
- ble_gattc_disc_all_svcs(connectionHandle, OnAllSvrDisco, this);
+ // Service discovery is deffered via systemtask
}
}
break;
@@ -169,6 +172,7 @@ int NimbleController::OnGAPEvent(ble_gap_event *event) {
NRF_LOG_INFO("disconnect; reason=%d", event->disconnect.reason);
/* Connection terminated; resume advertising. */
+ connectionHandle = BLE_HS_CONN_HANDLE_NONE;
bleController.Disconnect();
StartAdvertising();
break;
@@ -234,7 +238,7 @@ int NimbleController::OnGAPEvent(ble_gap_event *event) {
/* Attribute data is contained in event->notify_rx.attr_data. */
default:
- NRF_LOG_INFO("Advertising event : %d", event->type);
+// NRF_LOG_INFO("Advertising event : %d", event->type);
break;
}
return 0;
@@ -251,7 +255,6 @@ int NimbleController::OnDiscoveryEvent(uint16_t i, const ble_gatt_error *error,
ble_gattc_disc_all_chrs(connectionHandle, alertNotificationClient.StartHandle(), alertNotificationClient.EndHandle(),
AlertNotificationCharacteristicDiscoveredCallback, this);
}
- return 0;
}
alertNotificationClient.OnDiscoveryEvent(i, error, service);
@@ -298,6 +301,10 @@ int NimbleController::OnANSDescriptorDiscoveryEventCallback(uint16_t connectionH
return alertNotificationClient.OnDescriptorDiscoveryEventCallback(connectionHandle, error, characteristicValueHandle, descriptor);
}
+void NimbleController::StartDiscovery() {
+ ble_gattc_disc_all_svcs(connectionHandle, OnAllSvrDisco, this);
+}
+
diff --git a/src/Components/Ble/NimbleController.h b/src/Components/Ble/NimbleController.h
index 99e0c811..c4922bae 100644
--- a/src/Components/Ble/NimbleController.h
+++ b/src/Components/Ble/NimbleController.h
@@ -4,6 +4,7 @@
#include "AlertNotificationClient.h"
#include "DeviceInformationService.h"
#include "CurrentTimeClient.h"
+#include "DfuService.h"
#include <host/ble_gap.h>
namespace Pinetime {
@@ -25,18 +26,27 @@ namespace Pinetime {
int OnCurrentTimeReadResult(uint16_t connectionHandle, const ble_gatt_error *error, ble_gatt_attr *attribute);
int OnANSDescriptorDiscoveryEventCallback(uint16_t connectionHandle, const ble_gatt_error *error,
uint16_t characteristicValueHandle, const ble_gatt_dsc *descriptor);
+
+ void StartDiscovery();
private:
static constexpr char* deviceName = "Pinetime-JF";
Pinetime::System::SystemTask& systemTask;
Pinetime::Controllers::Ble& bleController;
DateTime& dateTimeController;
Pinetime::Controllers::NotificationManager& notificationManager;
+ Pinetime::Controllers::DfuService dfuService;
DeviceInformationService deviceInformationService;
CurrentTimeClient currentTimeClient;
AlertNotificationClient alertNotificationClient;
uint8_t addrType;
uint16_t connectionHandle;
+
+ ble_uuid128_t dfuServiceUuid {
+ .u { .type = BLE_UUID_TYPE_128},
+ .value = {0x23, 0xD1, 0xBC, 0xEA, 0x5F, 0x78, 0x23, 0x15,
+ 0xDE, 0xEF, 0x12, 0x12, 0x30, 0x15, 0x00, 0x00}
+ };
};
}
}
diff --git a/src/DisplayApp/DisplayApp.cpp b/src/DisplayApp/DisplayApp.cpp
index 1b4515e0..c42639c7 100644
--- a/src/DisplayApp/DisplayApp.cpp
+++ b/src/DisplayApp/DisplayApp.cpp
@@ -16,6 +16,7 @@
#include <DisplayApp/Screens/Brightness.h>
#include <DisplayApp/Screens/ScreenList.h>
#include <Components/Ble/NotificationManager.h>
+#include <DisplayApp/Screens/FirmwareUpdate.h>
#include "../SystemTask/SystemTask.h"
using namespace Pinetime::Applications;
@@ -158,6 +159,17 @@ void DisplayApp::Refresh() {
// }
break;
+ case Messages::BleFirmwareUpdateStarted:
+ lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
+ currentScreen.reset(nullptr);
+ currentScreen.reset(new Screens::FirmwareUpdate(this, bleController));
+
+ break;
+ case Messages::BleFirmwareUpdateFinished:
+ lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
+ currentScreen.reset(nullptr);
+ currentScreen.reset(new Screens::Clock(this, dateTimeController, batteryController, bleController));
+ break;
}
}
}
diff --git a/src/DisplayApp/DisplayApp.h b/src/DisplayApp/DisplayApp.h
index 09f0d1cd..b45a0bee 100644
--- a/src/DisplayApp/DisplayApp.h
+++ b/src/DisplayApp/DisplayApp.h
@@ -30,7 +30,7 @@ namespace Pinetime {
public:
enum class States {Idle, Running};
enum class Messages : uint8_t {GoToSleep, GoToRunning, UpdateDateTime, UpdateBleConnection, UpdateBatteryLevel, TouchEvent, SwitchScreen,ButtonPushed,
- NewNotification
+ NewNotification, BleFirmwareUpdateStarted, BleFirmwareUpdateFinished
};
enum class FullRefreshDirections { None, Up, Down };
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.cpp b/src/DisplayApp/Screens/FirmwareUpdate.cpp
new file mode 100644
index 00000000..f3cf42f9
--- /dev/null
+++ b/src/DisplayApp/Screens/FirmwareUpdate.cpp
@@ -0,0 +1,49 @@
+#include <libs/lvgl/lvgl.h>
+#include "FirmwareUpdate.h"
+#include "../DisplayApp.h"
+
+using namespace Pinetime::Applications::Screens;
+extern lv_font_t jetbrains_mono_extrabold_compressed;
+extern lv_font_t jetbrains_mono_bold_20;
+
+
+FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Ble& bleController) :
+ Screen(app), bleController{bleController} {
+
+ titleLabel = lv_label_create(lv_scr_act(), NULL);
+ lv_label_set_text(titleLabel, "Firmware update");
+ lv_obj_set_auto_realign(titleLabel, true);
+ lv_obj_align(titleLabel, NULL, LV_ALIGN_IN_TOP_MID, 0, 50);
+
+ bar1 = lv_bar_create(lv_scr_act(), NULL);
+ lv_obj_set_size(bar1, 200, 30);
+ lv_obj_align(bar1, NULL, LV_ALIGN_CENTER, 0, 0);
+ lv_bar_set_anim_time(bar1, 10);
+ lv_bar_set_range(bar1, 0, 100);
+ lv_bar_set_value(bar1, 0, LV_ANIM_OFF);
+
+ percentLabel = lv_label_create(lv_scr_act(), NULL);
+ lv_label_set_text(percentLabel, "");
+ lv_obj_set_auto_realign(percentLabel, true);
+ lv_obj_align(percentLabel, bar1, LV_ALIGN_OUT_TOP_MID, 0, 60);
+}
+
+FirmwareUpdate::~FirmwareUpdate() {
+ lv_obj_clean(lv_scr_act());
+}
+
+bool FirmwareUpdate::Refresh() {
+ float current = bleController.FirmwareUpdateCurrentBytes() / 1024.0f;
+ float total = bleController.FirmwareUpdateTotalBytes() / 1024.0f;
+ int16_t pc = (current / total) * 100.0f;
+ sprintf(percentStr, "%d %%", pc);
+ lv_label_set_text(percentLabel, percentStr);
+
+ lv_bar_set_value(bar1, pc, LV_ANIM_OFF);
+ return running;
+}
+
+bool FirmwareUpdate::OnButtonPushed() {
+ running = false;
+ return true;
+}
diff --git a/src/DisplayApp/Screens/FirmwareUpdate.h b/src/DisplayApp/Screens/FirmwareUpdate.h
new file mode 100644
index 00000000..a4cbec62
--- /dev/null
+++ b/src/DisplayApp/Screens/FirmwareUpdate.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <cstdint>
+#include <chrono>
+#include <Components/Gfx/Gfx.h>
+#include "Screen.h"
+#include <bits/unique_ptr.h>
+#include <libs/lvgl/src/lv_core/lv_style.h>
+#include <libs/lvgl/src/lv_core/lv_obj.h>
+#include <Components/Battery/BatteryController.h>
+#include <Components/Ble/BleController.h>
+#include "../Fonts/lcdfont14.h"
+#include "../Fonts/lcdfont70.h"
+#include "../../Version.h"
+
+namespace Pinetime {
+ namespace Applications {
+ namespace Screens {
+
+ class FirmwareUpdate : public Screen{
+ public:
+ FirmwareUpdate(DisplayApp* app, Pinetime::Controllers::Ble& bleController);
+ ~FirmwareUpdate() override;
+
+ bool Refresh() override;
+ bool OnButtonPushed() override;
+
+ private:
+ Pinetime::Controllers::Ble& bleController;
+ lv_obj_t * bar1;
+ lv_obj_t * percentLabel;
+ lv_obj_t * titleLabel;
+ char percentStr[10];
+ bool running = true;
+
+ };
+ }
+ }
+}
diff --git a/src/SystemTask/SystemTask.cpp b/src/SystemTask/SystemTask.cpp
index fc37ecb2..30ea568b 100644
--- a/src/SystemTask/SystemTask.cpp
+++ b/src/SystemTask/SystemTask.cpp
@@ -100,9 +100,31 @@ void SystemTask::Work() {
case Messages::OnNewNotification:
displayApp->PushMessage(Pinetime::Applications::DisplayApp::Messages::NewNotification);
break;
+ case Messages::BleConnected:
+ isBleDiscoveryTimerRunning = true;
+ bleDiscoveryTimer = 5;
+ break;
+ case Messages::BleFirmwareUpdateStarted:
+ displayApp->PushMessage(Pinetime::Applications::DisplayApp::Messages::BleFirmwareUpdateStarted);
+ break;
+ case Messages::BleFirmwareUpdateFinished:
+ displayApp->PushMessage(Pinetime::Applications::DisplayApp::Messages::BleFirmwareUpdateFinished);
+ break;
default: break;
}
}
+
+ if(isBleDiscoveryTimerRunning) {
+ if(bleDiscoveryTimer == 0) {
+ isBleDiscoveryTimerRunning = false;
+ // Services discovery is deffered from 3 seconds to avoid the conflicts between the host communicating with the
+ // tharget and vice-versa. I'm not sure if this is the right way to handle this...
+ nimbleController.StartDiscovery();
+ } else {
+ bleDiscoveryTimer--;
+ }
+ }
+
uint32_t systick_counter = nrf_rtc_counter_get(portNRF_RTC_REG);
dateTimeController.UpdateTime(systick_counter);
batteryController.Update();
diff --git a/src/SystemTask/SystemTask.h b/src/SystemTask/SystemTask.h
index 5eba391b..d3498c1f 100644
--- a/src/SystemTask/SystemTask.h
+++ b/src/SystemTask/SystemTask.h
@@ -14,7 +14,8 @@ namespace Pinetime {
namespace System {
class SystemTask {
public:
- enum class Messages {GoToSleep, GoToRunning, OnNewTime, OnNewNotification
+ enum class Messages {GoToSleep, GoToRunning, OnNewTime, OnNewNotification, BleConnected,
+ BleFirmwareUpdateStarted, BleFirmwareUpdateFinished
};
SystemTask(Drivers::SpiMaster &spi, Drivers::St7789 &lcd, Drivers::Cst816S &touchPanel,
@@ -58,7 +59,8 @@ namespace Pinetime {
static void Process(void* instance);
void Work();
-
+ bool isBleDiscoveryTimerRunning = false;
+ uint8_t bleDiscoveryTimer = 0;
};
}
diff --git a/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h b/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h
index 6119ecfa..983f419f 100644
--- a/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h
+++ b/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h
@@ -14,7 +14,7 @@
#define BLE_HS_LOG_INFO(...) NRF_LOG_INFO(__VA_ARGS__)
#define BLE_HS_LOG_WARN(...) NRF_LOG_WARNING( __VA_ARGS__)
#define BLE_HS_LOG_ERROR(...) NRF_LOG_ERROR(__VA_ARGS__)
-#define BLE_HS_LOG_CRITICAL(...) MODLOG_CRITICAL(4, __VA_ARGS__)
+#define BLE_HS_LOG_CRITICAL(...) NRF_LOG_ERROR(__VA_ARGS__)
#define BLE_HS_LOG_DISABLED(...) MODLOG_DISABLED(4, __VA_ARGS__)
#endif
#if 0
diff --git a/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h b/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h
index d4913caf..d06056eb 100644
--- a/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h
+++ b/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h
@@ -460,7 +460,7 @@
/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-core/kernel/os) */
#ifndef MYNEWT_VAL_MSYS_1_BLOCK_COUNT
-#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (5)
+#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (12)
#endif
/* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-core/kernel/os) */
diff --git a/src/sdk_config.h b/src/sdk_config.h
index 244b21bd..a63eb6fb 100644
--- a/src/sdk_config.h
+++ b/src/sdk_config.h
@@ -8460,15 +8460,15 @@
// <e> NRF_LOG_ENABLED - nrf_log - Logger
//==========================================================
#ifndef NRF_LOG_ENABLED
-#define NRF_LOG_ENABLED 1
+#define NRF_LOG_ENABLED 0
#endif
#ifndef NRF_LOG_BACKEND_RTT_ENABLED
-#define NRF_LOG_BACKEND_RTT_ENABLED 1
+#define NRF_LOG_BACKEND_RTT_ENABLED 0
#endif
#ifndef NRF_LOG_BACKEND_SERIAL_USES_RTT
-#define NRF_LOG_BACKEND_SERIAL_USES_RTT 1
+#define NRF_LOG_BACKEND_SERIAL_USES_RTT 0
#endif
// <h> Log message pool - Configuration of log message pool
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 20:31:49 +0000