x-move/ilt1000
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getapiversion, more API version changes

Browse Source
This commit is contained in:
Ian Gulliver
2016-04-23 15:18:27 -07:00
parent f5ca408961
commit 8e83465bec
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dump.py
View File

@@ -30,6 +30,7 @@ LINES = [
('Model', ilt.GetModelName, ''), ('Model', ilt.GetModelName, ''),
('Generation', ilt.GetGeneration, ''), ('Generation', ilt.GetGeneration, ''),
('Firmware version', ilt.GetFirmwareVersion, ''), ('Firmware version', ilt.GetFirmwareVersion, ''),
('API version', ilt.GetAPIVersion, ''),
('Serial number', ilt.GetSerialNumber, ''), ('Serial number', ilt.GetSerialNumber, ''),
('Aux serial number', ilt.GetAuxSerialNumber, ''), ('Aux serial number', ilt.GetAuxSerialNumber, ''),
('Friendly name', ilt.GetFriendlyName, ''), ('Friendly name', ilt.GetFriendlyName, ''),

20
ilt1000.py
View File

@@ -39,10 +39,6 @@ class CommandError(Error):
# getirrthresholdlow # getirrthresholdlow
# setirrthresholdlow # setirrthresholdlow
# setirrdatapoint
# eraseirrdata
# setsimpleirrcal
# storeirrdata
# setcurrentloop # setcurrentloop
@@ -59,13 +55,10 @@ class CommandError(Error):
# setcalfactor # setcalfactor
# usecalfactortemp # usecalfactortemp
# setsamplecount
# getsampletime # getsampletime
# setsampletime # setsampletime
# setsampletimetemp # setsampletimetemp
# getapiversion
# getbias # getbias
# getecal # getecal
@@ -186,6 +179,9 @@ class ILT1000(object):
def GetFirmwareVersion(self): def GetFirmwareVersion(self):
return self._SendCommand('getfwversion') return self._SendCommand('getfwversion')
def GetAPIVersion(self):
return int(self._SendCommand('getapiversion'))
def GetSerialNumber(self): def GetSerialNumber(self):
return self._SendCommand('getserialnumber') return self._SendCommand('getserialnumber')
@@ -220,7 +216,7 @@ class ILT1000(object):
def GetTransmissionPercent(self): def GetTransmissionPercent(self):
ret = self._SendCommand('gettrans') ret = self._SendCommand('gettrans')
return float(ret) / 10 return float(ret)
def Get100PercentCurrent(self): def Get100PercentCurrent(self):
ret = self._SendCommand('get100perc') ret = self._SendCommand('get100perc')
@@ -232,7 +228,7 @@ class ILT1000(object):
def GetOpticalDensity(self): def GetOpticalDensity(self):
ret = self._SendCommand('getod') ret = self._SendCommand('getod')
return float(ret) / 100 return float(ret)
def GetIrradiance(self): def GetIrradiance(self):
ret = self._SendCommand('getirradiance') ret = self._SendCommand('getirradiance')
@@ -297,7 +293,7 @@ class ILT1000(object):
def GetLogData(self): def GetLogData(self):
samples = int(self._SendCommand('getlogdata')) samples = int(self._SendCommand('getlogdata'))
mask = int(self._GetLine()) mask = int(self._GetLine())
period = float(self._GetLine()) / 10 period = float(self._GetLine()) / 100
ret = { ret = {
'period_seconds': period, 'period_seconds': period,
'samples': [], 'samples': [],
@@ -326,10 +322,10 @@ class ILT1000(object):
] ]
index = 1 index = 1
if mask & self.LOG_OPTICAL_DENSITY: if mask & self.LOG_OPTICAL_DENSITY:
sample.append(float(values[index]) / 100) sample.append(float(values[index]))
index += 1 index += 1
if mask & self.LOG_TRANSMISSION_PERCENT: if mask & self.LOG_TRANSMISSION_PERCENT:
sample.append(float(values[index]) / 10) sample.append(float(values[index]))
index += 1 index += 1
if mask & self.LOG_SENSOR_CURRENT: if mask & self.LOG_SENSOR_CURRENT:
sample.append(float(values[index])) sample.append(float(values[index]))