Michal
/
Prusa-Firmware-MMU
mirror of https://github.com/prusa3d/Prusa-Firmware-MMU
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix processing of Home commands + unit tests

pull/154/head
D.R.racer 2022-01-21 14:54:32 +01:00 committed by DRracer
parent e338eb9f4c
commit 0c9d59ba5a
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.cpp
View File

@ -282,6 +282,7 @@ void ProcessRequestMsg(const mp::RequestMsg &rq) {
break; // @@TODO - not used anywhere yet
case mp::RequestMsgCodes::Cut:
case mp::RequestMsgCodes::Eject:
case mp::RequestMsgCodes::Home:
case mp::RequestMsgCodes::Load:
case mp::RequestMsgCodes::Tool:
case mp::RequestMsgCodes::Unload:

2
src/modules/protocol.cpp
View File

@ -44,6 +44,7 @@ DecodeStatus Protocol::DecodeRequest(uint8_t c) {
case 'K':
case 'F':
case 'f':
case 'H':
requestMsg.code = (RequestMsgCodes)c;
requestMsg.value = 0;
rqState = RequestStates::Value;
@ -105,6 +106,7 @@ DecodeStatus Protocol::DecodeResponse(uint8_t c) {
case 'K':
case 'F':
case 'f':
case 'H':
responseMsg.request.code = (RequestMsgCodes)c;
responseMsg.request.value = 0;
rspState = ResponseStates::RequestValue;

13
tests/unit/modules/protocol/test_protocol.cpp
View File

@ -15,6 +15,7 @@ TEST_CASE("protocol::EncodeRequests", "[protocol]") {
std::make_tuple(mp::RequestMsgCodes::Cut, 0),
std::make_tuple(mp::RequestMsgCodes::Eject, 0),
std::make_tuple(mp::RequestMsgCodes::Finda, 0),
std::make_tuple(mp::RequestMsgCodes::Home, 0),
std::make_tuple(mp::RequestMsgCodes::Load, 0),
std::make_tuple(mp::RequestMsgCodes::Load, 1),
std::make_tuple(mp::RequestMsgCodes::Load, 2),
@ -58,6 +59,10 @@ TEST_CASE("protocol::EncodeResponseCmdAR", "[protocol]") {
mp::RequestMsg(mp::RequestMsgCodes::Eject, 3),
mp::RequestMsg(mp::RequestMsgCodes::Eject, 4),
mp::RequestMsg(mp::RequestMsgCodes::Home, 0),
mp::RequestMsg(mp::RequestMsgCodes::Home, 1),
mp::RequestMsg(mp::RequestMsgCodes::Home, 2),
mp::RequestMsg(mp::RequestMsgCodes::FilamentType, 0),
mp::RequestMsg(mp::RequestMsgCodes::FilamentType, 1),
@ -152,6 +157,10 @@ TEST_CASE("protocol::EncodeResponseQueryOperation", "[protocol]") {
mp::RequestMsg(mp::RequestMsgCodes::Eject, 3),
mp::RequestMsg(mp::RequestMsgCodes::Eject, 4),
mp::RequestMsg(mp::RequestMsgCodes::Home, 0),
mp::RequestMsg(mp::RequestMsgCodes::Home, 1),
mp::RequestMsg(mp::RequestMsgCodes::Home, 2),
mp::RequestMsg(mp::RequestMsgCodes::Load, 0),
mp::RequestMsg(mp::RequestMsgCodes::Load, 1),
mp::RequestMsg(mp::RequestMsgCodes::Load, 2),
@ -263,6 +272,7 @@ TEST_CASE("protocol::DecodeRequest", "[protocol]") {
const char *rxbuff = GENERATE(
"B0\n", "B1\n", "B2\n",
"E0\n", "E1\n", "E2\n", "E3\n", "E4\n",
"H0\n", "H1\n", "H2\n",
"F0\n", "F1\n",
"f0\n", "f1\n",
"K0\n",
@ -328,6 +338,7 @@ TEST_CASE("protocol::DecodeResponseQueryOperation", "[protocol]") {
mp::Protocol p;
const char *cmdReference = GENERATE(
"E0", "E1", "E2", "E3", "E4",
"H0", "H1", "H2",
"K0", "K1", "K2", "K3", "K4",
"L0", "L1", "L2", "L3", "L4",
"T0", "T1", "T2", "T3", "T4",
@ -445,7 +456,7 @@ TEST_CASE("protocol::DecodeResponseErrorsCross", "[protocol][.]") {
const char *invalidInitialSpaces = GENERATE(" ", " ");
bool viInitialSpace = GENERATE(true, false);
const char *validReqCode = GENERATE("B", "E", "F", "f", "K", "L", "M", "P", "Q", "S", "T", "U", "W", "X");
const char *validReqCode = GENERATE("B", "E", "H", "F", "f", "K", "L", "M", "P", "Q", "S", "T", "U", "W", "X");
const char *invalidReqCode = GENERATE("A", "R");
bool viReqCode = GENERATE(true, false);