mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

More fixes for simts890.c 

More bogus commmands nullified
Typos and comments
Add SC, TS, OM
pull/1626/head
George Baltz N3GB 2024-10-06 13:06:45 -04:00
rodzic 5b1df09ad0
commit ebe685125e
1 zmienionych plików z 86 dodań i 36 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

122
simulators/simts890.c
Wyświetl plik

@ -33,7 +33,7 @@ int filternum2 = 8;
int datamode = 0; int datamode = 0;
int vfo, vfo_tx, ptt, ptt_data, ptt_mic, ptt_tune; int vfo, vfo_tx, ptt, ptt_data, ptt_mic, ptt_tune;
int operatingband; int operatingband;
int split; int split = 0;
int modeMain = 2; int modeMain = 2;
int modeSub = 1; int modeSub = 1;
int keyspd = 20; int keyspd = 20;
@ -72,6 +72,7 @@ struct meter_data meter[6] = {
{ 0, 60}, // Vd (Volts) { 0, 60}, // Vd (Volts)
{ 0, 20} // Temp (Unknown units) { 0, 20} // Temp (Unknown units)
}; };
int tfset = 0;
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
@ -163,7 +164,7 @@ int main(int argc, char *argv[])
"0" // P5 XIT on/off "0" // P5 XIT on/off
"000" // P6,P7 mem channel "000" // P6,P7 mem channel
"%1d" // P8 RX/TX "%1d" // P8 RX/TX
"%1X" // P9 Operating mode (See MD command) "%1X" // P9 Operating mode (See OM command)
"0" // P10 Function? "0" // P10 Function?
"0" // P11 Scan status? "0" // P11 Scan status?
"0" // P12 Simplex/Split "0" // P12 Simplex/Split
@ -295,12 +296,12 @@ int main(int argc, char *argv[])
} }
else if (strncmp(buf, "IS;", 3) == 0) else if (strncmp(buf, "IS;", 3) == 0)
{ {
SNPRINTF(buf, sizeof(buf), "IS+0000;"); SNPRINTF(buf, sizeof(buf), "IS%+04d;", is);
OUTPUT(buf); OUTPUT(buf);
} }
else if (strncmp(buf, "IS", 2) == 0) else if (strncmp(buf, "IS", 2) == 0)
{ {
sscanf(buf,"S%d", &is); sscanf(buf,"IS%d", &is);
} }
else if (strncmp(buf, "SM;", 3) == 0) else if (strncmp(buf, "SM;", 3) == 0)
{ {
@ -421,6 +422,7 @@ int main(int argc, char *argv[])
printf("modeA=%X, modeB=%X\n", modeA, modeB); printf("modeA=%X, modeB=%X\n", modeA, modeB);
} }
#if 0
else if (strncmp(buf, "MD;", 3) == 0) else if (strncmp(buf, "MD;", 3) == 0)
{ {
SNPRINTF(buf, sizeof(buf), "MD%d;", SNPRINTF(buf, sizeof(buf), "MD%d;",
@ -431,14 +433,18 @@ int main(int argc, char *argv[])
{ {
sscanf(buf, "MD%d", &modeA); // not worried about modeB yet for simulator sscanf(buf, "MD%d", &modeA); // not worried about modeB yet for simulator
} }
else if (strncmp(buf, "FL;", 3) == 0) #endif
{
SNPRINTF(buf, sizeof(buf), "FL%03d%03d;", filternum1, filternum2);
OUTPUT(buf);
}
else if (strncmp(buf, "FL", 2) == 0) else if (strncmp(buf, "FL", 2) == 0)
{ {
sscanf(buf, "FL%3d%3d", &filternum1, &filternum2); switch (buf[2]) {
case '0': // Select the Receive Filter
case '1': // Roofing Filter
case '2': // IF Filter Shape
case '3': // AF Filter Type
continue; // For now
default:
cmd_err = 1;
}
} }
else if (strcmp(buf, "FR;") == 0) else if (strcmp(buf, "FR;") == 0)
{ {
@ -451,13 +457,18 @@ int main(int argc, char *argv[])
} }
else if (strcmp(buf, "FT;") == 0) else if (strcmp(buf, "FT;") == 0)
{ {
SNPRINTF(buf, sizeof(buf), "FR%d;", vfo_tx); SNPRINTF(buf, sizeof(buf), "FT%d;", vfo_tx);
OUTPUT(buf); OUTPUT(buf);
} }
else if (strncmp(buf, "FT", 2) == 0) else if (strncmp(buf, "FT", 2) == 0)
{ {
sscanf(buf, "FT%d", &vfo_tx); sscanf(buf, "FT%d", &vfo_tx);
if (vfo_tx != vfo)
{
split = 1;
}
} }
#if 0
else if (strncmp(buf, "DA;", 3) == 0) else if (strncmp(buf, "DA;", 3) == 0)
{ {
SNPRINTF(buf, sizeof(buf), "DA%d;", datamode); SNPRINTF(buf, sizeof(buf), "DA%d;", datamode);
@ -467,6 +478,7 @@ int main(int argc, char *argv[])
{ {
sscanf(buf, "DA%d", &datamode); sscanf(buf, "DA%d", &datamode);
} }
#endif
else if (strncmp(buf, "BD;", 3) == 0) else if (strncmp(buf, "BD;", 3) == 0)
{ {
continue; continue;
@ -493,7 +505,6 @@ int main(int argc, char *argv[])
case '2': ptt_tune = 1; case '2': ptt_tune = 1;
break; break;
} }
} }
#if 0 #if 0
else if (strncmp(buf, "CB;", 3) == 0) else if (strncmp(buf, "CB;", 3) == 0)
@ -525,54 +536,65 @@ int main(int argc, char *argv[])
{ {
sscanf(buf, "KS%03d", &keyspd); sscanf(buf, "KS%03d", &keyspd);
} }
else if (strncmp(buf, "OM0;", 4) == 0) else if (strncmp(buf, "OM", 2) == 0)
{ {
sprintf(buf, "OM0%d;", modeMain); /* The TS-890S displays two frequencies and modes - left and right,
OUTPUT(buf); * along with arrows that show which is VFO A and which is VFO B.
} * In almost all cases, the left VFO is the receive freq. The right
else if (strncmp(buf, "OM0", 3) == 0) * VFO is only used in split operation, as the transmit frequency.
{ */
sscanf(buf, "OM0%d", &modeMain); if (buf[3] == ';')
} {
else if (strncmp(buf, "OM1;", 4) == 0) int tmpvfo = buf[2] - '0';
{ if (tmpvfo < 0 || tmpvfo > 1)
sprintf(buf, "OM1%d;", modeSub); {
OUTPUT(buf); cmd_err = 1;
} }
else if (strncmp(buf, "OM1", 3) == 0) else
{ {
sscanf(buf, "OM1%d", &modeSub); sprintf(buf, "OM%d%X;", tmpvfo, tmpvfo == 0 ? modeMain : modeSub);
OUTPUT(buf);
}
continue;
}
/* Setting - Only sets the active function (RX/TX)
* For now, just set the mode of the current vfo. Not
* always correct, but the best we can do until I turn
* VFOs into objects.
*/
sscanf(&buf[3], "%1X", &modeMain);
} }
else if (strncmp(buf, "RM", 2) == 0) else if (strncmp(buf, "RM", 2) == 0)
{ // Meter control/readout { // Meter control/readout
if (buf[2] == ';') if (buf[2] == ';')
{ // Read all enabled meters { // Read all enabled meters
char tbuf[8]; char tbuf[8];
buf[0] = '\0'; buf[0] = '\0';
pbuf = buf;
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; i++)
{ {
if (meter[i].enabled) if (meter[i].enabled)
{ {
SNPRINTF(tbuf, sizeof tbuf, "RM%d%03d;", i + 1, meter[i].value); SNPRINTF(tbuf, sizeof tbuf, "RM%d%03d;", i + 1, meter[i].value);
strncat(buf, tbuf, sizeof buf - strlen(buf) - 1); pbuf = stpcpy(pbuf, tbuf);
} }
} }
if (buf[0] != '\0') if (buf[0] != '\0')
{ {
OUTPUT(buf); OUTPUT(buf);
} }
} }
else else
{ // Enable/disable one meter { // Enable/disable one meter
int target = buf[2] - '1'; int target = buf[2] - '1';
int status = buf[3] - '0'; int status = buf[3] - '0';
if (target < 0 || target > 5 || status < 0 || status > 1) if (target < 0 || target > 5 || status < 0 || status > 1)
{ {
cmd_err = 2; cmd_err = 2;
continue; continue;
} }
meter[target].enabled = status; meter[target].enabled = status;
} }
} }
else if (strcmp(buf, "SL0;") == 0) else if (strcmp(buf, "SL0;") == 0)
{ {
@ -840,6 +862,34 @@ int main(int argc, char *argv[])
cmd_err = 1; cmd_err = 1;
} }
} }
else if (strncmp(buf, "SC", 2) == 0)
{ // Scan functions
switch (buf[2]) {
case '0': // Scan
case '1': // Scan Speed
case '2': // Tone Scan/CTCSS Scan
case '3': // Program Scan/VFO Scan Selection
break;
default:
cmd_err = 1;
}
}
else if (strncmp(buf, "TS", 2) == 0)
{ // TF-SET
if (buf[2] == ';')
{
SNPRINTF(buf, sizeof buf, "TS%d;", tfset);
OUTPUT(buf);
continue;
}
int tmpset = buf[2] - '0';
if (tmpset < 0 || tmpset > 1)
{
cmd_err = 1;
continue;
}
tfset = tmpset;
}
else if (strlen(buf) > 0) else if (strlen(buf) > 0)
{ {
fprintf(stderr, "Unknown command: %s\n", buf); fprintf(stderr, "Unknown command: %s\n", buf);