Browse Source

move data around a bit

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7707 ddd99763-3ecb-0310-9145-efcb8ce7c51f
tags/zoom-1.0
nilm 12 years ago
parent
commit
7656aa1cd9
19 changed files with 466652 additions and 1032598 deletions
  1. BIN
      pc/calibrate.log.gz
  2. +0
    -40000
      pc/data/1.dat
  3. +0
    -80000
      pc/data/2.dat
  4. BIN
      pc/data/20090722/log.gz
  5. +16
    -0
      pc/data/20090722/log.txt
  6. +0
    -80000
      pc/data/3.dat
  7. +0
    -0
      pc/data/calibrate-25-first.log.gz
  8. +0
    -0
      pc/data/calibrate-25-second.log.gz
  9. +0
    -0
      pc/data/calibrate-50a.log.gz
  10. +0
    -24597
      pc/data/data.dat
  11. +0
    -8000
      pc/data/la55-resolution-test-1s.dat
  12. +0
    -800000
      pc/data/la55-resolution-test.dat
  13. +245268
    -0
      pc/data/old/log-24khz-1.389726
  14. +10
    -0
      pc/data/old/log-24khz-1.389726.txt
  15. +221331
    -0
      pc/data/old/log-8khz-pc+dc.1.389871
  16. +6
    -0
      pc/data/old/log-8khz-pc+dc.1.389871.txt
  17. +13
    -0
      pc/debug.ini
  18. +1
    -1
      pc/process/calibtest.m
  19. +7
    -0
      pc/process/loadlog.m

BIN
pc/calibrate.log.gz View File


+ 0
- 40000
pc/data/1.dat
File diff suppressed because it is too large
View File


+ 0
- 80000
pc/data/2.dat
File diff suppressed because it is too large
View File


BIN
pc/data/20090722/log.gz View File


+ 16
- 0
pc/data/20090722/log.txt View File

@@ -0,0 +1,16 @@
start capture (calibration 1.385419)
light on
saved tek00002
plug in pc
turn on pc
saved tek00003
turn off light
saved tek00004
turn off computer
turn on light
keithley 100ma
keithley 120ma
keithley 110ma
keithley off
light off
end capture

+ 0
- 80000
pc/data/3.dat
File diff suppressed because it is too large
View File


pc/calibrate-25-first.log.gz → pc/data/calibrate-25-first.log.gz View File


pc/calibrate-25-second.log.gz → pc/data/calibrate-25-second.log.gz View File


pc/calibrate-50a.log.gz → pc/data/calibrate-50a.log.gz View File


+ 0
- 24597
pc/data/data.dat
File diff suppressed because it is too large
View File


+ 0
- 8000
pc/data/la55-resolution-test-1s.dat
File diff suppressed because it is too large
View File


+ 0
- 800000
pc/data/la55-resolution-test.dat
File diff suppressed because it is too large
View File


+ 245268
- 0
pc/data/old/log-24khz-1.389726
File diff suppressed because it is too large
View File


+ 10
- 0
pc/data/old/log-24khz-1.389726.txt View File

@@ -0,0 +1,10 @@
computer on
light on
keithley 120ma
keithley 220ma
keithley 120ma
keithley 20ma
keithley 10ma
keithley off
octave:32> t=1:240000; y=filter(ones(1,4000)/4000,1,dac(t)-calib*adc(t));
octave:33> t=190000:210000; plot(t,y(t));

+ 221331
- 0
pc/data/old/log-8khz-pc+dc.1.389871
File diff suppressed because it is too large
View File


+ 6
- 0
pc/data/old/log-8khz-pc+dc.1.389871.txt View File

@@ -0,0 +1,6 @@
8khz TIMER_RATE
pc on
keithley 10ma
keithley 110ma
keithley 10ma
keithley 0ma

+ 13
- 0
pc/debug.ini View File

@@ -0,0 +1,13 @@
define \%P /dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A6007wag-if00-port0
define \%B 115200

set line \%P
if failure { echo "Couldn't open \%P" , exit }
set carrier-watch off
set flow-control none
set speed \%B
set serial 8n1
set key \127 \8
log session /tmp/session.log
connect
quit

+ 1
- 1
pc/process/calibtest.m View File

@@ -20,7 +20,7 @@ hold on



for i = 50 : 50
for i = 25 : 10 : 75
unclamped = 1000:3000;
unclamped = 1:4000;



+ 7
- 0
pc/process/loadlog.m View File

@@ -0,0 +1,7 @@
data=load("log");
dac=data(:,1);
adc=data(:,2);
t=1:size(data,1);
length(t)



Loading…
Cancel
Save