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

---good CR2450/ER34615 voltage ----no rejoin issue

This commit is contained in:
Yunhorn 2024-07-09 12:31:38 +08:00
parent 32c969265a
commit 8ea7cd58df
9 changed files with 25208 additions and 25212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/Inc/main.h
View File

@ -94,6 +94,9 @@ void Error_Handler(void);
#define USARTx_TX_Pin GPIO_PIN_2 #define USARTx_TX_Pin GPIO_PIN_2
#define USARTx_TX_GPIO_Port GPIOA #define USARTx_TX_GPIO_Port GPIOA
#define STS_BAT_DETECT_PIN GPIO_PIN_15
#define STS_BAT_DETECT_Port GPIOA
#define STS_PME_Pin GPIO_PIN_4 #define STS_PME_Pin GPIO_PIN_4
#define STS_PME_GPIO_Port GPIOB #define STS_PME_GPIO_Port GPIOB
#define STS_PME_ON HAL_GPIO_WritePin(STS_PME_GPIO_Port, STS_PME_Pin, GPIO_PIN_SET) #define STS_PME_ON HAL_GPIO_WritePin(STS_PME_GPIO_Port, STS_PME_Pin, GPIO_PIN_SET)

17
Core/Src/adc.c
View File

@ -71,6 +71,7 @@ void MX_ADC_Init(void)
void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle) void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
{ {
GPIO_InitTypeDef GPIO_InitStruct = {0};
if(adcHandle->Instance==ADC) if(adcHandle->Instance==ADC)
{ {
@ -80,6 +81,16 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
/* ADC clock enable */ /* ADC clock enable */
__HAL_RCC_ADC_CLK_ENABLE(); __HAL_RCC_ADC_CLK_ENABLE();
/* USER CODE BEGIN ADC_MspInit 1 */ /* USER CODE BEGIN ADC_MspInit 1 */
__HAL_RCC_GPIOA_CLK_ENABLE();
/**ADC GPIO Configuration
PB3 ------> ADC_IN2
PA15 ------> ADC_IN11
*/
GPIO_InitStruct.Pin = STS_BAT_DETECT_PIN;
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(STS_BAT_DETECT_Port, &GPIO_InitStruct);
/* USER CODE END ADC_MspInit 1 */ /* USER CODE END ADC_MspInit 1 */
} }
@ -96,7 +107,11 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* adcHandle)
/* Peripheral clock disable */ /* Peripheral clock disable */
__HAL_RCC_ADC_CLK_DISABLE(); __HAL_RCC_ADC_CLK_DISABLE();
/* USER CODE BEGIN ADC_MspDeInit 1 */ /* USER CODE BEGIN ADC_MspDeInit 1 */
/**ADC GPIO Configuration
PB3 ------> ADC_IN2
PA15 ------> ADC_IN11
*/
HAL_GPIO_DeInit(STS_BAT_DETECT_Port, STS_BAT_DETECT_PIN);
/* USER CODE END ADC_MspDeInit 1 */ /* USER CODE END ADC_MspDeInit 1 */
} }
} }

2
Core/Src/adc_if.c
View File

@ -205,7 +205,7 @@ uint16_t STS_GetBatteryLevel(void)
} }
} }
return (uint16_t)batteryLevelmV; return (uint16_t)2*batteryLevelmV;
/* USER CODE BEGIN SYS_GetBatteryLevel_2 */ /* USER CODE BEGIN SYS_GetBatteryLevel_2 */
/* USER CODE END SYS_GetBatteryLevel_2 */ /* USER CODE END SYS_GetBatteryLevel_2 */

16
Core/Src/gpio.c
View File

@ -42,7 +42,7 @@ void MX_GPIO_Init(void)
{ {
GPIO_InitTypeDef GPIO_InitStruct = {0}; GPIO_InitTypeDef GPIO_InitStruct = {0};
#if 1 #if 0
/* GPIO Ports Clock Enable */ /* GPIO Ports Clock Enable */
__HAL_RCC_GPIOB_CLK_ENABLE(); __HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE(); __HAL_RCC_GPIOC_CLK_ENABLE();
@ -94,16 +94,16 @@ void MX_GPIO_Init(void)
GPIO_InitStruct.Pin = STS_PME_Pin|STS_LED1_Pin; //PB4 PME on/off, PB2, LED1 on/off GPIO_InitStruct.Pin = STS_PME_Pin|STS_LED1_Pin; //PB4 PME on/off, PB2, LED1 on/off
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
#if 0
__HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOA_CLK_ENABLE();
GPIO_InitStruct.Pin = GPIO_PIN_15; //VBAT_DETECT_PIN GPIO_InitStruct.Pin = STS_BAT_DETECT_PIN; //VBAT_DETECT_PIN
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG; GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH; HAL_GPIO_Init(STS_BAT_DETECT_Port, &GPIO_InitStruct);
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); #endif
/* EXTI interrupt init*/ /* EXTI interrupt init*/
#if 0 #if 0
HAL_NVIC_SetPriority(EXTI0_IRQn, 0, 0); HAL_NVIC_SetPriority(EXTI0_IRQn, 0, 0);

3
LoRaWAN/App/lora_app.c
View File

@ -554,7 +554,7 @@ static void SendTxData(void)
/* USER CODE BEGIN SendTxData_1 */ /* USER CODE BEGIN SendTxData_1 */
LmHandlerErrorStatus_t status = LORAMAC_HANDLER_ERROR; LmHandlerErrorStatus_t status = LORAMAC_HANDLER_ERROR;
uint8_t batteryLevel = GetBatteryLevel(); uint8_t batteryLevel = GetBatteryLevel();
//uint16_t batteryLevelmV = (uint16_t) STS_GetBatteryLevel(); uint16_t stsbatterylevelmv = (uint16_t) STS_GetBatteryLevel();
uint16_t batteryLevelmV = (uint16_t) SYS_GetBatteryLevel(); uint16_t batteryLevelmV = (uint16_t) SYS_GetBatteryLevel();
sensor_t sensor_data; sensor_t sensor_data;
UTIL_TIMER_Time_t nextTxIn = 0; UTIL_TIMER_Time_t nextTxIn = 0;
@ -620,6 +620,7 @@ static void SendTxData(void)
//YUNHORN ADD-ON //YUNHORN ADD-ON
//AppData.Buffer[i++] = (uint8_t)((99*batteryLevel/254) & 0xFF); //AppData.Buffer[i++] = (uint8_t)((99*batteryLevel/254) & 0xFF);
AppData.Buffer[i++] = (uint8_t)((batteryLevelmV/100) & 0xFF); AppData.Buffer[i++] = (uint8_t)((batteryLevelmV/100) & 0xFF);
AppData.Buffer[i++] = (uint8_t)((stsbatterylevelmv/100) & 0xFF);
} }
else else
{ {

2
LoRaWAN/App/lora_app.h
View File

@ -52,7 +52,7 @@ extern "C" {
* Defines the application data transmission duty cycle. 10s, value in [ms]. * Defines the application data transmission duty cycle. 10s, value in [ms].
*/ */
#define APP_TX_DUTYCYCLE 120000 #define APP_TX_DUTYCYCLE 20000
/*! /*!

24
STM32CubeIDE/Release/Application/User/LoRaWAN/App/lora_app.cyclo
View File

@ -1,24 +0,0 @@
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:779:13:OnBeaconStatusChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:814:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:821:13:OnClassChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:862:13:OnTxFrameCtrlChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:873:13:OnPingSlotPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:707:13:OnRxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:702:13:OnTxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:828:13:OnMacProcessNotify 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:935:13:OnStopJoinTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:675:13:OnTxTimerEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:840:13:OnTxPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:1006:13:OnRestoreContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:898:13:StopJoin 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:951:13:StoreContext 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:552:13:SendTxData 7
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:748:13:OnJoinRequest 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:712:13:OnJoinTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:719:13:OnTxData 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:884:13:OnSystemReset 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:472:13:OnRxData 13
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:991:13:OnStoreContextRequest 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:973:13:OnNvmDataChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:348:6:LoRaWAN_Init 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_E5CC/LoRaWAN/App/lora_app.c:443:6:HAL_GPIO_EXTI_Callback 3

7501
STM32CubeIDE/Release/LoRaWAN_End_Node_E5CC.hex
View File

File diff suppressed because it is too large Load Diff

42852
STM32CubeIDE/Release/LoRaWAN_End_Node_E5CC.list
View File

File diff suppressed because it is too large Load Diff