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

remove unused code

This commit is contained in:
Yunhorn 2024-03-08 10:12:59 +08:00
parent 3abc57a893
commit 1e9ec8d4d2
5 changed files with 30 additions and 17 deletions
Core
Inc
yunhorn_sts_prd_conf.h
Src
sys_app.c
LoRaWAN/App
lora_app.c
STM32CubeIDE/Release
makefilesources.mk

28
Core/Inc/yunhorn_sts_prd_conf.h
View File

@ -32,22 +32,22 @@
/*
* MCU CORE SELECTION
*/
//#define STS_USE_STM32WLE5 1U //STM32WLE5CCUX
//#define USE_STM32WL55 1U //STM32WL55JC1X
//#define STS_USE_STM32WLE5 1U
//#define USE_STM32WL55 1U
/*
* MODULE SELECTION
*/
//#define USE_OLED_SSD1306
//#define USE_TOF_VL53L1X
//#define USE_TOF_VL53L1X
//#define STS_USE_TOF_VL53L0X 1U
//#define YUNHORN_STS_R1_ENABLED
//#define YUNHORN_STS_R3_ENABLED
#ifdef SOAP_LEVEL
#define YUNHORN_STS_R4_ENABLED
#define YUNHORN_STS_R4_ENABLED 1U
#endif
// TOF VL53LX number
// TOF VL53LX number
//#define USE_MEMS_ADXL345
//#define USE_ACCONEER_A111
/* ########################## Product Selection ############################## */
@ -198,6 +198,7 @@
#define YUNHORN_STS_R3_LORA_APP_DATA_PORT 7U
#define YUNHORN_STS_R3_LORA_APP_HTBT_PORT 8U
#endif
#ifdef YUNHORN_STS_R4_ENABLED
#define YUNHORN_STS_R4_LORA_APP_DATA_PORT 7U
#define YUNHORN_STS_R4_LORA_APP_HTBT_PORT 8U
@ -236,8 +237,8 @@
#define MajorVer 24U
#define MinorVer 02U
#define SubMinorVer 21U
#define MinorVer 03U
#define SubMinorVer 8U
#define FirmwareVersion 3U
#define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U
#define YUNHORN_STS_AC_CODE_SIZE 20U
@ -262,13 +263,18 @@
#define sts_sendhtbtport (YUNHORN_STS_R1_LORA_APP_HTBT_PORT)
#endif
//#ifdef YUNHORN_STS_R4_ENABLED
//#define YUNHORN_STS_R4_LORA_APP_DATA_PORT 7U
//#define YUNHORN_STS_R4_LORA_APP_HTBT_PORT 8U
//#endif
#ifdef YUNHORN_STS_R4_ENABLED
#define sts_mtmcode1 0U
#define sts_mtmcode2 86U
#define sts_hardware_ver 1U
#define sts_version 1U
#define sts_senddataport (YUNHORN_STS_R4_LORA_APP_DATA_PORT)
#define sts_sendhtbtport (YUNHORN_STS_R4_LORA_APP_HTBT_PORT)
#define sts_senddataport 7U
#define sts_sendhtbtport 8U
#endif
#ifdef YUNHORN_STS_R5_ENABLED
@ -280,8 +286,8 @@
#define sts_sendhtbtport (YUNHORN_STS_R5_LORA_APP_HTBT_PORT)
#endif
#define sts_appctrlport (YUNHORN_STS_USER_APP_CTRL_PORT)
#define sts_appctrl_reply_port (YUNHORN_STS_USER_APP_CTRL_REPLY_PORT)
#define sts_appctrlport YUNHORN_STS_USER_APP_CTRL_PORT
#define sts_appctrl_reply_port YUNHORN_STS_USER_APP_CTRL_REPLY_PORT
#ifdef STS_O5
#define sts_mtmcode1 0U

4
Core/Src/sys_app.c
View File

@ -126,8 +126,8 @@ void SystemApp_Init(void)
/*Init low power manager*/
UTIL_LPM_Init();
/* Disable Stand-by mode */
//UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_ENABLE);
UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_DISABLE);
//UTIL_LPM_SetOffMode((1 << CFG_LPM_APPLI_Id), UTIL_LPM_ENABLE);
#if defined (LOW_POWER_DISABLE) && (LOW_POWER_DISABLE == 1)
/* Disable Stop Mode */

13
LoRaWAN/App/lora_app.c
View File

@ -725,6 +725,15 @@ static void OnRxData(LmHandlerAppData_t *appData, LmHandlerRxParams_t *params)
break;
}
}
DeviceClass_t deviceClass = CLASS_A;
LmHandlerGetCurrentClass( &deviceClass );
uint8_t i=0;
outbuf[i++] = (uint8_t) 'L';
outbuf[i++] = (uint8_t) sts_mtmcode1;
outbuf[i++] = (uint8_t) sts_mtmcode2;
outbuf[i++] = (uint8_t) sts_version;
outbuf[i++] = (uint8_t) (0x41+ deviceClass); //translate to 'A','B','C'
STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf);
break;
case LORAWAN_USER_APP_PORT:
if (appData->BufferSize == 1)
@ -777,8 +786,8 @@ static void SendTxData(void)
LmHandlerErrorStatus_t status = LORAMAC_HANDLER_ERROR;
uint8_t batteryLevel = GetBatteryLevel();
//uint16_t batteryLevelmV = SYS_GetBatteryLevel();
sensor_t sensor_data;
#if defined(YUNHORN_STS_R0_ENABLED)||defined(YUNHORN_STS_R5_ENABLED)
//sensor_t sensor_data;
#if (defined(YUNHORN_STS_R0_ENABLED)||defined(YUNHORN_STS_R5_ENABLED))
STS_R0_SensorDataTypeDef r0_data;
#endif
#if defined(SOAP_LEVEL)

1
STM32CubeIDE/Release/makefile
View File

@ -19,7 +19,6 @@ RM := rm -rf
-include Application/User/TOF/Target/subdir.mk
-include Application/User/TOF/App/subdir.mk
-include Application/User/Startup/subdir.mk
-include Application/User/MLX90640/subdir.mk
-include Application/User/LoRaWAN/Target/subdir.mk
-include Application/User/LoRaWAN/App/subdir.mk
-include Application/User/Core/subdir.mk

1
STM32CubeIDE/Release/sources.mk
View File

@ -27,7 +27,6 @@ SUBDIRS := \
Application/User/Core \
Application/User/LoRaWAN/App \
Application/User/LoRaWAN/Target \
Application/User/MLX90640 \
Application/User/Startup \
Application/User/TOF/App \
Application/User/TOF/Target \