Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi_temperature: Wrap code to 80 columns 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-02-27 13:14:23 -05:00
parent ee1236805e
commit 21e45cac64
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
klippy/extras/spi_temperature.py
View File

@ -289,7 +289,8 @@ class MAX31865(SensorBase):
if fault & 0x40: if fault & 0x40:
self.fault("Max31865 RTD input is shorted") self.fault("Max31865 RTD input is shorted")
if fault & 0x20: if fault & 0x20:
self.fault("Max31865 VREF- is greater than 0.85 * VBIAS, FORCE- open") self.fault(
"Max31865 VREF- is greater than 0.85 * VBIAS, FORCE- open")
if fault & 0x10: if fault & 0x10:
self.fault("Max31865 VREF- is less than 0.85 * VBIAS, FORCE- open") self.fault("Max31865 VREF- is less than 0.85 * VBIAS, FORCE- open")
if fault & 0x08: if fault & 0x08:
@ -300,16 +301,16 @@ class MAX31865(SensorBase):
self.fault("Max31865 Unspecified error") self.fault("Max31865 Unspecified error")
adc = adc >> 1 # remove fault bit adc = adc >> 1 # remove fault bit
R_rtd = (self.reference_r * adc) / VAL_ADC_MAX R_rtd = (self.reference_r * adc) / VAL_ADC_MAX
temp = ( temp = ((( ( -1 * self.rtd_nominal_r ) * VAL_A )
(( ( -1 * self.rtd_nominal_r ) * VAL_A ) + + math.sqrt( ( self.rtd_nominal_r**2 * VAL_A * VAL_A )
math.sqrt( ( self.rtd_nominal_r * self.rtd_nominal_r * VAL_A * VAL_A ) - - ( 4 * self.rtd_nominal_r * VAL_B
( 4 * self.rtd_nominal_r * VAL_B * ( self.rtd_nominal_r - R_rtd ) ))) * ( self.rtd_nominal_r - R_rtd ) )))
/ (2 * self.rtd_nominal_r * VAL_B)) / (2 * self.rtd_nominal_r * VAL_B))
return temp return temp
def calc_adc(self, temp): def calc_adc(self, temp):
R_rtd = temp * ( 2 * self.rtd_nominal_r * VAL_B ) R_rtd = temp * ( 2 * self.rtd_nominal_r * VAL_B )
R_rtd = math.pow( ( R_rtd + ( self.rtd_nominal_r * VAL_A ) ), 2) R_rtd = math.pow( ( R_rtd + ( self.rtd_nominal_r * VAL_A ) ), 2)
R_rtd = -1 * ( R_rtd - ( self.rtd_nominal_r * self.rtd_nominal_r * VAL_A * VAL_A ) ) R_rtd = -1 * ( R_rtd - (self.rtd_nominal_r**2 * VAL_A * VAL_A ) )
R_rtd = R_rtd / ( 4 * self.rtd_nominal_r * VAL_B ) R_rtd = R_rtd / ( 4 * self.rtd_nominal_r * VAL_B )
R_rtd = ( -1 * R_rtd ) + self.rtd_nominal_r R_rtd = ( -1 * R_rtd ) + self.rtd_nominal_r
adc = int( ( ( R_rtd * VAL_ADC_MAX ) / self.reference_r) + 0.5 ) adc = int( ( ( R_rtd * VAL_ADC_MAX ) / self.reference_r) + 0.5 )