diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..ddfadc2 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,28 @@ +{ + "tasks": [ + { + "type": "cppbuild", + "label": "C/C++: gcc.exe 生成活动文件", + "command": "D:\\MinGW\\bin\\gcc.exe", + "args": [ + "-fdiagnostics-color=always", + "-g", + "${file}", + "-o", + "${fileDirname}\\${fileBasenameNoExtension}.exe" + ], + "options": { + "cwd": "${fileDirname}" + }, + "problemMatcher": [ + "$gcc" + ], + "group": { + "kind": "build", + "isDefault": true + }, + "detail": "调试器生成的任务。" + } + ], + "version": "2.0.0" +} \ No newline at end of file diff --git a/app/tiny_frame/by_tiny_frame_slave_read_write.c b/app/tiny_frame/by_tiny_frame_slave_read_write.c index df356c0..70d9532 100644 --- a/app/tiny_frame/by_tiny_frame_slave_read_write.c +++ b/app/tiny_frame/by_tiny_frame_slave_read_write.c @@ -15,31 +15,31 @@ void by_tiny_frame_read_write_run(void) void by_tiny_frame_read_write_handle(by_tf_parse_frame_t frame_s, uint8_t status) { -// by_tf_pack_frame_t frame_pack_s; + by_tf_pack_frame_t frame_pack_s; -// frame_pack_s.slave_id = BY_TF_DEVICE_SLAVE_ADDRESS; -// frame_pack_s.cmd = frame_s.cmd; -// frame_pack_s.reg_addr = frame_s.reg_addr; + frame_pack_s.slave_id = BY_TF_DEVICE_SLAVE_ADDRESS; + frame_pack_s.cmd = frame_s.cmd; + frame_pack_s.reg_addr = frame_s.reg_addr; -// if (status) { -// // 接收出错,一般为 CRC 校验错误 -// return; -// } + if (status) { + // 接收出错,一般为 CRC 校验错误 + return; + } -// switch (frame_s.cmd) { -// case 0x03: -// // 添加查询接口,操作完成后应答,主机接收,即读取 -// frame_pack_s.data =(uint32_t)(addre[frame_pack_s.reg_addr]); -// by_tiny_frame_pack_send(&frame_pack_s); -// break; -// case 0x06: -// // 添加写入接口,操作完成后应答,主机发送,即写入 -// *addre[frame_pack_s.reg_addr] = frame_pack_s.data; -// by_tiny_frame_pack_send(&frame_pack_s); -// break; -// default: -// break; -// } + switch (frame_s.cmd) { + case 0x03: + // 添加查询接口,操作完成后应答,主机接收,即读取 + frame_pack_s.data =(uint32_t)(addre[frame_pack_s.reg_addr]); + by_tiny_frame_pack_send(&frame_pack_s); + break; + case 0x06: + // 添加写入接口,操作完成后应答,主机发送,即写入 + *addre[frame_pack_s.reg_addr] = frame_pack_s.data; + by_tiny_frame_pack_send(&frame_pack_s); + break; + default: + break; + } #if (BY_TF_DEBUG) printf("****** EXECUTE CMD SUCCESSFUL ******\r\n");