lijie/Gamble
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改参数命名

Browse Source
This commit is contained in:
lijie
2023-12-19 10:15:15 +08:00
parent d599512c02
commit 489e5576cb
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Gambal/APP/usart1.c
View File

@ -40,9 +40,9 @@ unsigned short USART_RX_STA=0; //
//} //}
u32 RX_CNT = 0; u32 RX_CNT = 0;
u8 f; u8 Y_index;
u8 x[12]; u8 G_RX_Xerror[12];
u8 y[12]; u8 G_RX_Yerror[12];
void USART1_IRQHandler(void) void USART1_IRQHandler(void)
{ {
unsigned char res; unsigned char res;
@ -53,15 +53,15 @@ void USART1_IRQHandler(void)
if(res != 0x0d) if(res != 0x0d)
{ {
USART_RX_BUF[RX_CNT] = res; USART_RX_BUF[RX_CNT] = res;
if(res == 'y') f = RX_CNT; if(res == 'y') Y_index = Y_index;
USART_RX_STA = 1; USART_RX_STA = 1;
RX_CNT++; RX_CNT++;
} }
else else
{ {
memcpy(x,USART_RX_BUF,f+1); memcpy(G_RX_Xerror,USART_RX_BUF,Y_index+1);
memcpy(y,USART_RX_BUF+f+1,30-f-1); memcpy(G_RX_Yerror,USART_RX_BUF+Y_index+1,30-Y_index-1);
memset(USART_RX_BUF,0,30); memset(USART_RX_BUF,0,30);
RX_CNT = 0; RX_CNT = 0;
} }

6
Gambal/APP/usart1.h
View File

@ -7,13 +7,11 @@
#define RX_485 GPIO_ResetBits(GPIOA,GPIO_Pin_8); #define RX_485 GPIO_ResetBits(GPIOA,GPIO_Pin_8);
#define TX_485 GPIO_SetBits(GPIOA,GPIO_Pin_8); #define TX_485 GPIO_SetBits(GPIOA,GPIO_Pin_8);
extern float error;
extern u8 USART_RX_BUF[30]; extern u8 USART_RX_BUF[30];
//<2F><><EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD> //<2F><><EFBFBD>յ<EFBFBD><D5B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݳ<EFBFBD><DDB3><EFBFBD>
extern unsigned short USART_RX_STA; //<2F><><EFBFBD><EFBFBD>״̬<D7B4><CCAC>־ extern unsigned short USART_RX_STA; //<2F><><EFBFBD><EFBFBD>״̬<D7B4><CCAC>־
extern u8 x[12]; extern u8 G_RX_Xerror[12];
extern u8 y[12]; extern u8 G_RX_Yerror[12];
void usart1_Init(u32 bound); void usart1_Init(u32 bound);

4
Gambal/User/main.c
View File

@ -129,9 +129,9 @@ int main()
PID_ZT(target); PID_ZT(target);
// target =atof((const char *)(x)); // target =atof((const char *)(G_RX_Xerror));
target = 0 - atof((const char *)(y)); target = 0 - atof((const char *)(G_RX_Yerror));
// target =LPF_ZT(target); // target =LPF_ZT(target);
// angle_close_loop(3.8); // angle_close_loop(3.8);
// close_loop(target); // close_loop(target);