yan zhang
/
NB_CLOCK_180505
clock
Diff: myScope/myclodriv.cpp
- Revision:
- 3:b8766d623f01
- Parent:
- 2:e54d9d87c6cb
diff -r e54d9d87c6cb -r b8766d623f01 myScope/myclodriv.cpp --- a/myScope/myclodriv.cpp Mon May 14 00:04:42 2018 +0000 +++ b/myScope/myclodriv.cpp Tue May 22 09:10:05 2018 +0000 @@ -36,10 +36,10 @@ spstpSe=0; mcstpSe=0; - know::polSta[26]="0"; - know::polSta[33]="0"; - know::polSta[32]="0"; - know::polSta[34]="0"; + know::polSta[26]='0'; + know::polSta[33]='0'; + know::polSta[32]='0'; + know::polSta[34]='0'; sec=0; min=0; @@ -116,7 +116,7 @@ { mnstpSe++; if(mnstpSe<=2){ //高电平脉冲宽度31.250ms/15.625ms=2 - switch(atoi(know::polSta[26].c_str())){ //周期交替标志 + switch(know::polSta[26]-'0'){ //周期交替标志 case 1: know::MotM1 = 1; //分针马达端1输出高电平 know::MotM0 = 0; //分针马达端0输出低电平 @@ -132,12 +132,12 @@ else if(mnstpSe<=639&&mnstpSe>=3){ know::MotM0 = 0; //分针马达端0输出低电平 know::MotM1 = 0; //分针马达端1输出低电平 - switch(atoi(know::polSta[26].c_str())){ + switch(know::polSta[26]-'0'){ case 0: - know::polSta[26]="1"; //马达端1输出脉冲标识置1 + know::polSta[26]='1'; //马达端1输出脉冲标识置1 break; case 1: - know::polSta[26]="0"; + know::polSta[26]='0'; break; default: break; @@ -177,8 +177,8 @@ know::MotM1 = 0; //分针马达端1输出低电平 mcstpSe=0; cmp_cmin(); - if(know::polSta[33]=="1"){ - know::polSta[27]="1"; + if(know::polSta[33]=='1'){ + know::polSta[27]='1'; know::time1.attach_us(&cloSAct::isr_systick1,15625); } break; @@ -208,7 +208,7 @@ if(tim->tm_min== min&&tim->tm_hour== hour){ min=54; //分针检测信号有效为11时59分 开始追针或等追 hour=11; - know::polSta[33]="1"; + know::polSta[33]='1'; } } @@ -228,9 +228,9 @@ break; case 17: cmp_sec(); - if(atoi(know::polSta[32].c_str())==1){ + if((know::polSta[32]-'0')==1){ spstpSe=0; - know::polSta[28]="1"; //cmpsec_state="k"; + know::polSta[28]='1'; //cmpsec_state="k"; } else spstpSe=16; break; @@ -244,7 +244,7 @@ tm *tim; time_t seconds=time(NULL); tim=localtime(&seconds); - if(tim->tm_sec==56) know::polSta[32]="1"; //秒针检测信号有效为56秒 等追 + if(tim->tm_sec==56) know::polSta[32]='1'; //秒针检测信号有效为56秒 等追 } /***************************** @@ -257,8 +257,8 @@ know::MotM0 = 0; //Mot1分针驱动引脚输出低电平 know::MotM1 = 0; cmp_smin(); - if(atoi(know::polSta[34].c_str())==1){ - know::polSta[29]="1"; //正常走时停止则为59分 + if((know::polSta[34]-'0')==1){ + know::polSta[29]='1'; //正常走时停止则为59分 know::time1.attach_us(&cloSAct::isr_systick1,15625); } } @@ -268,6 +268,6 @@ tm *tim; time_t seconds=time(NULL); tim=localtime(&seconds); - if(tim->tm_min==59) know::polSta[34]="1"; //待测 若追针后停止分针则为58分 pol_min=58 + if(tim->tm_min==59) know::polSta[34]='1'; //待测 若追针后停止分针则为58分 pol_min=58 }