From c1ebd22f4b9282682ac11891a9f0fea9c3e6ac8c Mon Sep 17 00:00:00 2001 From: tianjialong Date: Fri, 17 Mar 2023 19:51:53 +0800 Subject: [PATCH] update --- MDK-ARM/LWIP.uvguix.29643 | 2 +- usersrc/encoder.c | 10 ++++++++++ usersrc/encoder.h | 1 + usersrc/usermain.c | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/MDK-ARM/LWIP.uvguix.29643 b/MDK-ARM/LWIP.uvguix.29643 index 202d179..2fa8e18 100644 --- a/MDK-ARM/LWIP.uvguix.29643 +++ b/MDK-ARM/LWIP.uvguix.29643 @@ -1822,7 +1822,7 @@ Build 968 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000044C57495096000000000000000100044C574950000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000044C57495096000000000000000100044C574950000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 diff --git a/usersrc/encoder.c b/usersrc/encoder.c index ca15201..7c31cca 100644 --- a/usersrc/encoder.c +++ b/usersrc/encoder.c @@ -299,3 +299,13 @@ void encoder_switch_toggle_on_off_state(encoder_usage_t encoder) // error } } + +void encoder_data_acquisition_schedule(void) +{ + static uint32_t acquisition_lastprocess; + if (sys_haspassedms(acquisition_lastprocess) > 1) + { + acquisition_lastprocess = HAL_GetTick(); + printf("acquisition_lastprocess:%d\r\n", acquisition_lastprocess); + } +} diff --git a/usersrc/encoder.h b/usersrc/encoder.h index bd9bfd8..816d5b4 100644 --- a/usersrc/encoder.h +++ b/usersrc/encoder.h @@ -44,3 +44,4 @@ void encoder_switch_encoder_clear_count_and_structer_count(encoder_usage_t encod void encoder_light_switch_set_color_and_brightness(encoder_usage_t encoder, encoder_light_color_table_t color, uint16_t brightness); void encoder_switch_close_light(encoder_usage_t encoder); void encoder_switch_toggle_on_off_state(encoder_usage_t encoder); +void encoder_data_acquisition_schedule(void); diff --git a/usersrc/usermain.c b/usersrc/usermain.c index 24099fb..e30c8bd 100644 --- a/usersrc/usermain.c +++ b/usersrc/usermain.c @@ -117,7 +117,7 @@ void user_main() at_cmd_processer_try_process_data(); encoder_light_schedule(); port_do_debug_light_state(); - + // encoder_data_acquisition_schedule(); osDelay(1); } }