diff --git a/usrc/project_configs.h b/usrc/project_configs.h index a96040d..2df3c00 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -1,5 +1,5 @@ #pragma once -#define PC_VERSION 104 +#define PC_VERSION 105 #define PC_MANUFACTURER "http://www.iflytop.com/" #define PC_PROJECT_NAME "a8000_subboard" #define PC_IFLYTOP_ENABLE_OS 1 diff --git a/usrc/subboards/subboard20_plate_clamp_case/subboard20_plate_clamp_case.cpp b/usrc/subboards/subboard20_plate_clamp_case/subboard20_plate_clamp_case.cpp index 0543284..ee8807f 100644 --- a/usrc/subboards/subboard20_plate_clamp_case/subboard20_plate_clamp_case.cpp +++ b/usrc/subboards/subboard20_plate_clamp_case/subboard20_plate_clamp_case.cpp @@ -12,7 +12,7 @@ extern "C" { #include "sdk/components/tmc/ic/ztmc4361A.hpp" #include "sdk\components\pipette_module\pipette_ctrl_module_v2.hpp" -#define TAG "ShakeModule" +#define TAG "Subboard20PlateClampCase" using namespace iflytop; diff --git a/usrc/subboards/subboard30_shake_module/subboard30_shake_module.cpp b/usrc/subboards/subboard30_shake_module/subboard30_shake_module.cpp index db61288..6ec923e 100644 --- a/usrc/subboards/subboard30_shake_module/subboard30_shake_module.cpp +++ b/usrc/subboards/subboard30_shake_module/subboard30_shake_module.cpp @@ -8,7 +8,7 @@ extern "C" { #include "sdk/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp" #include "sdk\components\step_motor_ctrl_module\step_motor_ctrl_module.hpp" -#define TAG "ShakeModule" +#define TAG "Subboard30ShakeModule" using namespace iflytop; /*********************************************************************************************************************** diff --git a/usrc/subboards/subboard60_inlet_and_outlet_module/subboard60_inlet_and_outlet_module.cpp b/usrc/subboards/subboard60_inlet_and_outlet_module/subboard60_inlet_and_outlet_module.cpp index cba7d01..ed76804 100644 --- a/usrc/subboards/subboard60_inlet_and_outlet_module/subboard60_inlet_and_outlet_module.cpp +++ b/usrc/subboards/subboard60_inlet_and_outlet_module/subboard60_inlet_and_outlet_module.cpp @@ -9,7 +9,7 @@ extern "C" { #include "sdk\components\sensors\m3078\m3078_code_scaner.hpp" #include "sdk\components\step_motor_ctrl_module\step_motor_ctrl_module.hpp" -#define TAG "ShakeModule" +#define TAG "Subboard60InjectAndOutletModule" using namespace iflytop; void Subboard60InjectAndOutletModule::initialize() { diff --git a/usrc/subboards/subboard70_incubation_turntable/pri_board.h b/usrc/subboards/subboard70_incubation_turntable/pri_board.h index 121fa3d..2285ad2 100644 --- a/usrc/subboards/subboard70_incubation_turntable/pri_board.h +++ b/usrc/subboards/subboard70_incubation_turntable/pri_board.h @@ -62,12 +62,12 @@ #define MOTOR1_STEPMOTOR_IRUN 20 #define MOTOR1_STEPMOTOR_IHOLDDELAY 100 #define MOTOR1_STEPMOTOR_IGLOBALSCALER 64 -#define MOTOR1_MOTOR_DEFAULT_ACC 900 -#define MOTOR1_MOTOR_DEFAULT_DEC 900 -#define MOTOR1_MOTOR_DEFAULT_VELOCITY 800 +#define MOTOR1_MOTOR_DEFAULT_ACC 500 +#define MOTOR1_MOTOR_DEFAULT_DEC 500 +#define MOTOR1_MOTOR_DEFAULT_VELOCITY 500 #define MOTOR1_MIN_D 0 #define MOTOR1_MAX_D 0 #define MOTOR1_MOTOR_RUN_TO_ZERO_SPEED 500 -#define MOTOR1_MOTOR_RUN_TO_ZERO_DEC 900 +#define MOTOR1_MOTOR_RUN_TO_ZERO_DEC 500 #define MOTOR1_MOTOR_LOOK_ZERO_EDGE_SPEED 200 -#define MOTOR1_MOTOR_LOOK_ZERO_EDGE_DEC 900 +#define MOTOR1_MOTOR_LOOK_ZERO_EDGE_DEC 600 diff --git a/usrc/subboards/subboard70_incubation_turntable/subboard70_incubation_turntable.cpp b/usrc/subboards/subboard70_incubation_turntable/subboard70_incubation_turntable.cpp index 4991463..de9a523 100644 --- a/usrc/subboards/subboard70_incubation_turntable/subboard70_incubation_turntable.cpp +++ b/usrc/subboards/subboard70_incubation_turntable/subboard70_incubation_turntable.cpp @@ -10,8 +10,6 @@ extern "C" { #include "sdk/components/step_motor_ctrl_module/step_motor_ctrl_module.hpp" #include "sdk/components/tmc/ic/ztmc4361A.hpp" -#define TAG "ShakeModule" - using namespace iflytop; #define TAG "Subboard70IncubationTurntable" void Subboard70IncubationTurntable::initialize() { diff --git a/usrc/subboards/subboard80_cliptip/subboard80_cliptip.cpp b/usrc/subboards/subboard80_cliptip/subboard80_cliptip.cpp index 196cc15..3d8d344 100644 --- a/usrc/subboards/subboard80_cliptip/subboard80_cliptip.cpp +++ b/usrc/subboards/subboard80_cliptip/subboard80_cliptip.cpp @@ -11,7 +11,7 @@ extern "C" { #include "sdk/components/tmc/ic/ztmc4361A.hpp" #include "sdk\components\pipette_module\pipette_ctrl_module_v2.hpp" -#define TAG "ShakeModule" +#define TAG "Subboard80Cliptip" using namespace iflytop; diff --git a/usrc/subboards/subboard90_optical_module/subboard90_optical_module.cpp b/usrc/subboards/subboard90_optical_module/subboard90_optical_module.cpp index 7f093b5..667a0e4 100644 --- a/usrc/subboards/subboard90_optical_module/subboard90_optical_module.cpp +++ b/usrc/subboards/subboard90_optical_module/subboard90_optical_module.cpp @@ -13,7 +13,7 @@ extern "C" { #include "sdk/components/tmc/ic/ztmc4361A.hpp" #include "sdk\components\pipette_module\pipette_ctrl_module_v2.hpp" -#define TAG "ShakeModule" +#define TAG "Subboard90OpticalModule" using namespace iflytop;