From 0d33fa36c44ca4941904e42d96ddc03dcd38abba Mon Sep 17 00:00:00 2001 From: Roy_01 Date: Wed, 11 Dec 2024 11:02:15 +0800 Subject: [PATCH] updated: add global_memoryboard_id --- pel.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pel.c b/pel.c index 7e9177a..678c051 100644 --- a/pel.c +++ b/pel.c @@ -38,6 +38,7 @@ static bool event_char_notify_running; TaskHandle_t test_gpio_task_Handle = NULL; static pel_output_t output_data = { 0 }; static resistor_combination_t global_resis = { 0 }; +uint8_t global_memoryboard_id = 0xFF; const input_pin_t input_pin_tab[] = { { 0.5, INPUT_1_PIN, PEL_0P5R_MASK}, @@ -291,8 +292,8 @@ pel_output_t pel_smaple_and_convt_all(uint32_t measure_out, uint32_t load_mask) #define VERSION_DATE_YEAR 24 #define VERSION_DATE_MONTH 12 #define VERSION_DATE_DAY 11 -#define VERSION_DATE_HOUR 10 -#define VERSION_DATE_MINUTE 17 +#define VERSION_DATE_HOUR 11 +#define VERSION_DATE_MINUTE 2 static void cis_version(uint8_t *ins, uint16_t size) { NRF_LOG_INFO("%s", __FUNCTION__); @@ -540,7 +541,7 @@ static void start_data_char_notify_task(void *p_arg) { if (first_data) { - packet_buf.mem_board_id = 5; + packet_buf.mem_board_id = global_memoryboard_id; packet_buf.notify_time = xTaskGetTickCount(); packet_buf.packet_seq = 0; packet_buf.val_1 = 0; @@ -559,7 +560,7 @@ static void start_data_char_notify_task(void *p_arg) } else { - packet_buf.mem_board_id = 5; + packet_buf.mem_board_id = global_memoryboard_id; packet_buf.notify_time = xTaskGetTickCount(); packet_buf.packet_seq += 1; packet_buf.val_1 += 1; @@ -741,7 +742,7 @@ static void start_event_char_notify_task(void *p_arg) { if (first_data) { - packet_buf.mem_board_id = 5; + packet_buf.mem_board_id = global_memoryboard_id; packet_buf.notify_time = xTaskGetTickCount(); packet_buf.packet_seq = 0; packet_buf.val_1 = 1; @@ -760,7 +761,7 @@ static void start_event_char_notify_task(void *p_arg) } else { - packet_buf.mem_board_id = 5; + packet_buf.mem_board_id = global_memoryboard_id; packet_buf.notify_time = xTaskGetTickCount(); packet_buf.packet_seq += 1; packet_buf.val_1 += 1; @@ -878,6 +879,8 @@ static void dev_mode(uint8_t *ins, uint16_t size) uint8_t param[]; } *p_ins = (void *)ins; + global_memoryboard_id = p_ins->id; + switch (p_ins->func_id) { case 0x00: