Compare commits

..

3 Commits

Author SHA1 Message Date
lyq
45a853b86c 删除pub_gps包 2026-01-26 15:18:13 +08:00
lyq
61fd82ee18 调整打印 2026-01-26 15:17:55 +08:00
lyq
86871a4ab8 修复清扫部件初始化bug 2026-01-26 15:17:36 +08:00
3 changed files with 29 additions and 53 deletions

View File

@ -35,31 +35,16 @@ void epsTimerTask(CANDriver& canctl)
// 修改timer_tasks.cpp中的vcuTimerTask函数
void vcuTimerTask(CANDriver& canctl)
{
static bool vcu_initialized = false;
static bool last_sweep_state = false; // 记录上一次清扫状态
auto msg = get_safe_control();
// 首次运行时初始化VCU控制
if (!vcu_initialized)
{
// 发送CAN使能指令
vcu_enable_cmd.setCANEnable(true);
canctl.sendFrame(vcu_enable_cmd.toFrame());
// LOG_INFO("mcuTimerTask");
vcu_initialized = true;
LOG_INFO("[VCU] CAN control enabled");
}
// 检查清扫状态是否变化
bool sweep_state_changed = (msg.sweep != last_sweep_state);
if (sweep_state_changed)
{
// 根据清扫状态设置所有部件
int8_t target_value = msg.sweep ? 100 : 0; // 100表示启动0表示停止
int8_t target_value2 = msg.sweep ? -100 : 100; // -100表示下沉100表示抬升
// 发送CAN使能指令
vcu_enable_cmd.setCANEnable(true);
canctl.sendFrame(vcu_enable_cmd.toFrame());
// ===== 控制0x211报文 (电机M1-M7) =====
vcu_motor1_cmd.setByte0(msg.sweep ? 1 : 0); // 1表示正向运行0表示停止
vcu_motor1_cmd.setByte1(target_value);
@ -70,7 +55,6 @@ void vcuTimerTask(CANDriver& canctl)
vcu_motor1_cmd.setByte6(target_value);
vcu_motor1_cmd.setByte7(target_value);
canctl.sendFrame(vcu_motor1_cmd.toFrame());
// LOG_INFO("vcuTimerTask1");
// ===== 控制0x212报文 (电机M8和LED输出) =====
vcu_motor2_cmd.setByte0(target_value);
@ -82,13 +66,8 @@ void vcuTimerTask(CANDriver& canctl)
vcu_motor2_cmd.setByte6(target_value);
vcu_motor2_cmd.setByte7(target_value);
canctl.sendFrame(vcu_motor2_cmd.toFrame());
// LOG_INFO("vcuTimerTask2");
// LOG_INFO("[VCU] Sweep mode %s", msg.sweep ? "activated" : "deactivated");
// 更新状态记录
last_sweep_state = msg.sweep;
}
LOG_INFO_THROTTLE(1000, "[VCU] Sweep? %s", msg.sweep ? "Yes" : "No");
}
// 定时器回调BMS 查询任务

View File

@ -50,8 +50,8 @@ void CanDecoder::handle_bms_100(const sweeperMsg::CanFrame& msg)
ctx_.info.chargeStatus = (current >= 0);
}
LOG_INFO("[0x100] 总电压: %.2f V, 电流: %.2f A, 剩余容量: %.2f Ah, 是否在充电: %s", voltage, current, capacity,
((current >= 0) ? "" : ""));
// LOG_INFO("[0x100] 总电压: %.2f V, 电流: %.2f A, 剩余容量: %.2f Ah, 是否在充电: %s", voltage, current, capacity,
// ((current >= 0) ? "是" : "否"));
}
void CanDecoder::handle_bms_101(const sweeperMsg::CanFrame& msg)

View File

@ -44,7 +44,4 @@ sleep 0.2
ros2 launch fu fu.launch.py &
sleep 0.2
ros2 run pub_gps pub_gps_node &
sleep 0.2
wait