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

Increase max size of notification message to 100 char.

Browse Source 
Fix bug in message handling that would ignore the last character of the notification.
This commit is contained in:
JF 2020-10-21 17:31:56 +02:00
parent ef5670c7e0
commit 440ae412b9
6 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(pinetime VERSION 0.8.2 LANGUAGES C CXX ASM) project(pinetime VERSION 0.9.0 LANGUAGES C CXX ASM)
set(NRF_TARGET "nrf52") set(NRF_TARGET "nrf52")

25
src/components/ble/AlertNotificationClient.cpp
View File

@ -105,25 +105,18 @@ int AlertNotificationClient::OnDescriptorDiscoveryEventCallback(uint16_t connect
void AlertNotificationClient::OnNotification(ble_gap_event *event) { void AlertNotificationClient::OnNotification(ble_gap_event *event) {
if(event->notify_rx.attr_handle == newAlertHandle) { if(event->notify_rx.attr_handle == newAlertHandle) {
// TODO implement this with more memory safety (and constexpr) static constexpr size_t stringTerminatorSize{1}; // end of string '\0'
static const size_t maxBufferSize{21}; static constexpr size_t headerSize{3};
static const size_t maxMessageSize{18}; const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
size_t bufferSize = min(OS_MBUF_PKTLEN(event->notify_rx.om), maxBufferSize); const auto maxBufferSize{maxMessageSize + headerSize};
uint8_t data[bufferSize]; size_t bufferSize = min(OS_MBUF_PKTLEN(event->notify_rx.om) + stringTerminatorSize, maxBufferSize);
os_mbuf_copydata(event->notify_rx.om, 0, bufferSize, data); char *message = (char *)(&event->notify_rx.om[headerSize]);
auto messageSize = min(maxMessageSize, (bufferSize-headerSize));
char *s = (char *) &data[3]; message[messageSize-1] = '\0';
auto messageSize = min(maxMessageSize, (bufferSize-3));
for (uint i = 0; i < messageSize-1; i++) { notificationManager.Push(Pinetime::Controllers::NotificationManager::Categories::SimpleAlert, message, messageSize);
if (s[i] == 0x00) {
s[i] = 0x0A;
}
}
s[messageSize-1] = '\0';
notificationManager.Push(Pinetime::Controllers::NotificationManager::Categories::SimpleAlert, s, messageSize);
systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification); systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
} }
} }

32
src/components/ble/AlertNotificationService.cpp
View File

@ -38,7 +38,7 @@ AlertNotificationService::AlertNotificationService ( System::SystemTask& systemT
0 0
} }
}, },
serviceDefinition{ serviceDefinition{
{ {
/* Device Information Service */ /* Device Information Service */
.type = BLE_GATT_SVC_TYPE_PRIMARY, .type = BLE_GATT_SVC_TYPE_PRIMARY,
@ -48,33 +48,25 @@ AlertNotificationService::AlertNotificationService ( System::SystemTask& systemT
{ {
0 0
}, },
}, m_systemTask{systemTask}, m_notificationManager{notificationManager} { }, systemTask{systemTask}, notificationManager{notificationManager} {
} }
int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle, int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle,
struct ble_gatt_access_ctxt *ctxt) { struct ble_gatt_access_ctxt *ctxt) {
if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) { if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
// TODO implement this with more memory safety (and constexpr) static constexpr size_t stringTerminatorSize{1}; // end of string '\0'
static const size_t maxBufferSize{21}; static constexpr size_t headerSize{3};
static const size_t maxMessageSize{18}; const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
size_t bufferSize = min(OS_MBUF_PKTLEN(ctxt->om), maxBufferSize); const auto maxBufferSize{maxMessageSize + headerSize};
uint8_t data[bufferSize]; size_t bufferSize = min(OS_MBUF_PKTLEN(ctxt->om) + stringTerminatorSize, maxBufferSize);
os_mbuf_copydata(ctxt->om, 0, bufferSize, data); char *message = (char *)(&ctxt->om->om_data[headerSize]);
auto messageSize = min(maxMessageSize, (bufferSize-headerSize));
char *s = (char *) &data[3]; message[messageSize-1] = '\0';
auto messageSize = min(maxMessageSize, (bufferSize-3));
for (uint i = 0; i < messageSize-1; i++) { notificationManager.Push(Pinetime::Controllers::NotificationManager::Categories::SimpleAlert, message, messageSize);
if (s[i] == 0x00) { systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
s[i] = 0x0A;
}
}
s[messageSize-1] = '\0';
m_notificationManager.Push(Pinetime::Controllers::NotificationManager::Categories::SimpleAlert, s, messageSize);
m_systemTask.PushMessage(Pinetime::System::SystemTask::Messages::OnNewNotification);
} }
return 0; return 0;
} }

4
src/components/ble/AlertNotificationService.h
View File

@ -32,8 +32,8 @@ namespace Pinetime {
struct ble_gatt_chr_def characteristicDefinition[2]; struct ble_gatt_chr_def characteristicDefinition[2];
struct ble_gatt_svc_def serviceDefinition[2]; struct ble_gatt_svc_def serviceDefinition[2];
Pinetime::System::SystemTask &m_systemTask; Pinetime::System::SystemTask &systemTask;
NotificationManager &m_notificationManager; NotificationManager &notificationManager;
}; };
} }
} }

5
src/components/ble/NotificationManager.cpp
View File

@ -4,10 +4,13 @@
using namespace Pinetime::Controllers; using namespace Pinetime::Controllers;
constexpr uint8_t NotificationManager::MessageSize;
void NotificationManager::Push(Pinetime::Controllers::NotificationManager::Categories category, void NotificationManager::Push(Pinetime::Controllers::NotificationManager::Categories category,
const char *message, uint8_t currentMessageSize) { const char *message, uint8_t currentMessageSize) {
// TODO handle edge cases on read/write index // TODO handle edge cases on read/write index
auto checkedSize = std::min(currentMessageSize, uint8_t{18}); auto checkedSize = std::min(currentMessageSize, MessageSize);
auto& notif = notifications[writeIndex]; auto& notif = notifications[writeIndex];
std::memcpy(notif.message.data(), message, checkedSize); std::memcpy(notif.message.data(), message, checkedSize);
notif.message[checkedSize] = '\0'; notif.message[checkedSize] = '\0';

3
src/components/ble/NotificationManager.h
View File

@ -8,7 +8,7 @@ namespace Pinetime {
class NotificationManager { class NotificationManager {
public: public:
enum class Categories {Unknown, SimpleAlert, Email, News, IncomingCall, MissedCall, Sms, VoiceMail, Schedule, HighProriotyAlert, InstantMessage }; enum class Categories {Unknown, SimpleAlert, Email, News, IncomingCall, MissedCall, Sms, VoiceMail, Schedule, HighProriotyAlert, InstantMessage };
static constexpr uint8_t MessageSize{18}; static constexpr uint8_t MessageSize{100};
struct Notification { struct Notification {
using Id = uint8_t; using Id = uint8_t;
@ -28,6 +28,7 @@ namespace Pinetime {
bool ClearNewNotificationFlag(); bool ClearNewNotificationFlag();
bool AreNewNotificationsAvailable(); bool AreNewNotificationsAvailable();
static constexpr uint8_t MaximumMessageSize() { return MessageSize; };
private: private:
Notification::Id GetNextId(); Notification::Id GetNextId();