getapiversion, more API version changes

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

View File

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

View File

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