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

revise log level to H

This commit is contained in:
Yunhorn 2023-10-13 18:00:47 +08:00
parent ee08e39138
commit f127541027
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
LoRaWAN/App/lora_app.c
View File

@ -411,7 +411,7 @@ void LoRaWAN_Init(void)
/* USER CODE END LoRaWAN_Init_LV */ /* USER CODE END LoRaWAN_Init_LV */
/* USER CODE BEGIN LoRaWAN_Init_1 */ /* USER CODE BEGIN LoRaWAN_Init_1 */
APP_LOG(TS_OFF, VLEVEL_M, "\r\n\n\n##### YUNHORN_STS_FW:%d SWV%d HWV:%d MTM:%d.%d R:%d.%d.%d####\r\n\n\n", APP_LOG(TS_OFF, VLEVEL_H, "\r\n\n\n##### YUNHORN_STS_FW:%d SWV%d HWV:%d MTM:%d.%d R:%d.%d.%d####\r\n\n\n",
FirmwareVersion, sts_version, sts_hardware_ver, sts_mtmcode1,sts_mtmcode2, MajorVer, MinorVer, SubMinorVer); FirmwareVersion, sts_version, sts_hardware_ver, sts_mtmcode1,sts_mtmcode2, MajorVer, MinorVer, SubMinorVer);
/* Get LoRaWAN APP version*/ /* Get LoRaWAN APP version*/
APP_LOG(TS_OFF, VLEVEL_M, "APPLICATION_VERSION: V%X.%X.%X\r\n", APP_LOG(TS_OFF, VLEVEL_M, "APPLICATION_VERSION: V%X.%X.%X\r\n",
@ -542,7 +542,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
#endif #endif
#if defined(USE_STM32WLE5) #if defined(USE_STM32WLE5)
case MEMS_EXTI1_Pin: case MEMS_EXTI1_Pin:
//APP_LOG(TS_OFF, VLEVEL_L, "\r\n(3) Vibration Sensor EXTI Event BUT3 3 3 3 \r\n"); //YUNHORN_STS_TODO //APP_LOG(TS_OFF, VLEVEL_H, "\r\n(3) Vibration Sensor EXTI Event BUT3 3 3 3 \r\n"); //YUNHORN_STS_TODO
mems_int1_detected=1; mems_int1_detected=1;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP1), CFG_SEQ_Prio_0); UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP1), CFG_SEQ_Prio_0);
@ -722,7 +722,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size)
outbuf[i++] = (uint8_t) 'M'; outbuf[i++] = (uint8_t) 'M';
outbuf[i++] = (uint8_t) (sts_service_mask+0x30); outbuf[i++] = (uint8_t) (sts_service_mask+0x30);
STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf);
APP_LOG(TS_OFF, VLEVEL_L, ">>>>>>>>>>>>>>>>>>>>> Mask = [ %02x ] \r\n", sts_service_mask); APP_LOG(TS_OFF, VLEVEL_H, ">>>>>>>>>>>>>>>>>>>>> Mask = [ %02x ] \r\n", sts_service_mask);
OnStoreSTSCFGContextRequest(); OnStoreSTSCFGContextRequest();
#ifdef YUNHORN_STS_O6_ENABLED #ifdef YUNHORN_STS_O6_ENABLED
if (sts_service_mask != STS_SERVICE_MASK_L0) STS_Lamp_Bar_Set_Dark(); if (sts_service_mask != STS_SERVICE_MASK_L0) STS_Lamp_Bar_Set_Dark();
@ -744,7 +744,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size)
outbuf[i++] = (uint8_t) MinorVer; outbuf[i++] = (uint8_t) MinorVer;
outbuf[i++] = (uint8_t) SubMinorVer; outbuf[i++] = (uint8_t) SubMinorVer;
STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf);
APP_LOG(TS_OFF, VLEVEL_L, "###### YUNHORN Report Version [ %10x ] \r\n", outbuf); APP_LOG(TS_OFF, VLEVEL_H, "###### YUNHORN Report Version [ %10x ] \r\n", outbuf);
} }
else else
if ((char)tlv_buf[CFG_CMD3] == 'C') { // "YVC" REPORT NVM STORED CONFIG PARAMETERS "YVC" if ((char)tlv_buf[CFG_CMD3] == 'C') { // "YVC" REPORT NVM STORED CONFIG PARAMETERS "YVC"
@ -770,7 +770,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size)
outbuf[i++] = (uint8_t) (cfg_in_nvm[NVM_LEN+j]); outbuf[i++] = (uint8_t) (cfg_in_nvm[NVM_LEN+j]);
} }
STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf);
APP_LOG(TS_OFF, VLEVEL_L, "###### YUNHORN Report Config in NVM [ %10x ] \r\n", outbuf); APP_LOG(TS_OFF, VLEVEL_H, "###### YUNHORN Report Config in NVM [ %10x ] \r\n", outbuf);
} }
break; break;
@ -920,7 +920,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size)
// Step 1/2: Prepare status update message // Step 1/2: Prepare status update message
STS_SENSOR_Upload_Config_Invalid_Message(); STS_SENSOR_Upload_Config_Invalid_Message();
APP_LOG(TS_OFF, VLEVEL_L, "###### MTM VER Invalid or Mismatch\r\n"); APP_LOG(TS_OFF, VLEVEL_H, "###### MTM VER Invalid or Mismatch\r\n");
} }
#endif #endif
// Step 3: Upload status update message // Step 3: Upload status update message
@ -1012,14 +1012,14 @@ void STS_SENSOR_Upload_Message(uint8_t appDataPort, uint8_t appBufferSize, char
status = LmHandlerSend(&AppData, LmHandlerParams.IsTxConfirmed, false); status = LmHandlerSend(&AppData, LmHandlerParams.IsTxConfirmed, false);
if (LORAMAC_HANDLER_SUCCESS == status) if (LORAMAC_HANDLER_SUCCESS == status)
{ {
APP_LOG(TS_ON, VLEVEL_L, "SEND REQUEST\r\n"); APP_LOG(TS_ON, VLEVEL_H, "SEND REQUEST\r\n");
} }
else if (LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED == status) else if (LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED == status)
{ {
nextTxIn = LmHandlerGetDutyCycleWaitTime(); nextTxIn = LmHandlerGetDutyCycleWaitTime();
if (nextTxIn > 0) if (nextTxIn > 0)
{ {
APP_LOG(TS_ON, VLEVEL_L, "Next Tx in : ~%d second(s)\r\n", (nextTxIn / 1000)); APP_LOG(TS_ON, VLEVEL_H, "Next Tx in : ~%d second(s)\r\n", (nextTxIn / 1000));
} }
} }
@ -1152,14 +1152,14 @@ static void SendTxData(void)
status = LmHandlerSend(&AppData, LmHandlerParams.IsTxConfirmed, false); status = LmHandlerSend(&AppData, LmHandlerParams.IsTxConfirmed, false);
if (LORAMAC_HANDLER_SUCCESS == status) if (LORAMAC_HANDLER_SUCCESS == status)
{ {
APP_LOG(TS_ON, VLEVEL_L, "SEND REQUEST\r\n"); APP_LOG(TS_ON, VLEVEL_H, "SEND REQUEST\r\n");
} }
else if (LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED == status) else if (LORAMAC_HANDLER_DUTYCYCLE_RESTRICTED == status)
{ {
nextTxIn = LmHandlerGetDutyCycleWaitTime(); nextTxIn = LmHandlerGetDutyCycleWaitTime();
if (nextTxIn > 0) if (nextTxIn > 0)
{ {
APP_LOG(TS_ON, VLEVEL_L, "Next Tx in : ~%d second(s)\r\n", (nextTxIn / 1000)); APP_LOG(TS_ON, VLEVEL_H, "Next Tx in : ~%d second(s)\r\n", (nextTxIn / 1000));
} }
} }
//} //}
@ -1260,7 +1260,7 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams)
sts_lorawan_joined = (uint8_t) joinParams->Mode; sts_lorawan_joined = (uint8_t) joinParams->Mode;
OnTxPeriodicityChanged(periodicity_length*1000); OnTxPeriodicityChanged(periodicity_length*1000);
APP_LOG(TS_OFF, VLEVEL_L, "\r\n==================== Tx Periodicity changed to = %d second(s) \r\n", (int)periodicity_length); APP_LOG(TS_OFF, VLEVEL_H, "\r\n==================== Tx Periodicity changed to = %d second(s) \r\n", (int)periodicity_length);
} }
else else
{ {
@ -1588,7 +1588,7 @@ void STS_REBOOT_CONFIG_Init(void)
#if (defined(YUNHORN_STS_O6_ENABLED) || defined(YUNHORN_STS_R0_ENABLED) || defined(YUNHORN_STS_M7_ENABLED)) #if (defined(YUNHORN_STS_O6_ENABLED) || defined(YUNHORN_STS_R0_ENABLED) || defined(YUNHORN_STS_M7_ENABLED))
if ((nvm_stored_value[NVM_MTM1] != sts_mtmcode1) || (nvm_stored_value[NVM_MTM2] != sts_mtmcode2) || (nvm_stored_value[NVM_VER] != sts_version)) if ((nvm_stored_value[NVM_MTM1] != sts_mtmcode1) || (nvm_stored_value[NVM_MTM2] != sts_mtmcode2) || (nvm_stored_value[NVM_VER] != sts_version))
{ {
APP_LOG(TS_OFF, VLEVEL_L, "\r\nInitial Boot with Empty Config, Flash with default config....\r\n"); APP_LOG(TS_OFF, VLEVEL_H, "\r\nInitial Boot with Empty Config, Flash with default config....\r\n");
OnStoreSTSCFGContextRequest(); OnStoreSTSCFGContextRequest();
UTIL_MEM_set_8((void *)sts_ac_code, 0x00, YUNHORN_STS_AC_CODE_SIZE); UTIL_MEM_set_8((void *)sts_ac_code, 0x00, YUNHORN_STS_AC_CODE_SIZE);
HAL_Delay(1000); HAL_Delay(1000);
@ -1763,7 +1763,7 @@ void STS_SENSOR_Function_Test_Process(void)
void STS_YunhornAuthenticationCode_Process(void) void STS_YunhornAuthenticationCode_Process(void)
{ {
if (sts_ac_code[0] == 0x00) { if (sts_ac_code[0] == 0x00) {
APP_LOG(TS_OFF,VLEVEL_M, "Initial AC CODE blank... \r\n"); APP_LOG(TS_OFF,VLEVEL_H, "Initial AC CODE blank... \r\n");
return; return;
} }
@ -1780,12 +1780,12 @@ void STS_YunhornSTSEventRFAC_Process(void)
{ {
if ((rfac_timer >= STS_BURN_IN_RFAC) && (rfac_timer < (STS_BURN_IN_RFAC +3))) if ((rfac_timer >= STS_BURN_IN_RFAC) && (rfac_timer < (STS_BURN_IN_RFAC +3)))
{ {
APP_LOG(TS_OFF, VLEVEL_M, "\r\n -------------------RFAC Process\r\n"); APP_LOG(TS_OFF, VLEVEL_H, "\r\n -------------------RFAC Process\r\n");
STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, 4, "RFAC"); STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, 4, "RFAC");
} }
if ((rfac_timer > (STS_BURN_IN_RFAC + 2))) if ((rfac_timer > (STS_BURN_IN_RFAC + 2)))
{ {
APP_LOG(TS_OFF, VLEVEL_M, "\r\n -------------------Verify RFAC Success or Not\r\n"); APP_LOG(TS_OFF, VLEVEL_H, "\r\n -------------------Verify RFAC Success or Not\r\n");
sts_service_mask = (sts_hmac_verify()!= 0)? STS_SERVICE_MASK_L2:STS_SERVICE_MASK_L0; sts_service_mask = (sts_hmac_verify()!= 0)? STS_SERVICE_MASK_L2:STS_SERVICE_MASK_L0;
if (sts_service_mask == STS_SERVICE_MASK_L2) { if (sts_service_mask == STS_SERVICE_MASK_L2) {
sts_ac_code[0] = 0x0; sts_ac_code[0] = 0x0;