diff --git a/Makefile b/Makefile index 8a9a04e..f4385b7 100644 --- a/Makefile +++ b/Makefile @@ -1,47 +1,13 @@ -DATE ?= 110205 - -ZEOS = $(wildcard *.zeo) -CSVS = $(patsubst %.zeo,%.hypnogram.csv,$(ZEOS)) - -all-csv: $(CSVS) - -#%.zeo: hex/%.zeo -# ./hex2binary <$^ >$@ - -%.hypnogram.csv: %.zeo - ./raw2csv.py $^ - -current: anne-$(DATE).hypnogram.csv - -sync: - rsync -av john-2.local:/Users/anne/education/bodytrack/zeologger/raw-data/\*.zeo . - -connect: - connect.sh anne-$(DATE).zeo - -csv: - -./raw2csv.py -f anne-$(DATE).zeo - -plot-follow: - echo "set datafile separator ','" > gnuplot.script - echo "set xdata time" >> gnuplot.script - echo "set timefmt '%m/%d/%Y %H:%M:%S'" >> gnuplot.script - echo "set format x '%H:%M:%S'" >> gnuplot.script - echo "plot 'anne-$(DATE).hypnogram.csv' every ::2 using 1:6" >> gnuplot.script - echo "! sleep 5" >> gnuplot.script - echo "reread" >> gnuplot.script - gnuplot gnuplot.script - -plot: - echo "set datafile separator ','" > gnuplot.script - echo "set xdata time" >> gnuplot.script - echo "set timefmt '%m/%d/%Y %H:%M:%S'" >> gnuplot.script - echo "set format x '%H:%M:%S'" >> gnuplot.script - echo "plot 'anne-$(DATE).hypnogram.csv' every ::2 using 1:6" >> gnuplot.script - gnuplot -p gnuplot.script +BINARIES=hex2binary dump-serial +all: $(BINARIES) +dump-serial: dump-serial.cpp + g++ dump-serial.cpp -o dump-serial hex2binary: hex2binary.c gcc -Wall hex2binary.c -o hex2binary -# plot 'anne-110202.spectrogram.csv' every ::2 using 1:6 with lines title '2-4 Hz', 'anne-110202.spectrogram.csv' every ::2 using 1:7 with lines title '4-8 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:8 with lines title '8-13 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:9 with lines title '11-14 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:10 with lines title '13-18 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:11 with lines title '18-21 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:($12*10) with lines title "30-50 Hz (x10)" smooth bezier, 'anne-110202.hypnogram.csv' every ::2 using 1:($6*.1) \ No newline at end of file +clean: + rm -f $(BINARIES) + + diff --git a/dump-serial.cpp b/dump-serial.cpp new file mode 100644 index 0000000..ce7f7fe --- /dev/null +++ b/dump-serial.cpp @@ -0,0 +1,24 @@ +#include +#include +#include + +int main(int argc, char **argv) +{ + char *filename = argv[1]; + int fd = open(filename, O_RDONLY | O_NONBLOCK); + FILE *in= fdopen(fd, "r"); + + char buf[200]; + sprintf(buf, "stty -f %s 38400 -crtscts", filename); + system(buf); + sprintf(buf, "stty -f %s", filename); + system(buf); + + fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | ~O_NONBLOCK); + + while (1) { + int c = getc(in); + putchar(c); + fflush(stdout); + } +} diff --git a/raw2csv/Makefile b/raw2csv/Makefile new file mode 100644 index 0000000..f6f139b --- /dev/null +++ b/raw2csv/Makefile @@ -0,0 +1,50 @@ +DATE ?= 110205 + +ZEOS = $(wildcard *.zeo) +CSVS = $(patsubst %.zeo,%.hypnogram.csv,$(ZEOS)) + +all-csv: $(CSVS) + +#%.zeo: hex/%.zeo +# ./hex2binary <$^ >$@ + +%.hypnogram.csv: %.zeo + ./raw2csv.py $^ + +current: anne-$(DATE).hypnogram.csv + +sync: + rsync -av john-2.local:/Users/anne/education/bodytrack/zeologger/raw-data/\*.zeo . + +connect: + connect.sh anne-$(DATE).zeo + +csv: + -./raw2csv.py -f anne-$(DATE).zeo + +plot-follow: + echo "set datafile separator ','" > gnuplot.script + echo "set xdata time" >> gnuplot.script + echo "set timefmt '%m/%d/%Y %H:%M:%S'" >> gnuplot.script + echo "set format x '%H:%M:%S'" >> gnuplot.script + echo "plot 'anne-$(DATE).hypnogram.csv' every ::2 using 1:6" >> gnuplot.script + echo "! sleep 5" >> gnuplot.script + echo "reread" >> gnuplot.script + gnuplot gnuplot.script + +plot: + echo "set datafile separator ','" > gnuplot.script + echo "set xdata time" >> gnuplot.script + echo "set timefmt '%m/%d/%Y %H:%M:%S'" >> gnuplot.script + echo "set format x '%H:%M:%S'" >> gnuplot.script + echo "plot 'anne-$(DATE).hypnogram.csv' every ::2 using 1:6" >> gnuplot.script + gnuplot -p gnuplot.script + + +hex2binary: hex2binary.c + gcc -Wall hex2binary.c -o hex2binary + +clean: + rm hex2binary + +# plot 'anne-110202.spectrogram.csv' every ::2 using 1:6 with lines title '2-4 Hz', 'anne-110202.spectrogram.csv' every ::2 using 1:7 with lines title '4-8 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:8 with lines title '8-13 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:9 with lines title '11-14 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:10 with lines title '13-18 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:11 with lines title '18-21 Hz' smooth bezier, 'anne-110202.spectrogram.csv' every ::2 using 1:($12*10) with lines title "30-50 Hz (x10)" smooth bezier, 'anne-110202.hypnogram.csv' every ::2 using 1:($6*.1) \ No newline at end of file diff --git a/ZeoRawData-2.0/PKG-INFO b/raw2csv/ZeoRawData-2.0/PKG-INFO similarity index 100% rename from ZeoRawData-2.0/PKG-INFO rename to raw2csv/ZeoRawData-2.0/PKG-INFO diff --git a/ZeoRawData-2.0/README.txt b/raw2csv/ZeoRawData-2.0/README.txt similarity index 100% rename from ZeoRawData-2.0/README.txt rename to raw2csv/ZeoRawData-2.0/README.txt diff --git a/ZeoRawData-2.0/ZeoRawData/BaseLink.py b/raw2csv/ZeoRawData-2.0/ZeoRawData/BaseLink.py similarity index 100% rename from ZeoRawData-2.0/ZeoRawData/BaseLink.py rename to raw2csv/ZeoRawData-2.0/ZeoRawData/BaseLink.py diff --git a/ZeoRawData-2.0/ZeoRawData/BaseLink.pyc b/raw2csv/ZeoRawData-2.0/ZeoRawData/BaseLink.pyc similarity index 100% rename from ZeoRawData-2.0/ZeoRawData/BaseLink.pyc rename to raw2csv/ZeoRawData-2.0/ZeoRawData/BaseLink.pyc diff --git a/ZeoRawData-2.0/ZeoRawData/BaseLink.py~ b/raw2csv/ZeoRawData-2.0/ZeoRawData/BaseLink.py~ similarity index 100% rename from ZeoRawData-2.0/ZeoRawData/BaseLink.py~ rename to raw2csv/ZeoRawData-2.0/ZeoRawData/BaseLink.py~ diff --git a/ZeoRawData-2.0/ZeoRawData/Parser.py b/raw2csv/ZeoRawData-2.0/ZeoRawData/Parser.py similarity index 100% rename from ZeoRawData-2.0/ZeoRawData/Parser.py rename to raw2csv/ZeoRawData-2.0/ZeoRawData/Parser.py diff --git a/ZeoRawData-2.0/ZeoRawData/Parser.pyc b/raw2csv/ZeoRawData-2.0/ZeoRawData/Parser.pyc similarity index 100% rename from ZeoRawData-2.0/ZeoRawData/Parser.pyc rename to raw2csv/ZeoRawData-2.0/ZeoRawData/Parser.pyc diff --git a/ZeoRawData-2.0/ZeoRawData/Utility.py b/raw2csv/ZeoRawData-2.0/ZeoRawData/Utility.py similarity index 100% rename from ZeoRawData-2.0/ZeoRawData/Utility.py rename to raw2csv/ZeoRawData-2.0/ZeoRawData/Utility.py diff --git a/ZeoRawData-2.0/ZeoRawData/Utility.pyc b/raw2csv/ZeoRawData-2.0/ZeoRawData/Utility.pyc similarity index 100% rename from ZeoRawData-2.0/ZeoRawData/Utility.pyc rename to raw2csv/ZeoRawData-2.0/ZeoRawData/Utility.pyc diff --git a/ZeoRawData-2.0/ZeoRawData/__init__.py b/raw2csv/ZeoRawData-2.0/ZeoRawData/__init__.py similarity index 100% rename from ZeoRawData-2.0/ZeoRawData/__init__.py rename to raw2csv/ZeoRawData-2.0/ZeoRawData/__init__.py diff --git a/ZeoRawData-2.0/ZeoRawData/__init__.pyc b/raw2csv/ZeoRawData-2.0/ZeoRawData/__init__.pyc similarity index 100% rename from ZeoRawData-2.0/ZeoRawData/__init__.pyc rename to raw2csv/ZeoRawData-2.0/ZeoRawData/__init__.pyc diff --git a/ZeoRawData-2.0/setup.py b/raw2csv/ZeoRawData-2.0/setup.py similarity index 100% rename from ZeoRawData-2.0/setup.py rename to raw2csv/ZeoRawData-2.0/setup.py diff --git a/connect.sh b/raw2csv/connect.sh similarity index 100% rename from connect.sh rename to raw2csv/connect.sh diff --git a/plot_hypnogram.pl b/raw2csv/plot_hypnogram.pl similarity index 100% rename from plot_hypnogram.pl rename to raw2csv/plot_hypnogram.pl diff --git a/raw2csv.py b/raw2csv/raw2csv.py similarity index 100% rename from raw2csv.py rename to raw2csv/raw2csv.py