p_chinagoldgroup_hand_acid
/
hand_acid_mainboard_bak
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

v301

master
zhaohe 7 months ago
parent
af1d883654
commit
f59b23e6dd
9 changed files with 31 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .settings/language.settings.xml
  2. 42
      README.md
  3. 17
      auto.py
  4. 1
      build.bat
  5. 9
      hello.cpp
  6. 8
      usrc/apphardware/apphardware.cpp
  7. 2
      usrc/project_configs.h
  8. 11
      usrc/service/app_core.cpp
  9. 4
      usrc/service/pump_ctrl_service.cpp

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="536594971432658660" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1756980517137003911" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="565341019170585871" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1728234469399076700" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

42
README.md
View File

@ -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. 扫描的结果没有过滤，都上报了。

17
auto.py
View File

@ -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)

1
build.bat
View File

@ -0,0 +1 @@
C:\ST\STM32CubeIDE_1.15.0\STM32CubeIDE\headless-build.bat -data ../ -build hand_acid_mainboard/Debug

9
hello.cpp
View File

@ -1,9 +0,0 @@
#include <stdio.h>
#include <iostream>
#include "ui/ui.h"
int main() {
std::cout << "Hello, World!" << std::endl;
return 0;
}

8
usrc/apphardware/apphardware.cpp
View File

@ -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);

2
usrc/project_configs.h
View File

@ -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

11
usrc/service/app_core.cpp
View File

@ -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());

4
usrc/service/pump_ctrl_service.cpp
View File

@ -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()) {

Write Preview
Loading…
Cancel
Save