Skip to content

Commit 98b62c9

Browse files
committed
change music for hero and adjust 0-position also disable referee check [hardware not connected]
1 parent 3e858ab commit 98b62c9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

dev/application/vehicles/hero/can_motor_config.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CANMotorBase CANMotorCFG::CANMotorProfile[MOTOR_COUNT] = {
99
{CANMotorBase::can_channel_2, 0x201, CANMotorBase::M3508, 3572},//Front Right
1010
{CANMotorBase::can_channel_2, 0x204, CANMotorBase::M3508, 3572},//Back Right
1111
{CANMotorBase::can_channel_2, 0x203, CANMotorBase::M3508, 3572},//Back Left
12-
{CANMotorBase::can_channel_2, 0x208, CANMotorBase::GM6020, 5598},//Yaw
12+
{CANMotorBase::can_channel_2, 0x208, CANMotorBase::GM6020, 3634},//Yaw
1313
{CANMotorBase::can_channel_1, 0x205, CANMotorBase::GM6020, 3221},//PITCH 侧面的6020
1414
{CANMotorBase::can_channel_1, 0x201, CANMotorBase::M3508_without_deceleration, 3344},
1515
{CANMotorBase::can_channel_2, 0x206, CANMotorBase::M3508, 3572}, //Bullet Loader

dev/application/vehicles/hero/main_hero.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ int main() {
223223

224224
/// Complete Period 2
225225

226-
BuzzerSKD::play_sound(BuzzerSKD::sound_startup_intel); // Now play the startup sound
226+
BuzzerSKD::play_sound(BuzzerSKD::cambodia); // Now play the startup sound
227227

228228

229229
/*** ------------------------ Period 3. End of main thread ----------------------- ***/

dev/application/vehicles/hero/user_hero.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void UserH::UserThread::main() {
5555

5656
// LOG("YAW,TG:%.2f,Actual:%.2f; PITCH,TG:%.2f,Actual:%.2f",GimbalSKD::get_target_angle(GimbalSKD::YAW),GimbalSKD::get_feedback_angle(GimbalSKD::YAW),GimbalSKD::get_target_angle(GimbalSKD::PITCH),GimbalSKD::get_feedback_angle(GimbalSKD::PITCH));
5757

58-
if (!InspectorH::remote_failure() /*&& !InspectorI::chassis_failure()*/ && !InspectorH::gimbal_failure() && Referee::robot_state.power_management_gimbal_output) {
58+
if (!InspectorH::remote_failure() /*&& !InspectorI::chassis_failure()*/ && !InspectorH::gimbal_failure() /*&& Referee::robot_state.power_management_gimbal_output*/) {
5959
if ((Remote::rc.s1 == Remote::S_MIDDLE && Remote::rc.s2 == Remote::S_UP)) {
6060
/// Remote - Yaw + Pitch
6161
GimbalLG::set_mode(GimbalLG::CHASSIS_REF_MODE);

0 commit comments

Comments
 (0)