6502/AtomBusMon
1
0
Fork 0
mirror of https://github.com/hoglet67/AtomBusMon.git synced 2025-02-28 19:29:05 +00:00
Code Issues Projects Releases Wiki Activity

Firmware: use PROGMEM for trigger strings

Browse Source 
Change-Id: I12c1c47c4227056ca87be7b831d5bf3be6d96896
This commit is contained in:
David Banks 2019-11-09 12:24:52 +00:00
parent db2b33e36f
commit a601d1da97
1 changed files with 72 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
firmware/AtomBusMon.c
View File

@ -383,23 +383,76 @@ trigger_t triggers[MAXBKPTS];
#define NUM_TRIGGERS 16 #define NUM_TRIGGERS 16
char * triggerStrings[NUM_TRIGGERS] = { // The original definition was
"Never", // char * triggerStrings[NUM_TRIGGERS] = {
"~T0 and ~T1", // "Never",
"T0 and ~T1", // "~T0 and ~T1",
"~T1", // "T0 and ~T1",
"~T0 and T1", // "~T1",
"~T0", // "~T0 and T1",
"T0 xor T1", // "~T0",
"~T0 or ~T1", // "T0 xor T1",
"T0 and T1", // "~T0 or ~T1",
"T0 xnor T1", // "T0 and T1",
"T0", // "T0 xnor T1",
"T0 or ~T1", // "T0",
"T1", // "T0 or ~T1",
"~T0 or T1", // "T1",
"T0 or T1", // "~T0 or T1",
"Always", // "T0 or T1",
// "Always",
// };
//
//
// GCC was able to clverly compress this down to the following unique strings
// Never
// ~T0 and ~T1
// ~T0 and T1
// ~T0
// T0 xor T1
// ~T0 or ~T1
// T0 xnor T1
// ~T0 or T1
// Always
//
// Mechanically moving to the PROGMEM pattern lost this compression
//
// So we re-create it manually
static const char TRIG0[] PROGMEM = "Never";
static const char TRIG1[] PROGMEM = "~T0 and ~T1";
//static const char TRIG2[] PROGMEM = "T0 and ~T1"; // substring of TRIG1
//static const char TRIG3[] PROGMEM = "~T1"; // substring of TRIG1
static const char TRIG4[] PROGMEM = "~T0 and T1";
static const char TRIG5[] PROGMEM = "~T0";
static const char TRIG6[] PROGMEM = "T0 xor T1";
static const char TRIG7[] PROGMEM = "~T0 or ~T1";
//static const char TRIG8[] PROGMEM = "T0 and T1"; // substring of TRIG4
static const char TRIG9[] PROGMEM = "T0 xnor T1";
//static const char TRIGA[] PROGMEM = "T0"; // substring of TRIG5
static const char TRIGB[] PROGMEM = "T0 or ~T1"; // sibstring of TRIG7
//static const char TRIGC[] PROGMEM = "T1"; // substring of TRIG4
static const char TRIGD[] PROGMEM = "~T0 or T1";
//static const char TRIGE[] PROGMEM = "T0 or T1"; // substring of TRIGD
static const char TRIGF[] PROGMEM = "Always";
static const char * triggerStrings[NUM_TRIGGERS] = {
TRIG0,
TRIG1,
TRIG1 + 1,
TRIG1 + 8,
TRIG4,
TRIG5,
TRIG6,
TRIG7,
TRIG4 + 1,
TRIG9,
TRIG5 + 1,
TRIG7 + 1,
TRIG4 + 8,
TRIGD,
TRIGD + 1,
TRIGF
}; };
#define TRIGGER_ALWAYS 15 #define TRIGGER_ALWAYS 15
@ -794,7 +847,7 @@ void logMode(modes_t mode) {
void logTrigger(trigger_t trigger) { void logTrigger(trigger_t trigger) {
if (trigger < NUM_TRIGGERS) { if (trigger < NUM_TRIGGERS) {
logstr("trigger: "); logstr("trigger: ");
logs(triggerStrings[trigger]); logpgmstr(triggerStrings[trigger]);
} else { } else {
logstr("trigger: ILLEGAL"); logstr("trigger: ILLEGAL");
} }
@ -1474,7 +1527,7 @@ void doCmdTrigger(char *params) {
logstr(" "); logstr(" ");
loghex1(trigger); loghex1(trigger);
logstr(" = "); logstr(" = ");
logs(triggerStrings[trigger]); logpgmstr(triggerStrings[trigger]);
logc('\n'); logc('\n');
} }
return; return;