Continuing move to both OO interface and consolidation of commands into Subsystem, Command rather than all discrete commands.

This commit is contained in:
2026-01-26 13:42:28 -06:00
parent 152e0c2d80
commit 4e0035bea6
5 changed files with 374 additions and 188 deletions

View File

@@ -106,6 +106,15 @@ const char *YesNoneText(uint8_t val) {
return buf[val];
}
const char *PRSBText(uint8_t val) {
static const char *buf[] = {
"PR", "SB", "Unk"
};
if (val >= sizeof(buf) / sizeof(buf[0]))
val = sizeof(buf) / sizeof(buf[0]) - 1;
return buf[val];
}
const char *OffMatrixDiscreteText(uint8_t val) {
static const char *buf[] = {
"Off", "Matrix On", "Discrete On", "Unk"
@@ -244,9 +253,9 @@ const char *Norm10dbDownText(uint8_t val) {
return buf[val];
}
const char *MainZoneBText(uint8_t val) {
const char *Zone1Zone2Text(uint8_t val) {
static const char *buf[] = {
"Main", "Zone B", "Unk"
"Zone 1", "Zone 2", "Unk"
};
if (val >= sizeof(buf) / sizeof(buf[0]))
val = sizeof(buf) / sizeof(buf[0]) - 1;
@@ -417,35 +426,35 @@ const char *ProgramName(uint8_t val) {
returnBuf[0] = '\0';
if (val & 0x80) {
strcpy_s(returnBuf, TEXTBUFLEN, "STRAIGHT ");
strcpy_s(returnBuf, TEXTBUFLEN, "St.");
}
val &= 0x7F; // Not accommodating the other variants yet
const char *nameList[] = {
"Hall A (HALL1)",
"Hall A", // (HALL1)
"Hall B",
"Hall C",
"unk",
"Hall C",
"Hall E",
"Live Concert (HALL2)",
"Live Concert", // (HALL2)
"unk",
"Tokyo",
"Freiburg (CHURCH)",
"Church", // Freiburg (CHURCH)
"Royaumont",
"unk",
"Village Gate",
"Village Vanguard",
"The Bottom Line (JAZZ)",
"Vanguard", // Village Vanguard
"Jazz", // The Bottom Line (JAZZ)
"unk",
"The Roxy Theater (ROCK)",
"Warehouse Loft",
"Rock", // The Roxy Theater (ROCK)
"Warehouse", // Warehouse Loft
"Arena",
"unk",
"Disco",
"Party",
"Game",
"7 Ch Stereo",
"Pop/Rock (Music Video)",
"Music Video", // Pop/Rock (Music Video)
"DJ",
"unk",
"unk",
@@ -454,11 +463,11 @@ const char *ProgramName(uint8_t val) {
"unk",
"unk",
"Mono Movie",
"Variety Sports",
"Sports", // Variety Sports
"unk",
"unk",
"Spectacre",
"Sci - Fi",
"Sci-Fi",
"unk",
"unk",
"Adventure",
@@ -473,8 +482,8 @@ const char *ProgramName(uint8_t val) {
"PLII Music",
"Neo: 6 Movie",
"Neo: 6 Music",
"STEREO A 2CH Stereo",
"STEREO B 2CH Direct Stereo"
"Stereo A 2Ch",
"Direct B 2Ch"
"THX A Cinema",
"THX B Music",
};
@@ -512,7 +521,7 @@ const char *VolumeDB(uint8_t val) {
b = -99.5f;
}
float db = m * val + b;
sprintf_s(buf, sizeof(buf), "%+5.1f db", db);
sprintf_s(buf, sizeof(buf), "%+3.1f db", db);
return buf;
}
@@ -526,7 +535,7 @@ const char *PM10dbText(uint8_t val) {
m = 0.5f;
b = -10.0f;
float db = m * (val - 0x14) + b;
sprintf_s(buf, sizeof(buf), "%+5.1f db", db);
sprintf_s(buf, sizeof(buf), "%+3.1f db", db);
}
return buf;
}
@@ -541,7 +550,7 @@ const char *M20P0dbText(uint8_t val) {
m = 0.5f;
b = -20.0f;
float db = m * (val)+b;
sprintf_s(buf, sizeof(buf), "%+5.1f db", db);
sprintf_s(buf, sizeof(buf), "%+3.1f db", db);
}
return buf;
}
@@ -556,7 +565,7 @@ const char *M10P10dbText(uint8_t val) {
m = 0.5f;
b = -10.0f;
float db = m * (val - 0x14) + b;
sprintf_s(buf, sizeof(buf), "%+5.1f db", db);
sprintf_s(buf, sizeof(buf), "%+3.1f db", db);
}
return buf;
}