11.22:完善注释;提高代码的移植性;完善串口程序。
This commit is contained in:
@@ -108,21 +108,21 @@ void vTaskLoRaToGatePkt(void *pvParameters)
|
||||
{
|
||||
uint8_t ucRecTempData = 0, ucRecHumiData = 0;
|
||||
/* <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD>ж<EFBFBD><D0B6>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD>ճɹ<D5B3> */
|
||||
BaseType_t xQueueTempRetval, xQueueHumiRetval;
|
||||
BaseType_t xRetvalQueueTemp, xRetvalQueueHumi;
|
||||
while (1)
|
||||
{
|
||||
/* code */
|
||||
/* <20><><EFBFBD>ն<EFBFBD><D5B6>У<EFBFBD><D0A3><EFBFBD><EFBFBD>о<EFBFBD><D0BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ת<EFBFBD><D7AA><EFBFBD><EFBFBD>Ŀ<EFBFBD><C4BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><CEB4><EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD>ݵĵȴ<C4B5>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>3<EFBFBD><33><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD>Ϊ0<CEAA><30>0~portMAX_DELAY<41><59>portMAX_DELAY<41><59><EFBFBD>֣<EFBFBD><D6A3>ֱ<EFBFBD><D6B1><EFBFBD>Ӧ
|
||||
* һ<>㲻<EFBFBD>ȡ<EFBFBD><C8A1><EFBFBD>һ<EFBFBD><D2BB>ʱ<EFBFBD><CAB1><EFBFBD>͵<EFBFBD><CDB5><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>䡣<EFBFBD>ڵȴ<DAB5><C8B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD><DDB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>£<EFBFBD><C2A3>ý<EFBFBD><C3BD>ն<EFBFBD><D5B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һֱ<D2BB><D6B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̬<EFBFBD><CCAC>
|
||||
*/
|
||||
xQueueTempRetval = xQueueReceive(xQueueTempHdlr, &ucRecTempData, pdMS_TO_TICKS(10));
|
||||
xQueueHumiRetval = xQueueReceive(xQueueHumiHdlr, &ucRecHumiData, pdMS_TO_TICKS(10));
|
||||
xRetvalQueueTemp = xQueueReceive(xQueueTempHdlr, &ucRecTempData, pdMS_TO_TICKS(10));
|
||||
xRetvalQueueHumi = xQueueReceive(xQueueHumiHdlr, &ucRecHumiData, pdMS_TO_TICKS(10));
|
||||
/* <20><><EFBFBD><EFBFBD> */
|
||||
vLoRaConnectionPkt(xLoRaGateConfig.ucLoRaGateChannel);
|
||||
vLoRaToGateIdPkt(xLoRaNode1Config.ucLoRaNode1Identifier);
|
||||
vLoRaToGateSenIdPkt(xLoRaSensorID.ucIdDht11);
|
||||
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ն<EFBFBD><D5B6><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7>ɹ<EFBFBD> */
|
||||
if (xQueueTempRetval == pdTRUE && xQueueHumiRetval == pdTRUE)
|
||||
if (xRetvalQueueTemp == pdTRUE && xRetvalQueueHumi == pdTRUE)
|
||||
{
|
||||
/* code */
|
||||
vUsart3SendArray(&ucRecTempData, 1);
|
||||
@@ -179,49 +179,60 @@ void vTaskLoRaMsgRec(void *pvParameters)
|
||||
|
||||
void vCreateTasksList(void)
|
||||
{
|
||||
#if defined __LED_H__
|
||||
#if LED_PC13_WORK_MODE == LED_PC13_STM32_STATE_MODE
|
||||
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><F1A3ACB2><EFBFBD><EFBFBD>ֱ<EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ơ<EFBFBD><C6A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֡<EFBFBD>ջ<EFBFBD><D5BB>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD>ز<EFBFBD><D8B2><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD>ȼ<EFBFBD><C8BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||
// xTaskCreate(
|
||||
// (TaskFunction_t ) vTaskStateLed,
|
||||
// (char * ) "TaskName_StateLed",
|
||||
// (configSTACK_DEPTH_TYPE) 256,
|
||||
// (void * ) NULL,
|
||||
// (UBaseType_t ) 2,
|
||||
// (TaskHandle_t * ) &xTaskStateLedHdlr);
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskLedControl,
|
||||
(char * ) "TaskName_LedControl",
|
||||
(configSTACK_DEPTH_TYPE) 256,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskLedCtrlHdlr);
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskFanControl,
|
||||
(char * ) "TaskName_FanControl",
|
||||
(configSTACK_DEPTH_TYPE) 256,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskFanCtrlHdlr);
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskDht11,
|
||||
(char * ) "TaskName_DHT11",
|
||||
(configSTACK_DEPTH_TYPE) 512,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskDht11Hdlr);
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskLoRaToGatePkt,
|
||||
(char * ) "TaskName_LoRaSendToGateway",
|
||||
(configSTACK_DEPTH_TYPE) 512,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskLoRaToGateHdlr);
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskLoRaMsgRec,
|
||||
(char * ) "TaskName_LoRaReceivedMessage",
|
||||
(configSTACK_DEPTH_TYPE) 512,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskLoRaMsgRecHdlr);
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskStateLed,
|
||||
(char * ) "TaskName_StateLed",
|
||||
(configSTACK_DEPTH_TYPE) 256,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskStateLedHdlr);
|
||||
#else
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskLedControl,
|
||||
(char * ) "TaskName_LedControl",
|
||||
(configSTACK_DEPTH_TYPE) 256,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskLedCtrlHdlr);
|
||||
#endif
|
||||
#endif
|
||||
#if defined __RELAY_H__
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskFanControl,
|
||||
(char * ) "TaskName_FanControl",
|
||||
(configSTACK_DEPTH_TYPE) 256,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskFanCtrlHdlr);
|
||||
#endif
|
||||
#if defined __DHT11_H__
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskDht11,
|
||||
(char * ) "TaskName_DHT11",
|
||||
(configSTACK_DEPTH_TYPE) 512,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskDht11Hdlr);
|
||||
#endif
|
||||
#if defined __LORA_H__
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskLoRaToGatePkt,
|
||||
(char * ) "TaskName_LoRaSendToGateway",
|
||||
(configSTACK_DEPTH_TYPE) 512,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskLoRaToGateHdlr);
|
||||
xTaskCreate(
|
||||
(TaskFunction_t ) vTaskLoRaMsgRec,
|
||||
(char * ) "TaskName_LoRaReceivedMessage",
|
||||
(configSTACK_DEPTH_TYPE) 512,
|
||||
(void * ) NULL,
|
||||
(UBaseType_t ) 2,
|
||||
(TaskHandle_t * ) &xTaskLoRaMsgRecHdlr);
|
||||
#endif
|
||||
}
|
||||
|
||||
void vCreateQueuesList(void)
|
||||
@@ -249,8 +260,8 @@ void vCreateSemaphoresList(void)
|
||||
{
|
||||
xSemLedOnHdlr = xSemaphoreCreateBinary();
|
||||
xSemLedOffHdlr = xSemaphoreCreateBinary();
|
||||
xSemFanOnHdlr = xSemaphoreCreateBinary();
|
||||
xSemFanOffHdlr = xSemaphoreCreateBinary();
|
||||
xSemFanOnHdlr = xSemaphoreCreateBinary();
|
||||
xSemFanOffHdlr = xSemaphoreCreateBinary();
|
||||
}
|
||||
|
||||
int main(void)
|
||||
|
||||
Reference in New Issue
Block a user