nilm/ethstream
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
70 Commits 1 Branch 5 Tags 131 KiB
ethstream-1.3.2
Commit Graph

38 Commits

Author SHA1 Message Date
Jim Paris
42d83649be Update authors 2016-07-13 15:59:44 -04:00
John
ba2565dc0e added clean shutdown of LabJack on ctrl-c 2015-06-03 10:54:44 -04:00
Jim Paris
35238c57d0 Fix version 2013-08-17 22:21:30 -04:00
jim
7262486a36 Fix typo in gain config 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@10877 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-05-21 19:21:38 +00:00
jim
3ba616841e Add temperature conversion. Example usage: ethstream -vvv -c -L -C 141 -r 10 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9728 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2011-06-23 21:22:54 +00:00
jim
6bc683fb21 Support setting values to go with timer modes 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@9689 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2011-06-09 17:58:14 +00:00
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
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
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
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
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
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
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
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
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
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
zacharyc
407a91c764 Merged Jim's changes to ljstream. This now should respect disk full errors 
and allow hex output


git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7214 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-02-23 15:47:55 +00:00
zacharyc
1d760e033b Updated ethstream to have separate Command and Data ports for NerdJack 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7212 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-02-23 14:39:26 +00:00
zacharyc
5b731f3e7e Now ethstream falls back from Labjack to Nerdjack 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7140 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-02-02 18:29:05 +00:00
zacharyc
a9200acc15 Combine ljstream with nerjack tools to make ethstream 
git-svn-id: https://bucket.mit.edu/svn/nilm/acquisition/ethstream@7089 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-01-21 15:21:57 +00:00