GitHub/EPD-nRF5
1
0
Fork 0
mirror of https://github.com/tsl0922/EPD-nRF5.git synced 2025-12-06 15:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

add version characteristic

Browse Source
This commit is contained in:
Shuanglei Tao
2025-05-10 21:29:06 +08:00
parent 4d040502f9
commit 883d2f918a
3 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
EPD/EPD_service.c
View File

@@ -263,6 +263,7 @@ static uint32_t epd_service_init(ble_epd_t * p_epd)
ble_uuid_t ble_uuid = {0};
ble_uuid128_t base_uuid = BLE_UUID_EPD_SVC_BASE;
ble_add_char_params_t add_char_params;
uint8_t app_version = APP_VERSION;
VERIFY_SUCCESS(sd_ble_uuid_vs_add(&base_uuid, &ble_uuid.type));
@@ -285,7 +286,18 @@ static uint32_t epd_service_init(ble_epd_t * p_epd)
add_char_params.write_access = SEC_OPEN;
add_char_params.cccd_write_access = SEC_OPEN;
return characteristic_add(p_epd->service_handle, &add_char_params, &p_epd->char_handles);
VERIFY_SUCCESS(characteristic_add(p_epd->service_handle, &add_char_params, &p_epd->char_handles));
memset(&add_char_params, 0, sizeof(add_char_params));
add_char_params.uuid = BLE_UUID_APP_VER;
add_char_params.uuid_type = ble_uuid.type;
add_char_params.max_len = sizeof(uint8_t);
add_char_params.init_len = sizeof(uint8_t);
add_char_params.p_init_value = &app_version;
add_char_params.char_props.read = 1;
add_char_params.read_access = SEC_OPEN;
return characteristic_add(p_epd->service_handle, &add_char_params, &p_epd->app_ver_handles);
}
void ble_epd_sleep_prepare(ble_epd_t * p_epd)

30
EPD/EPD_service.h
View File

@@ -43,10 +43,13 @@ void ble_epd_evt_handler(ble_evt_t const * p_ble_evt, void * p_context);
#define BLE_EPD_DEF(_name) static ble_epd_t _name;
#endif
#define APP_VERSION 0x16
#define BLE_UUID_EPD_SVC_BASE {{0XEC, 0X5A, 0X67, 0X1C, 0XC1, 0XB6, 0X46, 0XFB, \
0X8D, 0X91, 0X28, 0XD8, 0X22, 0X36, 0X75, 0X62}}
#define BLE_UUID_EPD_SVC 0x0001
#define BLE_UUID_EPD_CHAR 0x0002
#define BLE_UUID_APP_VER 0x0003
#define EPD_SVC_UUID_TYPE BLE_UUID_TYPE_VENDOR_BEGIN
@@ -59,20 +62,20 @@ void ble_epd_evt_handler(ble_evt_t const * p_ble_evt, void * p_context);
/**< EPD Service command IDs. */
enum EPD_CMDS
{
EPD_CMD_SET_PINS, /**< set EPD pin mapping. */
EPD_CMD_INIT, /**< init EPD display driver */
EPD_CMD_CLEAR, /**< clear EPD screen */
EPD_CMD_SEND_COMMAND, /**< send command to EPD */
EPD_CMD_SEND_DATA, /**< send data to EPD */
EPD_CMD_REFRESH, /**< diaplay EPD ram on screen */
EPD_CMD_SLEEP, /**< EPD enter sleep mode */
EPD_CMD_SET_TIME = 0x20, /** < set time with unix timestamp */
EPD_CMD_SET_PINS = 0x00, /**< set EPD pin mapping. */
EPD_CMD_INIT = 0x01, /**< init EPD display driver */
EPD_CMD_CLEAR = 0x02, /**< clear EPD screen */
EPD_CMD_SEND_COMMAND = 0x03, /**< send command to EPD */
EPD_CMD_SEND_DATA = 0x04, /**< send data to EPD */
EPD_CMD_REFRESH = 0x05, /**< diaplay EPD ram on screen */
EPD_CMD_SLEEP = 0x06, /**< EPD enter sleep mode */
EPD_CMD_SET_CONFIG = 0x90, /**< set full EPD config */
EPD_CMD_SYS_RESET = 0x91, /**< MCU reset */
EPD_CMD_SYS_SLEEP = 0x92, /**< MCU enter sleep mode */
EPD_CMD_CFG_ERASE = 0x99, /**< Erase config and reset */
EPD_CMD_SET_TIME = 0x20, /** < set time with unix timestamp */
EPD_CMD_SET_CONFIG = 0x90, /**< set full EPD config */
EPD_CMD_SYS_RESET = 0x91, /**< MCU reset */
EPD_CMD_SYS_SLEEP = 0x92, /**< MCU enter sleep mode */
EPD_CMD_CFG_ERASE = 0x99, /**< Erase config and reset */
};
/**@brief EPD Service structure.
@@ -83,6 +86,7 @@ typedef struct
{
uint16_t service_handle; /**< Handle of EPD Service (as provided by the S110 SoftDevice). */
ble_gatts_char_handles_t char_handles; /**< Handles related to the EPD characteristic (as provided by the SoftDevice). */
ble_gatts_char_handles_t app_ver_handles; /**< Handles related to the APP version characteristic (as provided by the SoftDevice). */
uint16_t conn_handle; /**< Handle of the current connection (as provided by the SoftDevice). BLE_CONN_HANDLE_INVALID if not in a connection. */
uint16_t max_data_len; /**< Maximum length of data (in bytes) that can be transmitted to the peer */
bool is_notification_enabled; /**< Variable to indicate if the peer has enabled notification of the RX characteristic.*/

12
html/js/main.js
View File

@@ -1,6 +1,6 @@
let bleDevice, gattServer;
let epdService, epdCharacteristic;
let startTime, msgIndex;
let startTime, msgIndex, appVersion;
let canvas, ctx, textDecoder;
const EpdCmd = {
@@ -231,6 +231,16 @@ async function connect() {
return;
}
try {
const versionCharacteristic = await epdService.getCharacteristic('62750003-d828-918d-fb46-b6c11c675aec');
const versionData = await versionCharacteristic.readValue();
appVersion = versionData.getUint8(0);
addLog(`固件版本: 0x${appVersion.toString(16)}`);
} catch (e) {
console.error(e);
appVersion = 0x15;
}
try {
await epdCharacteristic.startNotifications();
epdCharacteristic.addEventListener('characteristicvaluechanged', (event) => {