project_boditech_vidas_a8000_v3
/
a8k_app
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

update

tags/v0
zhaohe 4 months ago
parent
7f57669e41
commit
f115a94acf
2 changed files with 7 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java
  2. 13
      src/main/java/a8k/app/service/data/A8kModParamInitService.java

2
src/main/java/a8k/app/hardware/basedriver/A8kCanBusService.java
View File

@ -113,7 +113,7 @@ public class A8kCanBusService {
return result; return result;
} }
public void waitForMod(MId mid, Integer acitionOvertime) throws AppException {
public void waitForMod(MId mid, Integer acitionOvertime) throws AppException {
long startedAt = System.currentTimeMillis(); long startedAt = System.currentTimeMillis();
CmdId action = connection.getLastTxCmd(mid); CmdId action = connection.getLastTxCmd(mid);
do { do {

13
src/main/java/a8k/app/service/data/A8kModParamInitService.java
View File

@ -246,12 +246,12 @@ public class A8kModParamInitService {
addRegMarker(ModuleType.WaterCoolingTempCtrl, RegIndex.kreg_water_cooling_tmp_controler_pid_compute_interval); addRegMarker(ModuleType.WaterCoolingTempCtrl, RegIndex.kreg_water_cooling_tmp_controler_pid_compute_interval);
//PipetteGunCtrl //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_shift);
addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_shaft); addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_shaft);
addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_one_circle_pulse); 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_enable_enc);
addRegMarker(ModuleType.PipetteGunCtrl, RegIndex.kreg_pipette_zm_dzero); 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_t_pos_offset);
addRegMarker(ModuleType.A8kOptical, RegIndex.kreg_a8k_opt_f_pos_offset); addRegMarker(ModuleType.A8kOptical, RegIndex.kreg_a8k_opt_f_pos_offset);
addRegMarker(ModuleType.A8kOptical, RegIndex.kreg_a8k_opt_t_reverse_scan_pos_offset); addRegMarker(ModuleType.A8kOptical, RegIndex.kreg_a8k_opt_t_reverse_scan_pos_offset);

Write Preview
Loading…
Cancel
Save