Skip to content

Commit c70902b

Browse files
committed
bypassing requesting init
1 parent 550ff5c commit c70902b

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

lib/interfaces/src/InverterInterface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void InverterInterface::receive_INV_DYNAMICS(const CAN_message_t &can_msg, unsig
9595
_feedback_data.motor_mechanics.new_data = true;
9696
_feedback_data.motor_mechanics.last_recv_millis = curr_millis;
9797

98-
Serial.println(unpacked_msg.actual_power_w);
98+
// Serial.println(unpacked_msg.actual_power_w);
9999
}
100100

101101
void InverterInterface::receive_INV_POWER(const CAN_message_t &can_msg, unsigned long curr_millis)

lib/interfaces/src/VCRCANInterfaceImpl.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ void on_inverter_can_receive(const CAN_message_t &msg) {
2929
memmove(buf, &msg, sizeof(msg));
3030
inverter_can_rx_buffer.push_back(buf, sizeof(CAN_message_t));
3131

32-
Serial.println("msg recvd");
33-
Serial.print("MB: "); Serial.print(msg.mb);
34-
Serial.print(" ID: 0x"); Serial.print(msg.id, HEX);
35-
Serial.print(" EXT: "); Serial.print(msg.flags.extended);
36-
Serial.print(" LEN: "); Serial.print(msg.len);
37-
Serial.print(" DATA: ");
38-
for ( uint8_t i = 0; i < 8; i++ ) {
39-
Serial.print(msg.buf[i]); Serial.print(" ");
40-
}
41-
Serial.print(" TS: "); Serial.println(msg.timestamp);
32+
// Serial.println("msg recvd");
33+
// Serial.print("MB: "); Serial.print(msg.mb);
34+
// Serial.print(" ID: 0x"); Serial.print(msg.id, HEX);
35+
// Serial.print(" EXT: "); Serial.print(msg.flags.extended);
36+
// Serial.print(" LEN: "); Serial.print(msg.len);
37+
// Serial.print(" DATA: ");
38+
// for ( uint8_t i = 0; i < 8; i++ ) {
39+
// Serial.print(msg.buf[i]); Serial.print(" ");
40+
// }
41+
// Serial.print(" TS: "); Serial.println(msg.timestamp);
4242

4343
}
4444

lib/systems/src/DrivetrainSystem.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ DrivetrainState_e DrivetrainSystem::_evaluate_state_machine(DrivetrainSystem::Cm
8787

8888
bool connected_hv_present = false;
8989
connected_hv_present = (_check_inverter_flags(_check_inverter_connected_flag) && _check_inverter_flags(_check_inverter_hv_present_flag));
90-
90+
9191
if (connected_no_hv_present) {
9292
_set_state(DrivetrainState_e::NOT_ENABLED_NO_HV_PRESENT);
9393
} else if (connected_hv_present) {
@@ -137,10 +137,12 @@ DrivetrainState_e DrivetrainSystem::_evaluate_state_machine(DrivetrainSystem::Cm
137137
// State Transitions
138138
bool inverter_error_present = false;
139139
inverter_error_present = !_check_inverter_flags(_check_inverter_no_errors_present);
140-
140+
141141
bool requesting_init = false;
142142
requesting_init = etl::holds_alternative<DrivetrainInit_s>(cmd) && (etl::get<DrivetrainInit_s>(cmd).init_drivetrain != DrivetrainModeRequest_e::UNINITIALIZED);
143143

144+
requesting_init = true;
145+
144146
bool inverters_ready = false;
145147
inverters_ready = _check_inverter_flags(_check_inverter_ready_flag);
146148

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ DrivetrainSystem::InverterFuncts rr_inverter_functs = {
9393
.get_motor_mechanics = []() { return rr_inverter_int.get_motor_mechanics(); }
9494
};
9595

96-
veh_vec<DrivetrainSystem::InverterFuncts> inverter_functs(fl_inverter_functs, fr_inverter_functs, rl_inverter_functs, rr_inverter_functs);
96+
veh_vec<DrivetrainSystem::InverterFuncts> inverter_functs(fl_inverter_functs, fr_inverter_functs, fr_inverter_functs, rr_inverter_functs);
9797

9898
etl::delegate<void(bool)> set_ef_pin_active = etl::delegate<void(bool)>::create([](bool set_active) { digitalWrite(INVERTER_ENABLE_PIN, static_cast<int>(set_active)); });
9999

0 commit comments

Comments
 (0)