Browse Source

it's a 4000 point sweep

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7612 ddd99763-3ecb-0310-9145-efcb8ce7c51f
tags/zoom-1.0
jim 13 years ago
parent
commit
ef4b116ebb
3 changed files with 5 additions and 3 deletions
  1. +3
    -2
      pc/calibrate.c
  2. +1
    -0
      pc/zoom.c
  3. +1
    -1
      pc/zoom.h

+ 3
- 2
pc/calibrate.c View File

@@ -128,13 +128,14 @@ void calibrate(int zoom, int gpib)
}
}

safecleanup:
zoom_zero_start(zoom);
keithley_off(gpib);
usleep(100000);
usleep(50000);
zoom_zero_stop(zoom);
return;

fail:
info("Failed\n");
return;
goto safecleanup;
}

+ 1
- 0
pc/zoom.c View File

@@ -70,6 +70,7 @@ int zoom_sweep(int fd, int dac[ZOOM_SWEEP_COUNT], int adc[ZOOM_SWEEP_COUNT])
if (fdgets(s, 128, fd, 1000) == NULL)
return -1;
chomp(s);
printf("got line: '%s'\n", s);
if (sscanf(s, "%d %d%c", &dac[i], &adc[i], &c) != 2)
return -2;
}


+ 1
- 1
pc/zoom.h View File

@@ -1,7 +1,7 @@
#ifndef ZOOM_H
#define ZOOM_H

#define ZOOM_SWEEP_COUNT 3000
#define ZOOM_SWEEP_COUNT 4000

int zoom_init(int fd);
int zoom_zero_start(int fd);


Loading…
Cancel
Save