zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

MeatPack followup (#20896)

Browse source
This commit is contained in:
Scott Mudge 2021-01-27 16:18:20 -05:00 committed by Scott Lahteine
parent 5fb8818ae5
commit 7a559e4733
1 changed files with 18 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Marlin/src/feature/meatpack.cpp
View file

@ -45,7 +45,6 @@
MeatPack meatpack; MeatPack meatpack;
#define MeatPack_ProtocolVersion "PV01" #define MeatPack_ProtocolVersion "PV01"
//#define MEATPACK_LOOKUP_TABLE
//#define MP_DEBUG //#define MP_DEBUG
#define DEBUG_OUT ENABLED(MP_DEBUG) #define DEBUG_OUT ENABLED(MP_DEBUG)
@ -59,35 +58,13 @@ uint8_t MeatPack::cmd_count = 0, // Counts how many command bytes are r
MeatPack::char_out_count = 0; // Stores number of characters to be read out. MeatPack::char_out_count = 0; // Stores number of characters to be read out.
uint8_t MeatPack::char_out_buf[2]; // Output buffer for caching up to 2 characters uint8_t MeatPack::char_out_buf[2]; // Output buffer for caching up to 2 characters
#if ENABLED(MEATPACK_LOOKUP_TABLE) // The 15 most-common characters used in G-code, ~90-95% of all G-code uses these characters
// The 15 most-common characters used in G-code, ~90-95% of all G-code uses these characters // Stored in SRAM for performance.
// Stored in SRAM for performance. uint8_t meatPackLookupTable[16] = {
static const uint8_t meatPackLookupTable[16] = {
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
'.', ' ', '\n', 'G', 'X', '.', ' ', '\n', 'G', 'X',
'\0' // Unused. 0b1111 indicates a literal character '\0' // Unused. 0b1111 indicates a literal character
}; };
#endif
uint8_t MeatPack::unpacked_char(register const uint8_t in) {
#if ENABLED(MEATPACK_LOOKUP_TABLE)
return meatPackLookupTable[in];
#else
switch (in) {
case 0b0000 ... 0b1001: return '0' + in;
case 0b1010: return '.';
case 0b1011: return (state & MPConfig_Bit_NoSpaces) ? kSpaceCharReplace : ' ';
case 0b1100: return '\n';
case 0b1101: return 'G';
case 0b1110: return 'X';
}
return 0;
#endif
}
TERN_(MP_DEBUG, uint8_t chars_decoded = 0); // Log the first 64 bytes after each reset TERN_(MP_DEBUG, uint8_t chars_decoded = 0); // Log the first 64 bytes after each reset
@ -112,7 +89,7 @@ uint8_t MeatPack::unpack_chars(const uint8_t pk, uint8_t* __restrict const chars
out = kFirstCharIsLiteral; out = kFirstCharIsLiteral;
else { else {
const uint8_t chr = pk & 0x0F; const uint8_t chr = pk & 0x0F;
chars_out[0] = unpacked_char(chr); // Set the first char chars_out[0] = meatPackLookupTable[(uint8_t)chr]; // Set the first char
} }
// Check if upper nybble is 1111... if so, we don't need the second char. // Check if upper nybble is 1111... if so, we don't need the second char.
@ -120,7 +97,7 @@ uint8_t MeatPack::unpack_chars(const uint8_t pk, uint8_t* __restrict const chars
out |= kSecondCharIsLiteral; out |= kSecondCharIsLiteral;
else { else {
const uint8_t chr = (pk >> 4) & 0x0F; const uint8_t chr = (pk >> 4) & 0x0F;
chars_out[1] = unpacked_char(chr); // Set the second char chars_out[1] = meatPackLookupTable[(uint8_t)chr]; // Set the second char
} }
return out; return out;
@ -184,18 +161,18 @@ void MeatPack::handle_output_char(const uint8_t c) {
*/ */
void MeatPack::handle_command(const MeatPack_Command c) { void MeatPack::handle_command(const MeatPack_Command c) {
switch (c) { switch (c) {
case MPCommand_QueryConfig: break;
case MPCommand_EnablePacking: SBI(state, MPConfig_Bit_Active); DEBUG_ECHOLNPGM("[MPDBG] ENA REC"); break; case MPCommand_EnablePacking: SBI(state, MPConfig_Bit_Active); DEBUG_ECHOLNPGM("[MPDBG] ENA REC"); break;
case MPCommand_DisablePacking: CBI(state, MPConfig_Bit_Active); DEBUG_ECHOLNPGM("[MPDBG] DIS REC"); break; case MPCommand_DisablePacking: CBI(state, MPConfig_Bit_Active); DEBUG_ECHOLNPGM("[MPDBG] DIS REC"); break;
case MPCommand_TogglePacking: TBI(state, MPConfig_Bit_Active); DEBUG_ECHOLNPGM("[MPDBG] TGL REC"); break; case MPCommand_TogglePacking: TBI(state, MPConfig_Bit_Active); DEBUG_ECHOLNPGM("[MPDBG] TGL REC"); break;
case MPCommand_ResetAll: reset_state(); DEBUG_ECHOLNPGM("[MPDBG] RESET REC"); break; case MPCommand_ResetAll: reset_state(); DEBUG_ECHOLNPGM("[MPDBG] RESET REC"); break;
case MPCommand_EnableNoSpaces: SBI(state, MPConfig_Bit_NoSpaces); DEBUG_ECHOLNPGM("[MPDBG] ENA NSP"); case MPCommand_EnableNoSpaces:
TERN_(USE_LOOKUP_TABLE, MeatPackLookupTbl[kSpaceCharIdx] = kSpaceCharReplace); SBI(state, MPConfig_Bit_NoSpaces);
break; meatPackLookupTable[kSpaceCharIdx] = kSpaceCharReplace; DEBUG_ECHOLNPGM("[MPDBG] ENA NSP"); break;
case MPCommand_DisableNoSpaces: CBI(state, MPConfig_Bit_NoSpaces); DEBUG_ECHOLNPGM("[MPDBG] DIS NSP"); case MPCommand_DisableNoSpaces:
TERN_(USE_LOOKUP_TABLE, MeatPackLookupTbl[kSpaceCharIdx] = ' '); CBI(state, MPConfig_Bit_NoSpaces);
break; meatPackLookupTable[kSpaceCharIdx] = ' '; DEBUG_ECHOLNPGM("[MPDBG] DIS NSP"); break;
default: DEBUG_ECHOLNPGM("[MPDBG] UNK CMD REC"); default: DEBUG_ECHOLNPGM("[MPDBG] UNK CMD REC");
case MPCommand_QueryConfig: break;
} }
report_state(); report_state();
} }
@ -204,11 +181,9 @@ void MeatPack::report_state() {
// NOTE: if any configuration vars are added below, the outgoing sync text for host plugin // NOTE: if any configuration vars are added below, the outgoing sync text for host plugin
// should not contain the "PV' substring, as this is used to indicate protocol version // should not contain the "PV' substring, as this is used to indicate protocol version
SERIAL_ECHOPGM("[MP] "); SERIAL_ECHOPGM("[MP] ");
SERIAL_ECHOPGM(MeatPack_ProtocolVersion); SERIAL_ECHOPGM(MeatPack_ProtocolVersion " ");
serialprint_onoff(TEST(state, MPConfig_Bit_Active)); serialprint_onoff(TEST(state, MPConfig_Bit_Active));
SERIAL_CHAR(' '); serialprintPGM(TEST(state, MPConfig_Bit_NoSpaces) ? PSTR(" NSP\n") : PSTR(" ESP\n"));
serialprintPGM(TEST(state, MPConfig_Bit_NoSpaces) ? PSTR("NSP") : PSTR("ESP"));
SERIAL_EOL();
} }
/** /**