nilm/ethstream
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
56 Commits 1 Branch 5 Tags 131 KiB
640edf6aab
Commit Graph

56 Commits

Author SHA1 Message Date
jim
640edf6aab Fix windows build 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9685 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2011-06-06 15:03:45 +00:00
jim
e2bf34ed0c Fix spelling error 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9684 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2011-06-06 15:03:03 +00:00
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
 2011-06-06 00:39:03 +00:00
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
 2011-03-29 16:08:44 +00:00
nilm
16bf9f89ef ignore SIGPIPE 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9453 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2011-03-23 19:52:21 +00:00
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
 2011-01-21 03:16:57 +00:00
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
 2011-01-21 03:14:19 +00:00
jim
ced565f372 get rid of extraneous breaks 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8328 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2010-02-09 07:46:41 +00:00
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
 2010-02-08 23:06:29 +00:00
jim
9cdb4ea77c Fix typo 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8323 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2010-02-08 22:30:03 +00:00
jim
53ddf346d7 Unify timeouts 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8321 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2010-02-08 22:13:09 +00:00
jim
b0be6473b8 Fix warnings 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8320 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2010-02-08 21:37:57 +00:00
jim
9353f2b3f2 ignore that 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8319 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2010-02-08 21:36:50 +00:00
jim
b697801e3e Don't store this 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8318 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2010-02-08 21:36:19 +00:00
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
 2010-02-08 21:35:23 +00:00
jim
25bed4b644 rename 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@8316 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2010-02-08 21:25:26 +00:00
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
 2010-02-08 21:23:12 +00:00
zacharyc
329871bf56 Fixed example formatting a bit. 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7464 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-04-23 16:26:24 +00:00
zacharyc
f4f809eee3 Added "examples" to code 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7463 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-04-23 16:20:07 +00:00
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
 2009-04-17 17:06:26 +00:00
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
 2009-04-17 16:14:36 +00:00
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
 2009-04-17 15:57:42 +00:00
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
 2009-04-16 23:12:15 +00:00
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
 2009-04-14 15:49:53 +00:00
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
 2009-04-11 17:35:54 +00:00
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
 2009-04-10 20:35:36 +00:00
zacharyc
4592b6a75b Changed nerdjack limits 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7423 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-04-10 17:17:39 +00:00
nilm
d1447e2af8 Changed clock again 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7421 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-04-10 15:58:33 +00:00
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
 2009-04-09 22:00:15 +00:00
nilm
ed150ead35 Changed around packet structure 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7416 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-04-08 15:37:07 +00:00
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
 2009-04-07 15:38:19 +00:00
zacharyc
190fd3f3a7 Reverted clock change. 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7406 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-04-03 17:44:57 +00:00
zacharyc
9c174d12b0 Forgot a carriage return 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7404 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-04-03 17:04:29 +00:00
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
 2009-04-03 17:03:00 +00:00
zacharyc
d461365275 Added better error recovery code. 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7314 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-03-19 22:19:05 +00:00
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
 2009-03-18 22:36:31 +00:00
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
 2009-03-18 17:27:46 +00:00
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
 2009-03-18 15:23:10 +00:00
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
 2009-03-18 15:20:41 +00:00
zacharyc
ded6c7e5f4 Removed silicon workaround 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7289 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-03-17 21:32:50 +00:00
zacharyc
f2d6566051 Packet reordering shifted PC side. 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7287 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-03-17 21:07:18 +00:00
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
 2009-03-17 20:25:49 +00:00
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
 2009-03-13 20:33:52 +00:00
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
 2009-03-12 21:50:37 +00:00
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
 2009-03-09 21:36:59 +00:00
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
 2009-03-09 18:12:09 +00:00
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
 2009-03-06 17:20:49 +00:00
zacharyc
43c8e19c67 Basic resume functionality working 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7250 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-03-05 21:43:25 +00:00
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
 2009-03-02 16:35:54 +00:00
zacharyc
c81d372d23 Made commands fixed width 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7220 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-02-24 14:50:11 +00:00