diff --git a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/timer.c b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/timer.c index a157dc11a..a13523237 100644 --- a/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/timer.c +++ b/APP_Framework/Framework/transform_layer/xizi/user_api/posix_support/timer.c @@ -107,12 +107,13 @@ int timer_settime(timer_t timerid, int flags, const struct itimerspec *restrict //reference from RTT /* calculate timer period(tick); To avoid lost of accuracy, because "TICK_PER_SECOND" maybe 100, 1000, 1024 and so on. * - * tick nanosecond nanosecond * TICK_PER_SECOND + * tick millisecond millisecond * TICK_PER_SECOND * ------------------------- = -------------------------- ---> tick = ------------------------------------- - * TICK_PER_SECOND NANOSECOND_PER_SECOND NANOSECOND_PER_SECOND + * TICK_PER_SECOND MILLISECOND_PER_SECOND MILLISECOND_PER_SECOND * */ - uint32_t ticks = (value->it_interval.tv_sec * TICK_PER_SECOND) + (value->it_interval.tv_nsec / 1000000000) * TICK_PER_SECOND; + uint32_t ms_value = value->it_interval.tv_nsec / 1000000; + uint32_t ticks = (value->it_interval.tv_sec * TICK_PER_SECOND) + (ms_value * TICK_PER_SECOND) / 1000; UserTimerModify(timerid, ticks); diff --git a/APP_Framework/lib/lorawan/lora_radio_driver b/APP_Framework/lib/lorawan/lora_radio_driver index a400879b1..be37aa885 160000 --- a/APP_Framework/lib/lorawan/lora_radio_driver +++ b/APP_Framework/lib/lorawan/lora_radio_driver @@ -1 +1 @@ -Subproject commit a400879b133bdce5051f7a550a4a05bfdbceb26c +Subproject commit be37aa885ca710ddcdf6ec0f671f0d566da9cb6f diff --git a/Ubiquitous/XiZi_IIoT/board/aiit-arm32-board/third_party_driver/spi/connect_lora_spi.c b/Ubiquitous/XiZi_IIoT/board/aiit-arm32-board/third_party_driver/spi/connect_lora_spi.c index 76cdb61db..c8255cf7a 100644 --- a/Ubiquitous/XiZi_IIoT/board/aiit-arm32-board/third_party_driver/spi/connect_lora_spi.c +++ b/Ubiquitous/XiZi_IIoT/board/aiit-arm32-board/third_party_driver/spi/connect_lora_spi.c @@ -22,7 +22,7 @@ static struct HardwareDev *g_spi_lora_dev; static BusType buspin; -tRadioDriver *Radio = NONE; +static tRadioDriver *Radio = NONE; void SX1276InitIo(void) { struct PinParam PinCfg; diff --git a/Ubiquitous/XiZi_IIoT/board/aiit-riscv64-board/third_party_driver/spi/connect_lora_spi.c b/Ubiquitous/XiZi_IIoT/board/aiit-riscv64-board/third_party_driver/spi/connect_lora_spi.c index 5d3e7c7a2..37c969cff 100644 --- a/Ubiquitous/XiZi_IIoT/board/aiit-riscv64-board/third_party_driver/spi/connect_lora_spi.c +++ b/Ubiquitous/XiZi_IIoT/board/aiit-riscv64-board/third_party_driver/spi/connect_lora_spi.c @@ -22,7 +22,7 @@ static struct HardwareDev *g_spi_lora_dev; static BusType buspin; -tRadioDriver *Radio = NONE; +static tRadioDriver *Radio = NONE; void SX1276InitIo(void) { struct PinParam PinCfg; diff --git a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_lora_spi.c b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_lora_spi.c index baa130571..c949d38e7 100644 --- a/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_lora_spi.c +++ b/Ubiquitous/XiZi_IIoT/board/hc32f4a0/third_party_driver/spi/connect_lora_spi.c @@ -25,7 +25,7 @@ #define LORA_RST_PIN (GPIO_PIN_02) static struct HardwareDev *g_spi_lora_dev; -tRadioDriver *Radio = NONE; +static tRadioDriver *Radio = NONE; void SX1276InitIo(void) {