From f59b23e6ddc4226a359845eb20b9730c5d059723 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 12 Jan 2025 13:01:06 +0800 Subject: [PATCH] v301 --- .settings/language.settings.xml | 4 ++-- README.md | 42 +++++++++----------------------------- auto.py | 17 --------------- build.bat | 1 + hello.cpp | 9 -------- usrc/apphardware/apphardware.cpp | 8 ++++---- usrc/project_configs.h | 2 +- usrc/service/app_core.cpp | 11 ++++++++++ usrc/service/pump_ctrl_service.cpp | 4 ++-- 9 files changed, 31 insertions(+), 67 deletions(-) delete mode 100644 auto.py create mode 100644 build.bat delete mode 100644 hello.cpp diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index a98bafb..6bc7291 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/README.md b/README.md index f1cfc6a..168f150 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,20 @@ ``` -V101: -1. 重构加酸逻辑 -2. 预充管路，改成先回流再预冲 -3. 修改提示 "泵机" 为 "通道" -4. 修改预充管路，只充满选中管路 +RELEASE +V301: + 1. 修复板子启动失败的问题（通过调整电机驱动使能间隔时间实现） + 2. 调整电机使能位置（移动到了屏幕初始化之后） + 3. 修复测试模式下，电机停止动作不连续的问题。 -V102: - 1.设备在工作时，禁止离开首页 - 2.设备在工作时，禁止切换模式 -V103: - 1. fix some bug ``` -``` -任务: + + + + +``` TODO: 1. 输入超过10次错误密码后，弹出提示框，请等待24小时，24小时后，页面将自动切换到恢复出厂设置页面。 2. 添加恢复出厂设置按键，且恢复出厂设置按键按下后，需要根用户二次确认。 @@ -27,21 +25,6 @@ TODO: ``` -``` -UI修改项: - 1. 登录页面去掉 login按键的自动切换页面指令 - 2. 主页，调整遥控器和阀门控制板状态的位置 - 3. 去掉加载页面自动跳转功能 - 4. 主页控制模式，支持触摸 - 5. 调整5s的位置 - 6. 首页添加加酸间隔时间单位显示 - 7. 修改confirm页面取消按键和确定按键位置 - 8. 修改主页面 menu按键切换页面由后台处理逻辑 - 9. 修改每个页面的后初始化事件，区分当前页面是键盘，还是弹窗，还是普通页面。 - 10. 去掉menu页面的setfrompage - 11. 美化提示栏 - -``` ``` 1. 将confirm功能提取出来，单独有一个confirm页面进行处理 @@ -62,11 +45,6 @@ UI ``` ``` -BUG: - 1. 数字键盘按下任意键，会清除输入（这是正确的），但会忽略掉本次输入 -``` - -``` 蓝牙主机BUG 1. 无法停止扫描。 2. 扫描的结果没有过滤，都上报了。 diff --git a/auto.py b/auto.py deleted file mode 100644 index 1090d79..0000000 --- a/auto.py +++ /dev/null @@ -1,17 +0,0 @@ -import time -import ctypes -from pynput.keyboard import Key -from pynput.keyboard import Controller -a=0 -while True: - if ctypes.windll.user32.GetForegroundWindow() == 0: - print('0') - time.sleep(2) - else: - a = a+1 - b = Controller() - b.press(Key.f20) - b.release(Key.f20) - time.sleep(30) - print('1') - print(a) diff --git a/build.bat b/build.bat new file mode 100644 index 0000000..5db49c2 --- /dev/null +++ b/build.bat @@ -0,0 +1 @@ +C:\ST\STM32CubeIDE_1.15.0\STM32CubeIDE\headless-build.bat -data ../ -build hand_acid_mainboard/Debug \ No newline at end of file diff --git a/hello.cpp b/hello.cpp deleted file mode 100644 index a3bb1db..0000000 --- a/hello.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include -#include "ui/ui.h" - -int main() { - std::cout << "Hello, World!" << std::endl; - return 0; - -} \ No newline at end of file diff --git a/usrc/apphardware/apphardware.cpp b/usrc/apphardware/apphardware.cpp index e503279..db72605 100644 --- a/usrc/apphardware/apphardware.cpp +++ b/usrc/apphardware/apphardware.cpp @@ -91,10 +91,10 @@ void AppHardware::initialize() { MOTO3.setScale(1000); MOTO4.setScale(1000); - MOTO1.enable(1); - MOTO2.enable(1); - MOTO3.enable(1); - MOTO4.enable(1); + // MOTO1.enable(1); + // MOTO2.enable(1); + // MOTO3.enable(1); + // MOTO4.enable(1); // MOTO1.rotate(1000); // MOTO2.rotate(1000); diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 8ec5330..ce5195b 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -18,7 +18,7 @@ #define HARDWARE_VERSION 1 // 硬件版本 #define PROJECT "hand_acid_main_board" // 工程名称 -#define APP_VERSION "3.0.0" +#define APP_VERSION "3.0.1" #define MOTOR_NUM 4 diff --git a/usrc/service/app_core.cpp b/usrc/service/app_core.cpp index 8437ca9..69110b0 100644 --- a/usrc/service/app_core.cpp +++ b/usrc/service/app_core.cpp @@ -97,6 +97,17 @@ void AppCore::initialize() { AppHardware::ins()->initialize(); // 基础硬件初始化 UIControler::ins()->postInitialize(); + //使能电机 + AppHardware::ins()->MOTO1.enable(1); + osDelay(1000); + AppHardware::ins()->MOTO2.enable(1); + osDelay(1000); + AppHardware::ins()->MOTO3.enable(1); + osDelay(1000); + AppHardware::ins()->MOTO4.enable(1); + osDelay(1000); + + ID* id = &AppHardware::ins()->id; ZLOGI(TAG, "ID0:%d ID1:%d ID2:%d ID3:%d ID4:%d", // id->ID0.read(), id->ID1.read(), id->ID2.read(), id->ID3.read(), id->ID4.read()); diff --git a/usrc/service/pump_ctrl_service.cpp b/usrc/service/pump_ctrl_service.cpp index 92a361c..be8e2ca 100644 --- a/usrc/service/pump_ctrl_service.cpp +++ b/usrc/service/pump_ctrl_service.cpp @@ -249,8 +249,8 @@ void PumpCtrlService::rotate(int32_t mid, int32_t direction) { tryUpdateMotorSetting(); ValveStateSyncService::ins()->setValveState(1); TMC51X0* cur_motor = m_motors[mid]; - // cur_motor->rotate(direction > 0 ? AcidChCfgDao::getCfg(mid)->pumpDefVel : -AcidChCfgDao::getCfg(mid)->pumpDefVel); - cur_motor->moveToEnd(direction > 0 ? 1 : -1, AcidChCfgDao::getCfg(mid)->pumpDefVel); + cur_motor->rotate(direction > 0 ? AcidChCfgDao::getCfg(mid)->pumpDefVel : -AcidChCfgDao::getCfg(mid)->pumpDefVel); + // cur_motor->moveToEnd(direction > 0 ? 1 : -1, AcidChCfgDao::getCfg(mid)->pumpDefVel); } void PumpCtrlService::stopRotate() { if (isWorking()) {