feedc0de/bobbycar-protocol
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

New button protocol

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-29 23:49:57 +01:00
parent a331746ede
commit 9e256acdaa
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
bobbycar-can.h
View File

@ -116,15 +116,20 @@ public:
Boardcomputer() = delete; Boardcomputer() = delete;
~Boardcomputer() = delete; ~Boardcomputer() = delete;
// used with ButtonPressed and ButtonReleased
enum { enum {
ButtonUp = 1, ButtonLeft,
ButtonDown = 2, ButtonRight,
ButtonConfirm = 4, ButtonUp,
ButtonBack = 8, ButtonDown,
ButtonProfile0 = 16, ButtonProfile0,
ButtonProfile1 = 32, ButtonProfile1,
ButtonProfile2 = 64, ButtonProfile2,
ButtonProfile3 = 128, ButtonProfile3,
ButtonLeft2,
ButtonRight2,
ButtonUp2,
ButtonDown2,
}; };
// send only TO the boardcomputer // send only TO the boardcomputer
@ -141,10 +146,13 @@ public:
Command() = delete; Command() = delete;
~Command() = delete; ~Command() = delete;
enum : uint16_t { // ....vvvvvvv enum : uint16_t { // ....vvvvvvv
ButtonPress = 0b00000000000 | BoardcomputerCommandMask, RawButtonPressed = 0b00000000000 | BoardcomputerCommandMask,
RawGas = 0b00000000001 | BoardcomputerCommandMask, RawButtonReleased = 0b00000000001 | BoardcomputerCommandMask,
RawBrems = 0b00000000010 | BoardcomputerCommandMask ButtonPressed = 0b00000000010 | BoardcomputerCommandMask,
ButtonReleased = 0b00000000011 | BoardcomputerCommandMask,
RawGas = 0b00000000100 | BoardcomputerCommandMask,
RawBrems = 0b00000000101 | BoardcomputerCommandMask
}; };
}; };
@ -268,7 +276,10 @@ inline const char *bobbycarCanIdDesc(uint16_t id)
case MotorController<false, true>::Feedback::Temp: return "Temp (MotorController, Feedback, Front, Right)"; case MotorController<false, true>::Feedback::Temp: return "Temp (MotorController, Feedback, Front, Right)";
case MotorController<true, false>::Feedback::Temp: return "Temp (MotorController, Feedback, Back, Left)"; case MotorController<true, false>::Feedback::Temp: return "Temp (MotorController, Feedback, Back, Left)";
case MotorController<true, true>::Feedback::Temp: return "Temp (MotorController, Feedback, Back, Right)"; case MotorController<true, true>::Feedback::Temp: return "Temp (MotorController, Feedback, Back, Right)";
case Boardcomputer::Command::ButtonPress: return "ButtonPress (Boardcomputer, Command)"; case Boardcomputer::Command::RawButtonPressed: return "RawButtonPressed (Boardcomputer, Command)";
case Boardcomputer::Command::RawButtonReleased: return "RawButtonReleased (Boardcomputer, Command)";
case Boardcomputer::Command::ButtonPressed: return "ButtonPressed (Boardcomputer, Command)";
case Boardcomputer::Command::ButtonReleased: return "ButtonReleased (Boardcomputer, Command)";
case Boardcomputer::Command::RawGas: return "RawGas (Boardcomputer, Command)"; case Boardcomputer::Command::RawGas: return "RawGas (Boardcomputer, Command)";
case Boardcomputer::Command::RawBrems: return "RawBrems (Boardcomputer, Command)"; case Boardcomputer::Command::RawBrems: return "RawBrems (Boardcomputer, Command)";
case Boardcomputer::Feedback::ButtonLeds: return "ButtonLeds (Boardcomputer, Feedback)"; case Boardcomputer::Feedback::ButtonLeds: return "ButtonLeds (Boardcomputer, Feedback)";