fix: enable four-channel weighing in MCU2
This commit is contained in:
@@ -9,7 +9,6 @@
|
||||
#include "device.h"
|
||||
#include "data_typedef.h"
|
||||
#include "m_s_comm.h"
|
||||
#include "gps.h"
|
||||
|
||||
void NVIC_Configuration(void);
|
||||
void RegularUploadTask(void);
|
||||
@@ -25,8 +24,8 @@ int main(void)
|
||||
USART1_Init(2400); //秤2
|
||||
USART2_Init(38400); //主从MCU通信接口
|
||||
USART3_Init(2400); //秤1
|
||||
USART4_Init(9600); //GPS
|
||||
USART5_Init(115200); //秤4
|
||||
USART4_Init(2400); //Scale 3
|
||||
USART5_Init(2400); //秤4
|
||||
|
||||
TIM2_Int_Init(1000, 7200-1); //10Khz的计数频率,计数到1000为100ms (即每个周期为0.1ms)
|
||||
TIM3_Int_Init(100, 7200-1); //10Khz的计数频率(每个周期为0.1ms),定时10ms用于限位开关和按钮扫描
|
||||
@@ -36,7 +35,6 @@ int main(void)
|
||||
printf("\r\n***************System Running***************\r\n");
|
||||
|
||||
DeviceInit(); //硬件设备初始化
|
||||
GPS_Init();
|
||||
|
||||
IWDG_Init(5, 625); //看门狗初始化,分频数为128,重载值为625,溢出时间为2s
|
||||
|
||||
@@ -49,7 +47,6 @@ int main(void)
|
||||
KeysSendTask(); //按键状态发送任务
|
||||
RegularUploadTask(); //定时上传任务
|
||||
M_S_DataDecodeTask(); //主从机通信任务
|
||||
GPS_Task(); //GPS定位处理任务
|
||||
|
||||
SystemExceptionTask(); //系统异常处理任务
|
||||
IWDG_FeedTask(); //看门狗喂狗任务
|
||||
@@ -73,14 +70,12 @@ int main(void)
|
||||
void RegularUploadTask(void)
|
||||
{
|
||||
static timer sendDevStaTimer; //上传设备运行状态信息(温度、信号、测距)
|
||||
static timer gpsOutputTimer; //gps输出定时
|
||||
|
||||
static uint8_t timer_ok = 0;
|
||||
if(timer_ok == 0)
|
||||
{
|
||||
timer_ok = 1;
|
||||
timer_set(&sendDevStaTimer, 5);
|
||||
timer_set(&gpsOutputTimer, CLOCK_SECOND*10);
|
||||
}
|
||||
|
||||
//设备运行状态信息上传
|
||||
@@ -89,12 +84,6 @@ void RegularUploadTask(void)
|
||||
timer_restart(&sendDevStaTimer);
|
||||
M_S_CommandSend(0x01);
|
||||
}
|
||||
|
||||
if(timer_expired(&gpsOutputTimer))
|
||||
{
|
||||
timer_restart(&gpsOutputTimer);
|
||||
M_S_CommandSend(0x03);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user