Browse Source

v1.1.2 uart3测试ok

master
zhangsan 5 years ago
parent
commit
13f6cac7f5
  1. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym
  2. BIN
      si4/soft_gsm_main.si4project/soft_gsm_main.siwork
  3. 8
      source/app/app_drv.c
  4. 4
      source/app/main.c
  5. 2
      source/bsp/bsp_config.c
  6. 4
      source/msp/UART3.c
  7. 3
      source/tpc/tpc_uart.c
  8. 2
      source/tpc/tpc_uart.h

BIN
si4/soft_gsm_main.si4project/soft_gsm_main.sip_sym

Binary file not shown.

BIN
si4/soft_gsm_main.si4project/soft_gsm_main.siwork

Binary file not shown.

8
source/app/app_drv.c

@ -65,11 +65,15 @@ void L3_UARTcom3_exp_protocol(TS_Handle_PH3 *p)
{ {
if (1 == p->ok) if (1 == p->ok)
{ {
#if 1
TS_PH3_ccmodbus ccmodbus; TS_PH3_ccmodbus ccmodbus;
//L0_uart0_uc(0xaa);
byte_copy_uc((U8*)&ccmodbus,(U8*)&p->ts_ccmodbus,p->ts_ccmodbus.num + 3); byte_copy_uc((U8*)&ccmodbus,(U8*)&p->ts_ccmodbus,p->ts_ccmodbus.num + 3);
p->ok = 0;
G.rfid = ccmodbus.buf[0]; G.rfid = ccmodbus.buf[0];
L0_uart3_uc(G.rfid & 0xFF);
#else
L0_uart3_uc(p->reg);
#endif
p->ok = 0;
} }
} }

4
source/app/main.c

@ -126,10 +126,6 @@ void main(void)
s_nos_tick.t1s_heatbeart = 0; s_nos_tick.t1s_heatbeart = 0;
//L0_uart0_uc('.'); //L0_uart0_uc('.');
L0_uart0_sendArray("abcdefg", 7); L0_uart0_sendArray("abcdefg", 7);
D_P03_REV();
D_P04_REV();
D_P05_REV();
D_P06_REV();
} }
//串口3 RFID接收 //串口3 RFID接收
L3_UARTcom3_exp_protocol(&s_uart3_rec); L3_UARTcom3_exp_protocol(&s_uart3_rec);

2
source/bsp/bsp_config.c

@ -222,7 +222,7 @@ void L1_s2b_PH3_0(unsigned char sbufreg)
//uart3 //uart3
void L1_s2b_PH3_3(unsigned char sbufreg) void L1_s2b_PH3_3(unsigned char sbufreg)
{ {
s_uart0_rec.reg = sbufreg; s_uart3_rec.reg = sbufreg;
L1_s2b_PH3(&s_uart3_rec); L1_s2b_PH3(&s_uart3_rec);
} }

4
source/msp/UART3.c

@ -201,9 +201,7 @@ void INTERRUPT_UART3(void) D_SERVE_UART3// using 3
/// output: 对应的结构体变量中携带 缓存buf和协议ok的标志 /// output: 对应的结构体变量中携带 缓存buf和协议ok的标志
//s_uart3_rec.reg = L0_uart3_get(); //s_uart3_rec.reg = L0_uart3_get();
//s_uart3_rec.ok = 1; //s_uart3_rec.ok = 1;
//s_uart3_rec.reg = L0_uart3_get(); Lp0_uart3_fun(L0_uart3_get());
//s_uart3_rec.ok = 1;
//Lp0_uart3_fun(L0_uart3_get());
} }
//<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< //<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

3
source/tpc/tpc_uart.c

@ -111,6 +111,7 @@ void L1_s2b_PH3(TS_Handle_PH3 *p)// reentrant
p->sp[0] = p->head_0; p->sp[0] = p->head_0;
p->sp[1] = p->head_1; p->sp[1] = p->head_1;
p->num = 1; p->num = 1;
//p->ok = 1;
} }
}else }else
{ {
@ -128,7 +129,7 @@ void L1_s2b_PH3(TS_Handle_PH3 *p)// reentrant
if(p->num >= p->max) if(p->num >= p->max)
{ {
//p->ts_ccmodbus.crc = (p->sp[p->num-1] | p->sp[p->num]) & 0xFFFF; //p->ts_ccmodbus.crc = (p->sp[p->num-1] | p->sp[p->num]) & 0xFFFF;
if(checkCRC16(&p->__ts_ccmodbus)) if(/*checkCRC16(&p->__ts_ccmodbus)*/ 1)
{ {
if (p->ok != 1) if (p->ok != 1)
{ {

2
source/tpc/tpc_uart.h

@ -220,7 +220,7 @@ extern void L1_s2b_PH2(struct _s_PH2_FFFE_ *p);// reentrant;
/// 协议表达的意思为地址为0x52的从机, 功能码16 数据为11 22 33 44,校验码 F5 9F /// 协议表达的意思为地址为0x52的从机, 功能码16 数据为11 22 33 44,校验码 F5 9F
/// 校验码的范围为 /// 校验码的范围为
#define D_s_PH3_ccmodbus_max 16 #define D_s_PH3_ccmodbus_max 32
#define D_s_PH3_ccmodbus_min 4 #define D_s_PH3_ccmodbus_min 4
typedef struct typedef struct

Loading…
Cancel
Save