diff --git a/src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java b/src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java index 6f0a954..96d713d 100644 --- a/src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java +++ b/src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java @@ -113,7 +113,7 @@ public class A8kCanBusService { return result; } - public void waitForMod(MId mid, Integer acitionOvertime) throws AppException { + public void waitForMod(MId mid, Integer acitionOvertime) throws AppException { long startedAt = System.currentTimeMillis(); CmdId action = connection.getLastTxCmd(mid); do { diff --git a/src/main/java/a8k/app/service/data/A8kModParamInitService.java b/src/main/java/a8k/app/service/data/A8kModParamInitService.java index f3e79d9..353902c 100644 --- a/src/main/java/a8k/app/service/data/A8kModParamInitService.java +++ b/src/main/java/a8k/app/service/data/A8kModParamInitService.java @@ -246,12 +246,12 @@ public class A8kModParamInitService { addRegMarker(ModuleType.WaterCoolingTempCtrl, RegIndex.kreg_water_cooling_tmp_controler_pid_compute_interval); //PipetteGunCtrl - addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_pos_nl); - addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_capactitance_val); - addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_tip_state); - addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_pos); - addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_is_enable); - addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_dpos); +// addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_pos_nl); +// addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_capactitance_val); +// addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_tip_state); +// addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_pos); +// addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_is_enable); +// addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_dpos); // addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_shift); addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_shaft); addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_one_circle_pulse); @@ -278,7 +278,6 @@ public class A8kModParamInitService { addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_enable_enc); addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_dzero); - //FanCtrl addRegMarker(ModuleType.A8kOptical, RegIndex.kreg_a8k_opt_t_pos_offset); addRegMarker(ModuleType.A8kOptical, RegIndex.kreg_a8k_opt_f_pos_offset); addRegMarker(ModuleType.A8kOptical, RegIndex.kreg_a8k_opt_t_reverse_scan_pos_offset);