btl143/QDAC-firmware
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 通信bug修复及测试

Browse Source
This commit is contained in:
井明江
2024-03-02 18:17:30 +08:00
parent 8311d9270e
commit 79f03ae6b4
5 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/jj_param.c
View File

@@ -5,6 +5,7 @@
PARAM_INFO Param_Data[DATA_NUM]; PARAM_INFO Param_Data[DATA_NUM];
soft_iic_info_struct eeprom_param; soft_iic_info_struct eeprom_param;
TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM]; TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM];
TYPE_UNION tiny_frame_param[20];
uint32_t *addre[2]; uint32_t *addre[2];
float data0 = 1.0f; float data0 = 1.0f;
float data1 = 1.05f; float data1 = 1.05f;

2
app/jj_param.h
View File

@@ -56,10 +56,10 @@ typedef struct {
uint8_t cmd;//01:仅存储 00：仅显示 02：传输并显示 uint8_t cmd;//01:仅存储 00：仅显示 02：传输并显示
char *text; char *text;
} PARAM_INFO; } PARAM_INFO;
extern uint32_t * addre[2];
extern soft_iic_info_struct eeprom_param; extern soft_iic_info_struct eeprom_param;
extern PARAM_INFO Param_Data[DATA_NUM]; extern PARAM_INFO Param_Data[DATA_NUM];
extern TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM]; extern TYPE_UNION iic_buffer[DATA_IN_FLASH_NUM];
extern TYPE_UNION tiny_frame_param[20];
void jj_param_eeprom_init(void); void jj_param_eeprom_init(void);
void jj_param_write(void); void jj_param_write(void);
void jj_param_read(void); void jj_param_read(void);

26
app/main.c
View File

@@ -46,7 +46,6 @@ void test(by_tf_parse_frame_t frame_s, uint8_t status)
printf("hhhhhhok\r\n"); printf("hhhhhhok\r\n");
} }
} }
int main(void) int main(void)
{ {
@@ -69,30 +68,14 @@ int main(void)
by_tiny_frame_init(); by_tiny_frame_init();
printf("start running\r\n"); printf("start running\r\n");
tiny_frame_param[0].f32 = 100.5f;
/** 测试完成后移除 **/ // by_tiny_frame_read(0x0D, 0x4059, &data_test);
// by_tiny_frame_parse_handle_register(test);
// by_tiny_frame_parse_start_listen();
by_tf_pack_frame_t frame_now;
frame_now.cmd = 0x06;
frame_now.data = 0x19260817;
frame_now.reg_addr = 0x00;
frame_now.slave_id = 0x0D;
/** 测试完成后移除 **/
// by_tiny_frame_write(0x0D, 0x4059, 0x19260817);
by_tiny_frame_read(0x0D, 0x4059, &data_test);
while (1) { while (1) {
Page_Run(); Page_Run();
// by_buzzer_run(); // by_buzzer_run();
by_tiny_frame_write(0x0D, 0x0000, tiny_frame_param[0].u32);
/** 测试完成后移除 **/ by_tiny_frame_run();
by_tiny_frame_pack_send(&frame_now);
system_delay_ms(10); system_delay_ms(10);
/** 测试完成后移除 **/
if (mt9v03x_finish_flag) { if (mt9v03x_finish_flag) {
// 该操作消耗大概 1970 个 tick，折合约 110us // 该操作消耗大概 1970 个 tick，折合约 110us
memcpy(mt9v03x_image_copy[0], mt9v03x_image[0], (sizeof(mt9v03x_image_copy) / sizeof(uint8_t))); memcpy(mt9v03x_image_copy[0], mt9v03x_image[0], (sizeof(mt9v03x_image_copy) / sizeof(uint8_t)));
@@ -108,7 +91,6 @@ int main(void)
// ElementJudge(); // ElementJudge();
// ElementRun(); // ElementRun();
// MidLineTrack(); // MidLineTrack();
} }
} }
} }

1
app/tiny_frame/by_tiny_frame.c
View File

@@ -18,6 +18,7 @@ void by_tiny_frame_init(void)
uart_rx_interrupt(BY_TF_UART_INDEX, ENABLE); uart_rx_interrupt(BY_TF_UART_INDEX, ENABLE);
by_tiny_frame_parse_init(); by_tiny_frame_parse_init();
by_tiny_frame_pack_init();
#if defined(BY_TF_DEVICE_SLAVE) #if defined(BY_TF_DEVICE_SLAVE)
by_tiny_frame_parse_handle_register(by_tiny_frame_read_write_handle); by_tiny_frame_parse_handle_register(by_tiny_frame_read_write_handle);

1
app/tiny_frame/by_tiny_frame_parse.h
View File

@@ -22,6 +22,7 @@ typedef void (*by_tf_parse_done_handle_func)(by_tf_parse_frame_t, uint8_t);
extern void by_tiny_frame_parse_init(void); extern void by_tiny_frame_parse_init(void);
extern void by_tiny_frame_parse_uart_handle(uint8_t buff); extern void by_tiny_frame_parse_uart_handle(uint8_t buff);
extern void by_tiny_frame_parse_timer_handle(void);
extern void by_tiny_frame_parse_run(void); extern void by_tiny_frame_parse_run(void);
extern uint8_t by_tiny_frame_parse_crc(by_tf_parse_frame_t *frame_s); extern uint8_t by_tiny_frame_parse_crc(by_tf_parse_frame_t *frame_s);
extern void by_tiny_frame_parse_handle_register(by_tf_parse_done_handle_func func); extern void by_tiny_frame_parse_handle_register(by_tf_parse_done_handle_func func);