From 0942f592f3c033983c4ccaba6d632bbf80611abb Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 21 五月 2025 14:29:55 +0800
Subject: [PATCH] 上传格式正确，但电量未采集版本，未加入蓝牙与mk和mk和lora和网关同步修改配置逻辑，测距稳定能用基础版本
---
keil/include/drivers/mk_misc.c | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/keil/include/drivers/mk_misc.c b/keil/include/drivers/mk_misc.c
index 5eb2565..ef10f07 100644
--- a/keil/include/drivers/mk_misc.c
+++ b/keil/include/drivers/mk_misc.c
@@ -389,7 +389,24 @@
// reboot
reset_module(RESET_MODULE_REBOOT);
}
-
+void delay_US(uint32_t nTimer)
+{
+ uint32_t i=0;
+ for(i=0;i<nTimer;i++){
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();__NOP();
+ __NOP();__NOP();__NOP();__NOP();
+ }
+}
+void delay_ms(uint32_t nTimer)
+{
+ uint32_t i=1000*nTimer;
+ delay_US(i);
+}
void delay_us(uint32_t cnt)
{
#define SYSTEM_CLOCK_MHZ 62.4
@@ -425,9 +442,9 @@
"bhi loop%=\n"
"pop {r4,r5}\n"
"exit%=:\n"
- :
- : [mult_hi] "i"(SYSTEM_CLOCK_MULT_HI), [mult_lo] "i"(SYSTEM_CLOCK_MULT_LO), [shift] "i"(SYSTEM_CLOCK_LSLS_BITS), [adjust] "i"(AAPCS_PREP_CYCLES),
- [decr] "i"(DELAY_LOOP_CYCLES));
+ :
+ : [mult_hi] "i"(SYSTEM_CLOCK_MULT_HI), [mult_lo] "i"(SYSTEM_CLOCK_MULT_LO), [shift] "i"(SYSTEM_CLOCK_LSLS_BITS), [adjust] "i"(AAPCS_PREP_CYCLES),
+ [decr] "i"(DELAY_LOOP_CYCLES));
#if defined(__GNUC__) && !defined(__ARMCC_VERSION)
__asm volatile(".syntax divided\n");
--
Gitblit v1.9.3