Skip to content

J
jiancetai
Commit d966adf5 authored by 梁百峰's avatar 梁百峰
Browse files
Options

✨ feat:16843最终版（可能是）

parent 437e8804
Expand all Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 117 deletions
YueJin_test_bench/source/Appliciation/Barcode_Scanner.c
View file @ d966adf5
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include "api_RS485.h" #include "api_RS485.h"
#include "string.h" #include "string.h"
#include "init.h" #include "init.h"
#include "Display_Info.h"
#include "R485_Communication_Matrix.h" #include "R485_Communication_Matrix.h"
#define UART_RX_MAX_DEPTH (1024) // 4K #define UART_RX_MAX_DEPTH (1024) // 4K
...@@ -45,7 +46,7 @@ uint8_t line_stdio = 2; ...@@ -45,7 +46,7 @@ uint8_t line_stdio = 2;
uint8_t powerstdio = 0; uint8_t powerstdio = 0;
uint8_t get_num_buf[34]; uint8_t get_num_buf[34];
uint8_t comparestart; uint8_t comparestart;
uint8_t blename[4]; uint8_t blename[5];
void get_key(void) void get_key(void)
{ {
key_array[0] = seed_value[0] | seed_value[3]; key_array[0] = seed_value[0] | seed_value[3];
...@@ -112,13 +113,19 @@ void datacheck(void) ...@@ -112,13 +113,19 @@ void datacheck(void)
checknumwrong = 1; checknumwrong = 1;
} }
break; break;
case 0x4D:
memcpy(R485_ID4Dh.Msg,RS485_data,64);
break;
case 0x81: case 0x81:
{ {
blename[0] = RS485_data[6]; blename[0] = RS485_data[6];
blename[1] = RS485_data[7]; blename[1] = RS485_data[7];
blename[2] = RS485_data[8]; blename[2] = RS485_data[8];
blename[3] = RS485_data[9]; blename[3] = RS485_data[9];
blename[4] = 0xff;
recvflag111 = 1; recvflag111 = 1;
RS485_TX_finish = 0;
// General_Number_Disp(blename, 3, 165);
} }
break; break;
case 0x4F: case 0x4F:
...@@ -252,10 +259,15 @@ void datacheck(void) ...@@ -252,10 +259,15 @@ void datacheck(void)
zhenduansendStep++; zhenduansendStep++;
RS485_TX_finish = 0; RS485_TX_finish = 0;
} }
else else if(BarCode[4] != 0x67)
{ {
zhenduansendStep = 0;
RS485_TX_finish = 0; RS485_TX_finish = 0;
} }
else
{
;
}
} }
break; break;
case 3: case 3:
...@@ -266,16 +278,20 @@ void datacheck(void) ...@@ -266,16 +278,20 @@ void datacheck(void)
zhenduansendStep++; zhenduansendStep++;
RS485_TX_finish = 0; RS485_TX_finish = 0;
} }
if(BarCode[4] == 0x7F) if(BarCode[4] == 0x7F && BarCode[5] == 0x2E && BarCode[6] == 0x78 )
{ {
// wait_write_flag = 1;
RS485_TX_finish = 1; RS485_TX_finish = 1;
// zhenduansendStep = 0;
// ;
}
if(BarCode[4] == 0x7F && BarCode[5] == 0x2E && BarCode[6] == 0x31 )
{
RS485_TX_finish = 0;
} }
} }
else else
{ {
RS485_TX_finish = 0; // RS485_TX_finish = 0;
} }
break; break;
default: default:
...@@ -285,7 +301,7 @@ void datacheck(void) ...@@ -285,7 +301,7 @@ void datacheck(void)
} }
else else
{ {
RS485_TX_finish = 0x0; // RS485_TX_finish = 0x0;
} }
} }
} }
...@@ -326,6 +342,7 @@ void BarCodeDataGet(void) ...@@ -326,6 +342,7 @@ void BarCodeDataGet(void)
else else
{ {
memcpy(barcode_Msg1,&mDataBufPtr1[6],34); memcpy(barcode_Msg1,&mDataBufPtr1[6],34);
memset(barcode_Msg,0,34);
} }
} }
uint8_t GetDataCompare(void) uint8_t GetDataCompare(void)
...@@ -370,6 +387,7 @@ void UART_Put(uint32_t Value) ...@@ -370,6 +387,7 @@ void UART_Put(uint32_t Value)
// LINE_OUT_NEG_09 = 1; // LINE_OUT_NEG_09 = 1;
// RS485_TX_finish = 0; // RS485_TX_finish = 0;
// RS485_send_time = 0; // RS485_send_time = 0;
RS485_send_time = 0;
return; return;
} }
void UART_Put1(uint32_t Value) void UART_Put1(uint32_t Value)
...@@ -493,10 +511,10 @@ void Recv_Byte1(void) ...@@ -493,10 +511,10 @@ void Recv_Byte1(void)
int j = 0; int j = 0;
uint32_t len; uint32_t len;
readNum1 = Protocol_UartRead1(mDataBufPtr1 + mDataBufLen1, 1024 - mDataBufLen1); readNum1 = Protocol_UartRead1(mDataBufPtr1 + mDataBufLen1, 1024 - mDataBufLen1);
if (readNum1 > 0) // if (readNum1 > 0)
{ // {
BarCodeDataGet(); // BarCodeDataGet();
} // }
if (readNum1 > 0) if (readNum1 > 0)
{ {
mDataBufLen1 += readNum1; mDataBufLen1 += readNum1;
......
YueJin_test_bench/source/Appliciation/Barcode_Scanner.h
View file @ d966adf5
...@@ -31,6 +31,6 @@ extern uint8_t Auto_ONOFF; ...@@ -31,6 +31,6 @@ extern uint8_t Auto_ONOFF;
extern uint8_t comparestart; extern uint8_t comparestart;
extern uint8_t connectbleFlag; extern uint8_t connectbleFlag;
extern uint8_t get_num_buf[34]; extern uint8_t get_num_buf[34];
extern uint8_t blename[4]; extern uint8_t blename[5];
extern uint8_t recvflag111; extern uint8_t recvflag111;
#endif #endif
\ No newline at end of file
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ d966adf5
...@@ -535,6 +535,7 @@ void Read_IPK_Session_Type(void)//请求仪表发送 软硬件版本号 等数 ...@@ -535,6 +535,7 @@ void Read_IPK_Session_Type(void)//请求仪表发送 软硬件版本号 等数
} }
} }
uint8_t LED_Waring = 0; uint8_t LED_Waring = 0;
uint8_t ABStime = 0;
void Function_Check_Ctrl(uint32_t cmd) void Function_Check_Ctrl(uint32_t cmd)
{ {
uint8_t p [ 20 ]; uint8_t p [ 20 ];
...@@ -588,7 +589,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -588,7 +589,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LED3 = 0; //右转 LED3 = 0; //右转
LED4 = 0; LED4 = 0;
LINE_OUT_NEG_05 = 0; LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 0; LINE_OUT_NEG_06 = 1;
LINE_jinguang = 0; LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0; POWER_CTRL_KL30_Current = 0;
if(Auto_ONOFF == 0) if(Auto_ONOFF == 0)
...@@ -599,6 +600,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -599,6 +600,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_02 = 1; LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1; LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1; LINE_OUT_NEG_04 = 1;
POWER_CTRL_KL30 = 0;
break; break;
} }
...@@ -610,6 +612,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -610,6 +612,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_06 = 0; LINE_OUT_NEG_06 = 0;
POWER_CTRL_KL30_Current = 0; POWER_CTRL_KL30_Current = 0;
LINE_jinguang = 1; LINE_jinguang = 1;
POWER_CTRL_KL30 = 0;
break; break;
} }
case 2: case 2:
...@@ -630,11 +633,12 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -630,11 +633,12 @@ void Function_Check_Ctrl(uint32_t cmd)
case 3: case 3:
{ {
LED3 = 1; LED3 = 1;
LINE_OUT_NEG_06 = 1; LINE_OUT_NEG_06 = 0;
LINE_OUT_NEG_05 = 1; LINE_OUT_NEG_05 = 1;
LINE_jinguang = 0; LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0; POWER_CTRL_KL30_Current = 0;
LED4 = 0; LED4 = 0;
POWER_CTRL_KL30 = 0;
break; break;
} }
case 4: case 4:
...@@ -645,6 +649,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -645,6 +649,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_jinguang = 0; LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0; POWER_CTRL_KL30_Current = 0;
LED4 = 0; LED4 = 0;
POWER_CTRL_KL30 = 0;
break; break;
} }
...@@ -656,6 +661,9 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -656,6 +661,9 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_jinguang = 0; LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0; POWER_CTRL_KL30_Current = 0;
LED4 = 0; LED4 = 0;
POWER_CTRL_KL30 = 0;
queren = 0 ;
// ABStime = 0;
break; break;
} }
case 6: case 6:
...@@ -666,6 +674,17 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -666,6 +674,17 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_jinguang = 0; LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0; POWER_CTRL_KL30_Current = 0;
LED4 = 0; LED4 = 0;
POWER_CTRL_KL30 = 0;
if(ABStime < 30)
{
ABStime++;
}
else
{
queren = 1;
ABStime = 0;
}
break; break;
} }
case 7: case 7:
...@@ -676,6 +695,9 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -676,6 +695,9 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_jinguang = 0; LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0; POWER_CTRL_KL30_Current = 0;
LED4 = 0; LED4 = 0;
POWER_CTRL_KL30 = 0;
queren = 0;
// ABStime = 0;
break; break;
} }
case 8: case 8:
...@@ -686,6 +708,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -686,6 +708,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_jinguang = 0; LINE_jinguang = 0;
LED4 = 0; LED4 = 0;
POWER_CTRL_KL30_Current = 1; POWER_CTRL_KL30_Current = 1;
POWER_CTRL_KL30 = 0;
break; break;
} }
case 9: case 9:
...@@ -696,6 +719,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -696,6 +719,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_jinguang = 0; LINE_jinguang = 0;
LED4 = 0; LED4 = 0;
POWER_CTRL_KL30_Current = 0; POWER_CTRL_KL30_Current = 0;
POWER_CTRL_KL30 = 0;
break; break;
} }
case 10: case 10:
...@@ -706,6 +730,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -706,6 +730,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_06 = 1; LINE_OUT_NEG_06 = 1;
LINE_jinguang = 1; LINE_jinguang = 1;
POWER_CTRL_KL30_Current = 1; POWER_CTRL_KL30_Current = 1;
POWER_CTRL_KL30 = 1;
break; break;
} }
case 11: case 11:
...@@ -722,6 +747,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -722,6 +747,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_05 = 0; LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 1; LINE_OUT_NEG_06 = 1;
LINE_jinguang = 1; LINE_jinguang = 1;
POWER_CTRL_KL30 = 1;
POWER_CTRL_KL30_Current = 1; POWER_CTRL_KL30_Current = 1;
break; break;
} }
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ d966adf5
...@@ -336,7 +336,7 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent) ...@@ -336,7 +336,7 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent)
/*清零ODO*/ /*清零ODO*/
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
Display_TFT_Clear();
if(connectbleFlag == 0) if(connectbleFlag == 0)
{ {
connectbleFlag = 1; connectbleFlag = 1;
...@@ -345,6 +345,7 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent) ...@@ -345,6 +345,7 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent)
} }
else else
{ {
Display_TFT_Clear();
name1= (devicename) & 0xFF; name1= (devicename) & 0xFF;
name2 = (devicename >> 8) & 0xFF; name2 = (devicename >> 8) & 0xFF;
startONfalg = 0; startONfalg = 0;
...@@ -359,7 +360,7 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent) ...@@ -359,7 +360,7 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent)
} }
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{ {
connectbleFlag = 0;
} }
else else
{ {
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.h
View file @ d966adf5
...@@ -881,7 +881,7 @@ typedef union ...@@ -881,7 +881,7 @@ typedef union
uint8_t : 8; /* 37预留 */ uint8_t : 8; /* 37预留 */
uint8_t : 4; /* 38预留 */ uint8_t nenglainhuishou :4; /* 38预留 */
uint8_t Shoppingmode : 2; /*导购模式*/ uint8_t Shoppingmode : 2; /*导购模式*/
uint8_t : 2; /* 38预留 */ uint8_t : 2; /* 38预留 */
...@@ -1074,14 +1074,14 @@ typedef union ...@@ -1074,14 +1074,14 @@ typedef union
uint8_t : 8; /* 48预留 */ uint8_t : 8; /* 48预留 */
uint8_t : 8; /* 49预留 */ uint8_t : 8; /* 49预留 */
/* Byte 50-51 */ /* Byte 50-51 */
uint8_t : 8; /* 50预留 */ uint8_t ESP321 :8; /* 50预留 */
uint8_t : 8; /* 51预留 */ uint8_t ESP322: 8; /* 51预留 */
/* Byte 52-53 */ /* Byte 52-53 */
uint8_t : 8; /* 52预留 */ uint8_t : 8; /* 52预留 */
uint8_t : 8; /* 53预留 */ uint8_t : 8; /* 53预留 */
/* Byte 54-55 */ /* Byte 54-55 */
uint8_t : 8; /* 54预留 */ uint8_t G0311 :8; /* 54预留 */
uint8_t : 8; /* 55预留 */ uint8_t G0312 :8; /* 55预留 */
/* Byte 56-57 */ /* Byte 56-57 */
uint8_t : 8; /* 56预留 */ uint8_t : 8; /* 56预留 */
uint8_t : 8; /* 57预留 */ uint8_t : 8; /* 57预留 */
...@@ -1139,6 +1139,7 @@ extern uint32_t R485_Send_clear(void); ...@@ -1139,6 +1139,7 @@ extern uint32_t R485_Send_clear(void);
extern uint32_t R485_Sendcheck_0x47(void); extern uint32_t R485_Sendcheck_0x47(void);
extern uint32_t R485_Send_0x80(void); extern uint32_t R485_Send_0x80(void);
extern uint32_t R485_Send_0x45(void);
extern uint32_t R485_Send_ble0x42(void); extern uint32_t R485_Send_ble0x42(void);
extern uint8_t barcode_Msg[64]; extern uint8_t barcode_Msg[64];
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ d966adf5
...@@ -101,10 +101,11 @@ void RTE_GPIO_Init(void) ...@@ -101,10 +101,11 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_IN; gpio_temp.enGPIODir = GPIO_DIR_IN;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp); GPIO_Config(&gpio_temp);
// LINE_OUT_NEG_01 = 1; LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_02 = 1; LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1; LINE_OUT_NEG_03 = 1;
// LINE_OUT_NEG_04 = 1; LINE_OUT_NEG_04 = 1;
queren = 0;
#if(0) #if(0)
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ d966adf5
...@@ -148,6 +148,8 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -148,6 +148,8 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
// { // {
// bleOFFtoONtime++; // bleOFFtoONtime++;
// } // }
if(RS485_TX_finish == 0)
{
if(startONfalg == 0) if(startONfalg == 0)
{ {
if(send0x42time<130) if(send0x42time<130)
...@@ -176,17 +178,15 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -176,17 +178,15 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
LINE_OUT_NEG_04 = 1; LINE_OUT_NEG_04 = 1;
R485_Send_0x80(); R485_Send_0x80();
blename[4] = 0xFF; blename[4] = 0xFF;
if(recvflag111 == 1)
{
General_Number_Disp(blename, 3, 165);
recvflag111 = 0;
}
} }
} }
RS485_send_time = 0; RS485_send_time = 0;
RS485_TX_finish = 1; RS485_TX_finish = 1;
} }
}
} }
// else // else
...@@ -197,8 +197,13 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -197,8 +197,13 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
} }
else else
{ {
// backsend();
LINE_OUT_NEG_09 = 0; LINE_OUT_NEG_09 = 0;
if(LINE_OUT_NEG_09 == 0)
{
Recv_Byte(); Recv_Byte();
}
} }
...@@ -316,6 +321,7 @@ uint32_t AutoTime = 160; ...@@ -316,6 +321,7 @@ uint32_t AutoTime = 160;
uint32_t ONOFFtime; uint32_t ONOFFtime;
uint8_t compareresult; uint8_t compareresult;
uint8_t flashtime = 0; uint8_t flashtime = 0;
uint8_t showtime = 0;
void Sys_Run_Mode_100ms_Tasks_Group(void) void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
static uint32_t loc_timer = 0; static uint32_t loc_timer = 0;
...@@ -402,7 +408,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -402,7 +408,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
// comparestart = 2; // comparestart = 2;
} }
comparestart = 0; comparestart = 0;
Display_TFT_Clear(); // Display_TFT_Clear();
} }
else if(comparestart == 0) else if(comparestart == 0)
{ {
...@@ -430,7 +436,13 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -430,7 +436,13 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
} }
flashtime = 0; flashtime = 0;
} }
if(recvflag111 == 1)
{
blename[4] = 0xff;
General_Number_Disp(blename, 3, 165);
recvflag111 = 0;
}
//u16LJSText = TFT_LCD_REQ_FIFO_MAX_DEPTH; //u16LJSText = TFT_LCD_REQ_FIFO_MAX_DEPTH;
} }
......
YueJin_test_bench/source/Appliciation/api_RS485.c
View file @ d966adf5
...@@ -492,18 +492,18 @@ void RS485_User_Tx_Data(void) ...@@ -492,18 +492,18 @@ void RS485_User_Tx_Data(void)
} }
} }
break; break;
// case 3: case 3:
// sendfinishflag = R485_Send_0x80(); sendfinishflag = R485_Send_0x45();
// if(sendfinishflag == 0) if(sendfinishflag == 0)
// { {
// RS485_send_time = 0; RS485_send_time = 0;
// RS485_TX_finish = 1; RS485_TX_finish = 1;
// if(RS485_TX_finish == 1) if(RS485_TX_finish == 1)
// { {
// RS485_send_num++; RS485_send_num = 0;
// } }
// } }
// break; break;
default: default:
flag = 1; flag = 1;
RS485_send_time = 0; RS485_send_time = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment