kopia lustrzana https://github.com/rs1729/RS
m10mod/mXXmod, rs41mod: raw+json output
rodzic
644b58a98b
commit
3d33874049
|
@ -1119,12 +1119,7 @@ static int print_frame(gpx_t *gpx, int pos, int b2B) {
|
|||
|
||||
int main(int argc, char **argv) {
|
||||
|
||||
int option_verbose = 0; // ausfuehrliche Anzeige
|
||||
int option_raw = 0; // rohe Frames
|
||||
int option_inv = 0; // invertiert Signal
|
||||
//int option_res = 0; // genauere Bitmessung
|
||||
int option_color = 0;
|
||||
int option_ptu = 0;
|
||||
int option_min = 0;
|
||||
int option_iq = 0;
|
||||
int option_iqdc = 0;
|
||||
|
@ -1187,22 +1182,22 @@ int main(int argc, char **argv) {
|
|||
return 0;
|
||||
}
|
||||
else if ( (strcmp(*argv, "-v") == 0) || (strcmp(*argv, "--verbose") == 0) ) {
|
||||
option_verbose = 1;
|
||||
gpx.option.vbs = 1;
|
||||
}
|
||||
else if ( (strcmp(*argv, "-vv" ) == 0) ) option_verbose = 2;
|
||||
else if ( (strcmp(*argv, "-vvv") == 0) ) option_verbose = 3;
|
||||
else if ( (strcmp(*argv, "-vv" ) == 0) ) gpx.option.vbs = 2;
|
||||
else if ( (strcmp(*argv, "-vvv") == 0) ) gpx.option.vbs = 3;
|
||||
else if ( (strcmp(*argv, "-r") == 0) || (strcmp(*argv, "--raw") == 0) ) {
|
||||
option_raw = 1;
|
||||
gpx.option.raw = 1;
|
||||
}
|
||||
else if ( (strcmp(*argv, "-i") == 0) || (strcmp(*argv, "--invert") == 0) ) {
|
||||
option_inv = 1; // nicht noetig
|
||||
gpx.option.inv = 1; // nicht noetig
|
||||
}
|
||||
else if ( (strcmp(*argv, "-c") == 0) || (strcmp(*argv, "--color") == 0) ) {
|
||||
option_color = 1;
|
||||
gpx.option.col = 1;
|
||||
}
|
||||
//else if (strcmp(*argv, "--res") == 0) { option_res = 1; }
|
||||
else if ( (strcmp(*argv, "--ptu") == 0) ) {
|
||||
option_ptu = 1;
|
||||
gpx.option.ptu = 1;
|
||||
}
|
||||
else if ( (strcmp(*argv, "--spike") == 0) ) {
|
||||
spike = 1;
|
||||
|
@ -1286,13 +1281,6 @@ int main(int argc, char **argv) {
|
|||
|
||||
if (gpx.option.raw && gpx.option.jsn) gpx.option.slt = 1;
|
||||
|
||||
// init gpx
|
||||
gpx.option.inv = option_inv; // irrelevant
|
||||
gpx.option.vbs = option_verbose;
|
||||
gpx.option.raw = option_raw;
|
||||
gpx.option.ptu = option_ptu;
|
||||
gpx.option.col = option_color;
|
||||
|
||||
if (cfreq > 0) gpx.jsn_freq = (cfreq+500)/1000;
|
||||
|
||||
|
||||
|
|
|
@ -761,12 +761,7 @@ static int print_frame(gpx_t *gpx, int pos, int b2B) {
|
|||
|
||||
int main(int argc, char **argv) {
|
||||
|
||||
int option_verbose = 0; // ausfuehrliche Anzeige
|
||||
int option_raw = 0; // rohe Frames
|
||||
int option_inv = 0; // invertiert Signal
|
||||
//int option_res = 0; // genauere Bitmessung
|
||||
int option_color = 0;
|
||||
int option_ptu = 0;
|
||||
int option_min = 0;
|
||||
int option_iq = 0;
|
||||
int option_iqdc = 0;
|
||||
|
@ -830,18 +825,18 @@ int main(int argc, char **argv) {
|
|||
return 0;
|
||||
}
|
||||
else if ( (strcmp(*argv, "-v") == 0) || (strcmp(*argv, "--verbose") == 0) ) {
|
||||
option_verbose = 1;
|
||||
gpx.option.vbs = 1;
|
||||
}
|
||||
else if ( (strcmp(*argv, "-vv" ) == 0) ) option_verbose = 2;
|
||||
else if ( (strcmp(*argv, "-vvv") == 0) ) option_verbose = 3;
|
||||
else if ( (strcmp(*argv, "-vv" ) == 0) ) gpx.option.vbs = 2;
|
||||
else if ( (strcmp(*argv, "-vvv") == 0) ) gpx.option.vbs = 3;
|
||||
else if ( (strcmp(*argv, "-r") == 0) || (strcmp(*argv, "--raw") == 0) ) {
|
||||
option_raw = 1;
|
||||
gpx.option.raw = 1;
|
||||
}
|
||||
else if ( (strcmp(*argv, "-i") == 0) || (strcmp(*argv, "--invert") == 0) ) {
|
||||
option_inv = 1; // nicht noetig
|
||||
gpx.option.inv = 1; // nicht noetig
|
||||
}
|
||||
else if ( (strcmp(*argv, "-c") == 0) || (strcmp(*argv, "--color") == 0) ) {
|
||||
option_color = 1;
|
||||
gpx.option.col = 1;
|
||||
}
|
||||
else if ( (strcmp(*argv, "--br") == 0) ) {
|
||||
++argv;
|
||||
|
@ -853,15 +848,15 @@ int main(int argc, char **argv) {
|
|||
}
|
||||
//else if (strcmp(*argv, "--res") == 0) { option_res = 1; }
|
||||
else if ( (strcmp(*argv, "--ptu") == 0) ) {
|
||||
option_ptu = 1;
|
||||
gpx.option.ptu = 1;
|
||||
}
|
||||
else if ( (strcmp(*argv, "--spike") == 0) ) {
|
||||
spike = 1;
|
||||
}
|
||||
else if ( (strcmp(*argv, "--ch2") == 0) ) { sel_wavch = 1; } // right channel (default: 0=left)
|
||||
else if (strcmp(*argv, "--ch2") == 0) { sel_wavch = 1; } // right channel (default: 0=left)
|
||||
else if (strcmp(*argv, "--softin") == 0) { option_softin = 1; } // float32 soft input
|
||||
else if (strcmp(*argv, "--silent") == 0) { gpx.option.slt = 1; }
|
||||
else if ( (strcmp(*argv, "--ths") == 0) ) {
|
||||
else if (strcmp(*argv, "--ths") == 0) {
|
||||
++argv;
|
||||
if (*argv) {
|
||||
thres = atof(*argv);
|
||||
|
@ -936,13 +931,6 @@ int main(int argc, char **argv) {
|
|||
|
||||
if (gpx.option.raw && gpx.option.jsn) gpx.option.slt = 1;
|
||||
|
||||
// init gpx
|
||||
gpx.option.inv = option_inv; // irrelevant
|
||||
gpx.option.vbs = option_verbose;
|
||||
gpx.option.raw = option_raw;
|
||||
gpx.option.ptu = option_ptu;
|
||||
gpx.option.col = option_color;
|
||||
|
||||
if (cfreq > 0) gpx.jsn_freq = (cfreq+500)/1000;
|
||||
|
||||
|
||||
|
@ -1112,7 +1100,13 @@ int main(int argc, char **argv) {
|
|||
// bis Ende der Sekunde vorspulen; allerdings Doppel-Frame alle 10 sek
|
||||
if (gpx.option.vbs < 3) { // && (regulare frame) // print_frame-return?
|
||||
while ( bitpos < 5*BITFRAME_LEN ) {
|
||||
bitQ = read_slbit(&dsp, &bit, 0, bitofs, bitpos, -1, 0); // symlen=2
|
||||
if (option_softin) {
|
||||
float s = 0.0;
|
||||
bitQ = f32soft_read(fp, &s);
|
||||
}
|
||||
else {
|
||||
bitQ = read_slbit(&dsp, &bit, 0, bitofs, bitpos, -1, 0); // symlen=2
|
||||
}
|
||||
if ( bitQ == EOF) break;
|
||||
bitpos++;
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue