jim
640edf6aab
Fix windows build
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9685 ddd99763-3ecb-0310-9145-efcb8ce7c51f
12 years ago
jim
e2bf34ed0c
Fix spelling error
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9684 ddd99763-3ecb-0310-9145-efcb8ce7c51f
12 years ago
cschantz
56a79c00f6
The changes allow ethstream to set the gain of individual labjack analog input channels
with the -g flag and ethstream also grabs the factory calibration constants from the
Labjack and uses them when the -c flag is given.
changes by Chris Schantz
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9683 ddd99763-3ecb-0310-9145-efcb8ce7c51f
12 years ago
nilm
bb4912a43c
Add timestamps to debug output in ethstream
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9487 ddd99763-3ecb-0310-9145-efcb8ce7c51f
12 years ago
nilm
16bf9f89ef
ignore SIGPIPE
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9453 ddd99763-3ecb-0310-9145-efcb8ce7c51f
12 years ago
nilm
267e0e32a5
fix make install when /usr/local/man/man1 does not exist
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9108 ddd99763-3ecb-0310-9145-efcb8ce7c51f
12 years ago
nilm
588385bcb1
Fix makefile for new ubuntu, no idea why the old one is broken
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9107 ddd99763-3ecb-0310-9145-efcb8ce7c51f
12 years ago
jim
ced565f372
get rid of extraneous breaks
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8328 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
jim
e6e9d32a54
Don't convert non-analog channels to volts
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8325 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
jim
9cdb4ea77c
Fix typo
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8323 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
jim
53ddf346d7
Unify timeouts
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8321 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
jim
b0be6473b8
Fix warnings
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8320 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
jim
9353f2b3f2
ignore that
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8319 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
jim
b697801e3e
Don't store this
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8318 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
jim
5a14055029
Fix some build stuff with dependency tracking (oops)
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8317 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
jim
25bed4b644
rename
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8316 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
jim
cd63e2fb11
Move ethstream to the parent directory
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8314 ddd99763-3ecb-0310-9145-efcb8ce7c51f
13 years ago
zacharyc
329871bf56
Fixed example formatting a bit.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7464 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
f4f809eee3
Added "examples" to code
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7463 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
ec1ae04a5b
Bumped version number and finished fixing up Windows autodetect support.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7454 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
67163dc1a2
Added Windows stub support for autodetection.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7453 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
a29bf180ab
Implemented Jim's hdhomerun autodetect for POSIX. Works great.
Windows testing next.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7452 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
4cccb783f0
Fixed up "range" argument
Took Jim's suggestions about addressing and device options
Made autodetection a better fallback.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7450 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
nilm
5e7f4ac97e
Increased timeout to at least 1 minute
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7433 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
a57c0c22c2
Massive cleanup and refactoring of data_stream function.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7431 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
2e3f2f4b23
Made ethstream reset a little easier.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7426 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
4592b6a75b
Changed nerdjack limits
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7423 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
nilm
d1447e2af8
Changed clock again
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7421 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
nilm
b9130788f2
Fixed annoying bug with NerdJack header
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7419 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
nilm
ed150ead35
Changed around packet structure
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7416 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
nilm
519a0c2e29
Made changes to ethstream to work with new clock
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7415 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
190fd3f3a7
Reverted clock change.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7406 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
9c174d12b0
Forgot a carriage return
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7404 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
b1e049eed0
Changed clock rate of NerdJack and added error checking to packets
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7403 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
d461365275
Added better error recovery code.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7314 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
a4eede145b
Added limits to issue warnings about high sample rates
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7303 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
6562c0b787
Fixed bug when output pipe is closed without a KILL signal
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7301 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
7f79ec8ff3
Ran indent on code to fix inconsistent style.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7298 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
1dd09ea52d
Made timeouts more reasonable for small sample rates.
Fixed error in period calculation's interaction with the PWM bug
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7297 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
ded6c7e5f4
Removed silicon workaround
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7289 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
f2d6566051
Packet reordering shifted PC side.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7287 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
357e808986
Introduced usage of full 20 bits of PWM period counter
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7286 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
0ed2935deb
Better command structure using hton, ntoh, and friends
Altered command structure to support full 20 bit period
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7282 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
1a2ed51d0c
Added one second sleep in code to let nerdjack recover from previous run
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7274 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
679b4ef64f
Fixed a few bugs to increase reliability and drop first line.
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7262 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
770a83b8f7
Fixed bug in precision argument for ethstream
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7260 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
627a1bf22b
Slight bit of code cleanup. More to come
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7254 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
43c8e19c67
Basic resume functionality working
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7250 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
4aab606162
Fixed up rate determination and added memory test routine for NerdJack
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7235 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago
zacharyc
c81d372d23
Made commands fixed width
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7220 ddd99763-3ecb-0310-9145-efcb8ce7c51f
14 years ago