diff --git a/demod_dumpcsv.c b/demod_dumpcsv.c index 0167e15..132ca3f 100644 --- a/demod_dumpcsv.c +++ b/demod_dumpcsv.c @@ -74,7 +74,7 @@ static void dumpcsv_demod(struct demod_state *s, buffer_t buffer, int length) /* ---------------------------------------------------------------------- */ const struct demod_param demod_dumpcsv = { - "DUMP", false, SAMPLING_RATE, 0, dumpcsv_init, dumpcsv_demod, NULL + "DUMPCSV", false, SAMPLING_RATE, 0, dumpcsv_init, dumpcsv_demod, NULL }; diff --git a/example/README-dumpcsv.txt b/example/README-dumpcsv.txt new file mode 100644 index 0000000..b8c24b5 --- /dev/null +++ b/example/README-dumpcsv.txt @@ -0,0 +1,15 @@ + + + +To generate a png from a wav file + +generate a .csv file from the data : + + multimon-ng -q -t wav -a DUMPCSV x10rf.wav > x10rf.csv + +use gnuplot to generate a PNG of the data + + gnuplot -e "plot_data_file='x10rf'" dumpcsv_png.txt + +there should be a file named x10rf.png + diff --git a/example/dumpcsv_png.txt b/example/dumpcsv_png.txt new file mode 100644 index 0000000..84fdbe5 --- /dev/null +++ b/example/dumpcsv_png.txt @@ -0,0 +1,22 @@ +set terminal png size 2600,500 +#set terminal png size 1920,500 +#set terminal png size 800,150 +set datafile separator "," +set xlabel "Time (ms)" +set ylabel "Arbitrary Power (dB?)" +set grid +#show mxtics +set xtics 0.5 rotate +set mxtics 10 +set key off +set pointsize 0.5 + +name=plot_data_file + +set title name." multimon-ng dump" +# name=system("echo $plot_data_file") + +set output name.".png" + +plot name.".csv" using 1:2 with linespoints pt 6 lc 3 + diff --git a/example/x10rf.wav b/example/x10rf.wav new file mode 100644 index 0000000..65d3af9 Binary files /dev/null and b/example/x10rf.wav differ diff --git a/multimon.h b/multimon.h index 5a25c4a..c072666 100644 --- a/multimon.h +++ b/multimon.h @@ -222,15 +222,6 @@ struct demod_state { uint32_t current_sequence; } dumpcsv; - struct l1_state_x10 { - uint32_t current_sequence; - uint32_t last_rise; - short current_state; - short current_phase; - char b[4]; - char bi; - char bstring[42]; - } x10; #ifndef NO_X11 @@ -306,7 +297,7 @@ extern const struct demod_param demod_scope; #define ALL_DEMOD &demod_poc5, &demod_poc12, &demod_poc24, &demod_eas, &demod_ufsk1200, &demod_clipfsk, \ &demod_afsk1200, &demod_afsk2400, &demod_afsk2400_2, &demod_afsk2400_3, &demod_hapn4800, \ &demod_fsk9600, &demod_dtmf, &demod_zvei1, &demod_zvei2, &demod_zvei3, &demod_dzvei, \ - &demod_pzvei, &demod_eea, &demod_eia, &demod_ccir, &demod_morse, &demod_dumpcsv, &demod_x10 SCOPE_DEMOD + &demod_pzvei, &demod_eea, &demod_eia, &demod_ccir, &demod_morse, &demod_dumpcsv SCOPE_DEMOD /* ---------------------------------------------------------------------- */