Browse Source

v1.1.0| 调试页面添加部分调试工具

master
zhaohe 3 months ago
parent
commit
c51ba54bb9
  1. 3
      .gitignore
  2. 2
      deply.bat
  3. 2
      src/main/java/a8k/app/config/VersionConfig.java
  4. 6
      src/main/java/a8k/extui/page/driver/PipetteMotorCtrlPage.java
  5. 10
      src/main/java/a8k/extui/page/init/DeviceInitPage.java

3
.gitignore

@ -36,4 +36,5 @@ runenv/
tmp/
app.db
!/bak/app.db
!/bak/app.db
log/*

2
deply.bat

@ -17,7 +17,7 @@ scp %JAR_FILE% %REMOTE_USER%@%REMOTE_HOST%:%REMOTE_DIR%%REMOTE_FILE%
@REM scp -r appresource %REMOTE_USER%@%REMOTE_HOST%:/app/
:: 重启远程服务器
@REM ssh %REMOTE_USER%@%REMOTE_HOST% `systemctl start zapp`
ssh %REMOTE_USER%@%REMOTE_HOST% `systemctl start zapp`
:: 判断 SCP 命令是否成功
if %errorlevel% neq 0 (

2
src/main/java/a8k/app/config/VersionConfig.java

@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
@Component
@Slf4j
public class VersionConfig {
static String version = "1.0";
static String version = "1.1.0";
@PostConstruct
public void init() {

6
src/main/java/a8k/extui/page/driver/PipetteMotorCtrlPage.java

@ -40,6 +40,10 @@ public class PipetteMotorCtrlPage {
pipetteCtrlDriver.zMotorMoveZeroBlock();
}
public void zMotorMoveToZeroPointQuickBlock() throws AppException {
pipetteCtrlDriver.zMotorMoveToZeroPointQuickBlock();
}
public void stepMotorStop() throws AppException {
pipetteCtrlDriver.moduleStop();
}
@ -130,6 +134,7 @@ public class PipetteMotorCtrlPage {
pipetteCtrlDriver.setReg(PipetteRegIndex.kreg_pipette_zm_dzero, dZeroPos);
}
public Integer readReg(PipetteRegIndex reg) {
try {
return pipetteCtrlDriver.getReg(reg);
@ -156,6 +161,7 @@ public class PipetteMotorCtrlPage {
page.newGroup("绝对移动");
page.addFunction("绝对移动", this::stepMotorEasyMoveTo);
page.addFunction("快速归零", this::zMotorMoveToZeroPointQuickBlock);
page.newGroup("寄存器配置");
page.addFunction("设备MRES", this::setMres).setParamVal("mres", () -> readReg(PipetteRegIndex.kreg_pipette_zm_mres));

10
src/main/java/a8k/extui/page/init/DeviceInitPage.java

@ -42,6 +42,16 @@ public class DeviceInitPage {
return gstate.getDeviceRunMode().name();
}
@ExtApiStatu(name = "", group = "单片机初始化完成", order = 2)
public Boolean subModuleRegistered() {
return gstate.getBoardParamInited();
}
@ExtApiStatu(name = "", group = "设备初始化完成", order = 3)
public Boolean deviceInited() {
return gstate.getDeviceInited();
}
//
public void setInRealMode() {

Loading…
Cancel
Save