临时提交

1 year ago · c900f40bb8
10 changed files with 38 additions and 6 deletions
--- a/pom.xml
+++ b/pom.xml
@ -10,7 +10,7 @@
    </parent>
    <groupId>com.iflytop</groupId>
    <artifactId>uf</artifactId>
-    <version>0.0.30</version>
+    <version>0.0.35</version>
    <name>uf</name>
    <description>uf</description>
    <properties>
--- a/src/main/java/com/iflytop/uf/UfActuatorCmdExecutor.java
+++ b/src/main/java/com/iflytop/uf/UfActuatorCmdExecutor.java
@ -113,9 +113,12 @@ public class UfActuatorCmdExecutor {
        if ( null == command ) {
            throw new RuntimeException("无效的命令KEY ：" + cmdKey);
        }
+
+        command.parameters = command.fixedParameters;
        if ( null != cmdParams ) {
            command.parameters = cmdParams;
        }
+
        return execute(command);
    }

--- a/src/main/java/com/iflytop/uf/actuator/UfActMiniServo.java
+++ b/src/main/java/com/iflytop/uf/actuator/UfActMiniServo.java
@ -0,0 +1,12 @@
+package com.iflytop.uf.actuator;
+import com.iflytop.uf.UfActuatorBase;
+import com.iflytop.uf.UfActuatorCommand;
+import com.iflytop.uf.UfActuatorHandler;
+import com.iflytop.uf.model.UfMdbActuatorCmd;
+@UfActuatorHandler(name = "mini-servo-motor")
+public class UfActMiniServo extends UfActuatorBase {
+    @UfActuatorCommand(name = "mini_servo_move_to")
+    public String enable(UfMdbActuatorCmd cmd) {
+        return this.executeAndWaitForFinish(cmd);
+    }
+}
--- a/src/main/java/com/iflytop/uf/actuator/UfActStepperMotor.java
+++ b/src/main/java/com/iflytop/uf/actuator/UfActStepperMotor.java
@ -3,21 +3,35 @@ import com.iflytop.uf.*;
 import com.iflytop.uf.model.UfMdbActuatorCmd;
@UfActuatorHandler(name = "stepper-motor")
 public class UfActStepperMotor extends UfActuatorBase {
+    @UfActuatorCommand(name="step_motor_easy_move_to")
+    public String stepMotorEasyMoveTo(UfMdbActuatorCmd cmd) {
+        return this.executeAndWaitForFinish(cmd);
+    }
+
+    @UfActuatorCommand(name="step_motor_easy_move_to_zero")
+    public String stepMotorEasyMoveToZero(UfMdbActuatorCmd cmd) {
+        return this.executeAndWaitForFinish(cmd);
+    }
+
+    @Deprecated
    @UfActuatorCommand(name = "motor_easy_move_to_zero")
    public String easyMoveToZero(UfMdbActuatorCmd cmd) {
        return this.executeAndWaitForFinish(cmd);
    }

+    @Deprecated
    @UfActuatorCommand(name = "motor_easy_move_to")
    public String easyMoveTo(UfMdbActuatorCmd cmd) {
        return this.executeAndWaitForFinish(cmd);
    }

+    @Deprecated
    @UfActuatorCommand(name = "motor_easy_move_by")
    public String easyMoveBy(UfMdbActuatorCmd cmd) {
        return this.executeAndWaitForFinish(cmd);
    }

+    @Deprecated
    @UfActuatorCommand(name = "motor_easy_move_to_io")
    public String easyMoveToIo(UfMdbActuatorCmd cmd) {
        return this.executeAndWaitForFinish(cmd);
--- a/src/main/java/com/iflytop/uf/connection/UfZcancmderWebsocket.java
+++ b/src/main/java/com/iflytop/uf/connection/UfZcancmderWebsocket.java
@ -165,7 +165,10 @@ public class UfZcancmderWebsocket extends UfConnectionBase {
        String cmd = this.buildCommand(actuatorCmd);

        UfMdbActuator actuator = UfMdbActuator.findOne(UfMdbActuator.class, actuatorCmd.actuatorId);
+        var logIgnoreList = List.of("module_get_status");
+        if ( !logIgnoreList.contains(actuatorCmd.cmdKey) ) {
            this.log("%s.%s(%s) => %s", actuator.name, actuatorCmd.cmdKey, actuatorCmd.parameters, cmd);
+        }

        this.reconnectIfClosed();

--- a/src/main/resources/static/uf/index.html
+++ b/src/main/resources/static/uf/index.html
@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/uf/favicon.ico"><title>web</title><script defer="defer" src="/uf/js/chunk-vendors.0f638fda.js"></script><script defer="defer" src="/uf/js/app.842430c2.js"></script><link href="/uf/css/app.5595db20.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/uf/favicon.ico"><title>web</title><script defer="defer" src="/uf/js/chunk-vendors.0f638fda.js"></script><script defer="defer" src="/uf/js/app.201353f0.js"></script><link href="/uf/css/app.5595db20.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
--- a/src/main/resources/static/uf/js/app.201353f0.js
+++ b/src/main/resources/static/uf/js/app.201353f0.js
--- a/src/main/resources/static/uf/js/app.201353f0.js.map
+++ b/src/main/resources/static/uf/js/app.201353f0.js.map
--- a/src/main/resources/static/uf/js/app.842430c2.js
+++ b/src/main/resources/static/uf/js/app.842430c2.js
--- a/src/main/resources/static/uf/js/app.842430c2.js.map
+++ b/src/main/resources/static/uf/js/app.842430c2.js.map