sundp
/
STS_RR_R125
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

revised mtm-2 code to 26 for waste-bin

This commit is contained in:
Yunhorn 2023-11-10 13:09:38 +08:00
parent 0b151464d6
commit 95f70a2b00
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Inc/sys_conf.h
View File

@ -47,12 +47,12 @@ extern "C" {
/** /**
* @brief Verbose level for all trace logs * @brief Verbose level for all trace logs
*/ */
#define VERBOSE_LEVEL VLEVEL_H #define VERBOSE_LEVEL VLEVEL_L
/** /**
* @brief Enable trace logs * @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 * @brief Activate monitoring (probes) of some internal RF signals for debug purpose

4
Core/Inc/yunhorn_sts_prd_conf.h
View File

@ -242,7 +242,7 @@
#define MajorVer 23U #define MajorVer 23U
#define MinorVer 11U #define MinorVer 11U
#define SubMinorVer 02U #define SubMinorVer 10U
#define FirmwareVersion 3U #define FirmwareVersion 3U
#define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U #define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U
#define YUNHORN_STS_AC_CODE_SIZE 20U #define YUNHORN_STS_AC_CODE_SIZE 20U
@ -268,7 +268,7 @@
#ifdef YUNHORN_STS_R5_ENABLED #ifdef YUNHORN_STS_R5_ENABLED
#define sts_mtmcode1 0U #define sts_mtmcode1 0U
#define sts_mtmcode2 11U #define sts_mtmcode2 26U
#define sts_hardware_ver 1U #define sts_hardware_ver 1U
#define sts_version 1U #define sts_version 1U
#define sts_senddataport (YUNHORN_STS_R5_LORA_APP_DATA_PORT) #define sts_senddataport (YUNHORN_STS_R5_LORA_APP_DATA_PORT)

1
LoRaWAN/App/lora_app.c
View File

@ -839,6 +839,7 @@ static void SendTxData(void)
{ {
heart_beat_timer = 0U; heart_beat_timer = 0U;
AppData.Port = LORAWAN_USER_HTBT_PORT; //LORAWAN_USER_APP_PORT+1; AppData.Port = LORAWAN_USER_HTBT_PORT; //LORAWAN_USER_APP_PORT+1;
AppData.Buffer[0] = AppLedStateOn|0x80;
#ifdef ROCTEC_R5 #ifdef ROCTEC_R5
AppData.Buffer[i++] = AppLedStateOn; AppData.Buffer[i++] = AppLedStateOn;
AppData.Buffer[i++] = (uint8_t)(r0_data.battery_Pct); AppData.Buffer[i++] = (uint8_t)(r0_data.battery_Pct);

2
TOF/App/app_tof_vl53l0x_range.c
View File

@ -414,7 +414,7 @@ void STS_TOF_VL53L0X_Range_Process(void)
HAL_Delay(5); HAL_Delay(5);
} // for i < MAX_TOF_COUNT } // for i < MAX_TOF_COUNT
if (sensor_data_ready != 0) { 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]); (int)sts_tof_distance_data[0],(int)sts_tof_distance_data[1],(int)sts_tof_distance_data[2]);
} }