删掉把处理过的数据变为0的函数

before_die
kafeijiaasamu 2 years ago
parent 4d180f7ac6
commit cb463c47d9

Binary file not shown.

@ -29,7 +29,7 @@ Project File Date: 11/19/2023
Build target 'LED'
compiling myfreertos.c...
linking...
Program Size: Code=25444 RO-data=804 RW-data=1524 ZI-data=13220
Program Size: Code=25408 RO-data=804 RW-data=1524 ZI-data=13220
FromELF: creating hex file...
"..\OBJ\LED.axf" - 0 Error(s), 0 Warning(s).
@ -44,7 +44,7 @@ Package Vendor: Keil
D:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include
<h2>Collection of Component Files used:</h2>
Build Time Elapsed: 00:00:03
Build Time Elapsed: 00:00:02
</pre>
</body>
</html>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -2506,7 +2506,7 @@ I (..\FreeRTOS\portable\RVDS\ARM_CM3\portmacro.h)(0x573F3A17)
I (..\FreeRTOS\include\mpu_wrappers.h)(0x573F3A16)
I (..\FreeRTOS\include\task.h)(0x573F3A16)
I (..\FreeRTOS\include\list.h)(0x573F3A16)
F (..\myfreertos\myfreertos.c)(0x6577D636)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\myfreertos.o --omf_browse ..\obj\myfreertos.crf --depend ..\obj\myfreertos.d)
F (..\myfreertos\myfreertos.c)(0x6577DA62)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\myfreertos.o --omf_browse ..\obj\myfreertos.crf --depend ..\obj\myfreertos.d)
I (..\myfreertos\myfreertos.h)(0x656FE939)
I (..\FreeRTOS\include\FreeRTOS.h)(0x652F9ABE)
I (D:\MDK5\ARM\ARMCC\include\stddef.h)(0x6025237E)

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

@ -3615,9 +3615,9 @@
</Doc>
<Doc>
<Name>..\myfreertos\myfreertos.c</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>350</TopLine>
<CurrentLine>371</CurrentLine>
<ColumnNumber>19</ColumnNumber>
<TopLine>281</TopLine>
<CurrentLine>312</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>

@ -261,11 +261,17 @@ void Sensor_Communication_task(void *pvParameters)
else
{
//printf("previous array cut\r\n");
while(RS485_RX_BUF_COPY[0]==0x00)//前面数据为0删掉
int index=0;
while(RS485_RX_BUF_COPY[index]==0x00)
{
RX_BUF_Transfer(0,1);
index++;
}
RX_BUF_Transfer(0,index);
//printf("previous array cut\r\n");
// while(RS485_RX_BUF_COPY[0]==0x00)//前面数据为0删掉
// {
// RX_BUF_Transfer(0,1);
// }
if((RS485_RX_BUF_COPY[0]!=0x00))//不为0处理掉
{
RX_BUF_Transfer(0,1);
@ -304,7 +310,6 @@ void Host_Computer_Communication(void)
//printf("B6 03 cmd: batch sync\r\n");
Array(&now_stage,&hour,&min,&tem,&hum,&red,&blue,&white);//更新对应阶段号的参数
Write_Init();
RX_BUF_ZERO(11);
RX_BUF_Transfer(0,11);
//RX_BUF_Printf(128);
}
@ -316,17 +321,15 @@ void Host_Computer_Communication(void)
now_stage=change_stage_rev1;
store_stage=change_stage_rev1;
Write_Init();
RX_BUF_ZERO(8);
RX_BUF_Transfer(0,8);
//RX_BUF_Printf(128);
}
if(RS485_RX_BUF_COPY[2]==0x03)//批量同步
if(RS485_RX_BUF_COPY[2]==0x01)//批量同步
{
Batch_synchronization(&n,RS485_RX_BUF_COPY);
//printf("B6 01 cmd: get one %d\r\n", n);
Array(&now_stage,&hour,&min,&tem,&hum,&red,&blue,&white);//更新对应阶段号的参数
//Write_Init();减少擦写的次数
RX_BUF_ZERO(20);
RX_BUF_Transfer(0,20);
//RX_BUF_Printf(128);
}
@ -335,13 +338,11 @@ void Host_Computer_Communication(void)
{
if(RS485_RX_BUF_COPY[2]==0x11&&RS485_RX_BUF_COPY[15]==0xFF&&RS485_RX_BUF[16]==0xFF)//单个同步默认带的数据
{
RX_BUF_ZERO(17);
//printf("cut overdata of B6 03 \r\n");
RX_BUF_Transfer(0,17);
}
if(RS485_RX_BUF_COPY[2]==0x11&&RS485_RX_BUF_COPY[14]==0xFF&&RS485_RX_BUF[15]==0xFF)//单个同步默认带的数据
{
RX_BUF_ZERO(16);
//printf("cut overdata of B6 03 \r\n");
//RX_BUF_Printf(128);
RX_BUF_Transfer(0,16);
@ -349,14 +350,12 @@ void Host_Computer_Communication(void)
}
if(RS485_RX_BUF_COPY[2]==0x11&&RS485_RX_BUF_COPY[12]==0xFF&&RS485_RX_BUF_COPY[13]==0xFF)//阶段切换默认带的数据
{
RX_BUF_ZERO(14);
//printf("cut overdata of B6 04 \r\n");
//RX_BUF_Printf(128);
RX_BUF_Transfer(0,14);
}
if(RS485_RX_BUF_COPY[2]==0x01&&RS485_RX_BUF_COPY[7]==0xFF&&RS485_RX_BUF_COPY[8]==0xFF)//上位机默认带的数据
{
RX_BUF_ZERO(9);
//printf("cut overdata of Upper computer \r\n");
//RX_BUF_Printf(128);
RX_BUF_Transfer(0,9);

Loading…
Cancel
Save