From 95f70a2b00b59fb86e7c7d4d2476dd12b19af6fc Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Fri, 10 Nov 2023 13:09:38 +0800 Subject: [PATCH] revised mtm-2 code to 26 for waste-bin --- Core/Inc/sys_conf.h | 4 ++-- Core/Inc/yunhorn_sts_prd_conf.h | 4 ++-- LoRaWAN/App/lora_app.c | 1 + TOF/App/app_tof_vl53l0x_range.c | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Core/Inc/sys_conf.h b/Core/Inc/sys_conf.h index de3a94d..ea70373 100644 --- a/Core/Inc/sys_conf.h +++ b/Core/Inc/sys_conf.h @@ -47,12 +47,12 @@ extern "C" { /** * @brief Verbose level for all trace logs */ -#define VERBOSE_LEVEL VLEVEL_H +#define VERBOSE_LEVEL VLEVEL_L /** * @brief Enable trace logs */ -#define APP_LOG_ENABLED 1 +#define APP_LOG_ENABLED 0 /** * @brief Activate monitoring (probes) of some internal RF signals for debug purpose diff --git a/Core/Inc/yunhorn_sts_prd_conf.h b/Core/Inc/yunhorn_sts_prd_conf.h index 369d4b2..8602ac5 100644 --- a/Core/Inc/yunhorn_sts_prd_conf.h +++ b/Core/Inc/yunhorn_sts_prd_conf.h @@ -242,7 +242,7 @@ #define MajorVer 23U #define MinorVer 11U -#define SubMinorVer 02U +#define SubMinorVer 10U #define FirmwareVersion 3U #define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U #define YUNHORN_STS_AC_CODE_SIZE 20U @@ -268,7 +268,7 @@ #ifdef YUNHORN_STS_R5_ENABLED #define sts_mtmcode1 0U -#define sts_mtmcode2 11U +#define sts_mtmcode2 26U #define sts_hardware_ver 1U #define sts_version 1U #define sts_senddataport (YUNHORN_STS_R5_LORA_APP_DATA_PORT) diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 3624497..a3df762 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -839,6 +839,7 @@ static void SendTxData(void) { heart_beat_timer = 0U; AppData.Port = LORAWAN_USER_HTBT_PORT; //LORAWAN_USER_APP_PORT+1; + AppData.Buffer[0] = AppLedStateOn|0x80; #ifdef ROCTEC_R5 AppData.Buffer[i++] = AppLedStateOn; AppData.Buffer[i++] = (uint8_t)(r0_data.battery_Pct); diff --git a/TOF/App/app_tof_vl53l0x_range.c b/TOF/App/app_tof_vl53l0x_range.c index 0ee30ba..e9f290e 100644 --- a/TOF/App/app_tof_vl53l0x_range.c +++ b/TOF/App/app_tof_vl53l0x_range.c @@ -414,7 +414,7 @@ void STS_TOF_VL53L0X_Range_Process(void) HAL_Delay(5); } // for i < MAX_TOF_COUNT if (sensor_data_ready != 0) { - APP_LOG(TS_OFF, VLEVEL_H, "\r\n## Measured Range: \r\nTOF #0 = %4u mm, \r\nTOF #1 = %4u mm, \r\nTOF #2 = %4u mm\r\n", + APP_LOG(TS_OFF, VLEVEL_L, "\r\n## Measured Range: \r\nTOF #0 = %4u mm, \r\nTOF #1 = %4u mm, \r\nTOF #2 = %4u mm\r\n", (int)sts_tof_distance_data[0],(int)sts_tof_distance_data[1],(int)sts_tof_distance_data[2]); }