Browse Source

update

master
HSZ_HeSongZhen 3 months ago
parent
commit
efaffaa037
  1. 2
      src/main/java/iflytop/app/config/A8kSubModuleInitRegConfig.java
  2. 4
      src/main/java/iflytop/app/hardware/driver/StepMotorCtrlDriver.java
  3. 7
      src/main/java/iflytop/app/page/MotorCtrlPage.java
  4. 14
      src/main/java/iflytop/app/service/appsetup/A8kSubModuleRegInitService.java
  5. 4
      src/main/java/iflytop/app/utils/ZSqlite.java

2
src/main/java/iflytop/app/config/A8kSubModuleInitRegConfig.java

@ -103,7 +103,7 @@ public class A8kSubModuleInitRegConfig {
addRegMarker(ModuleType.MiniServo, RegIndex.kreg_mini_servo_servo_overload_torque); // 过载扭矩
addRegMarker(ModuleType.MiniServo, RegIndex.kreg_mini_servo_servo_acc); // 加速度
addRegMarker(ModuleType.LiquidDistributionArm, RegIndex.kreg_liquid_distribution_arm_enable);
// addRegMarker(ModuleType.LiquidDistributionArm, RegIndex.kreg_liquid_distribution_arm_enable);
addRegMarker(ModuleType.LiquidDistributionArm, RegIndex.kreg_liquid_distribution_arm_pos0_d0);
addRegMarker(ModuleType.LiquidDistributionArm, RegIndex.kreg_liquid_distribution_arm_pos0_d1);
addRegMarker(ModuleType.LiquidDistributionArm, RegIndex.kreg_liquid_distribution_arm_pos1_d0);

4
src/main/java/iflytop/app/hardware/driver/StepMotorCtrlDriver.java

@ -162,6 +162,10 @@ public class StepMotorCtrlDriver {
canBus.callcmd(id.mid, CmdId.module_reset_reg);
}
public ModuleStatus readStatus(StepMotorMId id) throws HardwareException {
return canBus.moduleGetStatus(id.mid);
}
public Object getAllReg(StepMotorMId id) throws HardwareException {
ObjectNode node = ZJsonHelper.createObjectNode();
for (StepMotorRegIndex regIndex : StepMotorRegIndex.values()) {

7
src/main/java/iflytop/app/page/MotorCtrlPage.java

@ -1,6 +1,7 @@
package iflytop.app.page;
import iflytop.app.hardware.driver.StepMotorCtrlDriver;
import iflytop.app.hardware.type.ModuleStatus;
import iflytop.app.hardware.type.StepMotorMId;
import iflytop.app.hardware.type.StepMotorRegIndex;
import iflytop.app.hardware.type.StepMotorSpeedLevel;
@ -13,6 +14,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import java.io.IOException;
@Component
public class MotorCtrlPage {
private static final Logger log = LoggerFactory.getLogger(MotorCtrlPage.class);
@ -90,6 +93,10 @@ public class MotorCtrlPage {
return stepMotorCtrlDriver.stepMotorReadEncPos(id);
}
public ModuleStatus readModuleStatus() throws HardwareException {
return stepMotorCtrlDriver.readStatus(id);
}
public Integer readPos() throws HardwareException {
return stepMotorCtrlDriver.stepMotorReadPos(id);
}

14
src/main/java/iflytop/app/service/appsetup/A8kSubModuleRegInitService.java

@ -58,20 +58,20 @@ public class A8kSubModuleRegInitService {
private void initModuleRegVal() {
do {
// try {
try {
log.info("forceInitA8kModParams");
// dumpAllSubBoardVersion();
// initA8kModParams();
dumpAllSubBoardVersion();
initA8kModParams();
isInited = true;
log.info("======================================================");
log.info("= init hardware param success...... =");
log.info("======================================================");
break;
// } catch (HardwareException e) {
// log.error("init hardware param fail......, try init it after 5s", e);
//// OS.forceSleep(5000);
// }
} catch (HardwareException e) {
log.error("init hardware param fail......, try init it after 5s", e);
OS.forceSleep(5000);
}
} while (true);
}

4
src/main/java/iflytop/app/utils/ZSqlite.java

@ -164,10 +164,10 @@ public class ZSqlite<T> {
public void importFromCSV(String csvcontent, boolean forceDelete) {
if (forceDelete) {
deleteAll();
List<T> list = ZCSVUtils.readCSV(csvcontent, tClass);
List<T> list = ZCSVUtils.readCSVContent(csvcontent, tClass);
list.forEach(this::add);
} else {
List<T> list = ZCSVUtils.readCSV(csvcontent, tClass);
List<T> list = ZCSVUtils.readCSVContent(csvcontent, tClass);
for (var val : list) {
var obj = tClass.cast(val);
try {

Loading…
Cancel
Save