yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 09:49:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1495 from jonny5532/fix/remove-duplicate-CanBattery-constructor

Browse source 
Remove the duplicate CanBattery constructor.
This commit is contained in:
Daniel Öster 2025-09-06 23:23:44 +03:00 • committed by GitHub
commit a40de5ecee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Software/src/battery/CanBattery.cpp
View file

@ -6,6 +6,12 @@ CanBattery::CanBattery(CAN_Speed speed) {
register_can_receiver(this, can_interface, speed); register_can_receiver(this, can_interface, speed);
} }
CanBattery::CanBattery(CAN_Interface interface, CAN_Speed speed) {
can_interface = interface;
register_transmitter(this);
register_can_receiver(this, can_interface, speed);
}
CAN_Speed CanBattery::change_can_speed(CAN_Speed speed) { CAN_Speed CanBattery::change_can_speed(CAN_Speed speed) {
return ::change_can_speed(can_interface, speed); return ::change_can_speed(can_interface, speed);
} }

7
Software/src/battery/CanBattery.h
View file

@ -24,12 +24,7 @@ class CanBattery : public Battery, Transmitter, CanReceiver {
CAN_Interface can_interface; CAN_Interface can_interface;
CanBattery(CAN_Speed speed = CAN_Speed::CAN_SPEED_500KBPS); CanBattery(CAN_Speed speed = CAN_Speed::CAN_SPEED_500KBPS);
CanBattery(CAN_Interface interface, CAN_Speed speed = CAN_Speed::CAN_SPEED_500KBPS);
CanBattery(CAN_Interface interface, CAN_Speed speed = CAN_Speed::CAN_SPEED_500KBPS) {
can_interface = interface;
register_transmitter(this);
register_can_receiver(this, can_interface, speed);
}
CAN_Speed change_can_speed(CAN_Speed speed); CAN_Speed change_can_speed(CAN_Speed speed);