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

Add 'F' and 'f' decoding + unit tests where necessary

pull/122/head
D.R.racer 2021-09-29 12:09:08 +02:00 committed by DRracer
parent 4900dd0222
commit 1402fb3dd6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/protocol.cpp
View File

@ -41,6 +41,8 @@ DecodeStatus Protocol::DecodeRequest(uint8_t c) {
case 'E':
case 'W':
case 'K':
case 'F':
case 'f':
requestMsg.code = (RequestMsgCodes)c;
requestMsg.value = 0;
rqState = RequestStates::Value;
@ -100,6 +102,7 @@ DecodeStatus Protocol::DecodeResponse(uint8_t c) {
case 'E':
case 'W':
case 'K':
case 'F':
case 'f':
responseMsg.request.code = (RequestMsgCodes)c;
responseMsg.request.value = 0;

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

@ -58,6 +58,12 @@ TEST_CASE("protocol::EncodeResponseCmdAR", "[protocol]") {
mp::RequestMsg(mp::RequestMsgCodes::Eject, 3),
mp::RequestMsg(mp::RequestMsgCodes::Eject, 4),
mp::RequestMsg(mp::RequestMsgCodes::FilamentType, 0),
mp::RequestMsg(mp::RequestMsgCodes::FilamentType, 1),
mp::RequestMsg(mp::RequestMsgCodes::FilamentSensor, 0),
mp::RequestMsg(mp::RequestMsgCodes::FilamentSensor, 1),
mp::RequestMsg(mp::RequestMsgCodes::Load, 0),
mp::RequestMsg(mp::RequestMsgCodes::Load, 1),
mp::RequestMsg(mp::RequestMsgCodes::Load, 2),
@ -257,6 +263,8 @@ 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",
"F0\n", "F1\n",
"f0\n", "f1\n",
"K0\n",
"L0\n", "L1\n", "L2\n", "L3\n", "L4\n",
"M0\n", "M1\n",
@ -437,8 +445,8 @@ TEST_CASE("protocol::DecodeResponseErrorsCross", "[protocol][.]") {
const char *invalidInitialSpaces = GENERATE(" ", " ");
bool viInitialSpace = GENERATE(true, false);
const char *validReqCode = GENERATE("B", "E", "K", "L", "M", "P", "Q", "S", "T", "U", "W", "X");
const char *invalidReqCode = GENERATE("A", "R", "F");
const char *validReqCode = GENERATE("B", "E", "F", "f", "K", "L", "M", "P", "Q", "S", "T", "U", "W", "X");
const char *invalidReqCode = GENERATE("A", "R");
bool viReqCode = GENERATE(true, false);
const char *validReqValue = GENERATE("0", "1", "2", "3", "4");