diff --git a/.vscode/settings.json b/.vscode/settings.json index 4e8548f..2e93347 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,6 +17,8 @@ "eeprom.h": "c", "uart2.h": "c", "clib.h": "c", - "uart0.h": "c" + "uart0.h": "c", + "stdio.h": "c", + "uart3.h": "c" } } \ No newline at end of file diff --git a/keilp/cc_as_stc02_ps5ws.uvprojx b/keilp/cc_as_stc02_ps5ws.uvprojx index 8aceae2..c57fb76 100644 --- a/keilp/cc_as_stc02_ps5ws.uvprojx +++ b/keilp/cc_as_stc02_ps5ws.uvprojx @@ -444,34 +444,39 @@ msp - time.c + eeprom.c 1 - ..\source\msp\time.c + ..\source\msp\eeprom.c - eeprom.c + iic_sim.c 1 - ..\source\msp\eeprom.c + ..\source\msp\iic_sim.c + + + UART0.C + 1 + ..\source\msp\UART0.C - msp_uart2.C + UART2.c 1 - ..\source\msp\msp_uart2.C + ..\source\msp\UART2.c - msp_uart0.C + UART3.c 1 - ..\source\msp\msp_uart0.C + ..\source\msp\UART3.c - msp_uart_x.c + UART4.C 1 - ..\source\msp\msp_uart_x.c + ..\source\msp\UART4.C - msp_uart3.c + UARTX.c 1 - ..\source\msp\msp_uart3.c + ..\source\msp\UARTX.c @@ -498,6 +503,11 @@ 1 ..\source\ctask\tick.c + + time.c + 1 + ..\source\ctask\time.c + diff --git a/source/app/main.c b/source/app/main.c index 51a9a95..b75d432 100644 --- a/source/app/main.c +++ b/source/app/main.c @@ -1,70 +1,3 @@ -////////////////////////////////////////////////////////////////////////// -/// COPYRIGHT NOTICE -/// Copyright (c) 2015, 传控科技 -/// All rights reserved. -/// -/// @file main.c -/// @brief main app -/// -///(本文件实现的功能的详述) -/// -/// @version 1.1 CCsens technology -/// @author CC -/// @date 20150102 -/// @note -/// -/// @version 1.2 CCsens technology -/// @author CC -/// @date 20180903 -/// @note cc_gsm_PD03SM_vh03_m10_debug01 -//20160413 CC-ACC-VH02 -//20170111 CC-ls_02 -// -//20170608 cc_as_stc01_main -// -//20180903 cc_gsm_PD03SM_vh03_m10_debug01 -// -// -/// @version 1.3 CCsens technology -/// @author CC -/// @date 20180903 -/// @note add calibrationg function -/// @version 1.4 CCsens technology -/// @author CC -/// @date 20190101 -/// @note add calibrationg function - -////////////////////////////////////////////////////////////////////////// - - -/// 下面是一个含有两个参数的函数的注释说明(简述) -/// -/// 这里写该函数的详述信息 -/// @param a 被测试的变量(param描述参数) -/// @param s 指向描述测试信息的字符串 -/// @return 测试结果(return描述返回值) -/// @see Test() (本函数参考其它的相关的函数,这里作一个链接) -/// @note (note描述需要注意的问题) -/************************************************ -stc5ac32s -程序结构 - - -有动静 - 并且采集的值小于c200 设置采集间隔缩短 - 采集值 在 c200