simplify sign bit extraction and remove extraneous error check'

'
This commit is contained in:
Adam Bright 2016-09-26 02:29:10 +00:00
parent d938e007ff
commit afc8c08cff
2 changed files with 24 additions and 22 deletions

View File

@ -3,7 +3,6 @@ package main
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"log"
"os" "os"
"time" "time"
@ -34,7 +33,7 @@ func main() {
therm.SetAlertStatus(true) therm.SetAlertStatus(true)
therm.SetAlertControl(true) therm.SetAlertControl(true)
therm.SetAlertSelect(false) therm.SetAlertSelect(false)
therm.SetAlertPolarity(false) therm.SetAlertPolarity(true)
config, _ := therm.Config() config, _ := therm.Config()
fmt.Printf("New Config: %b\n", config) fmt.Printf("New Config: %b\n", config)
@ -43,11 +42,18 @@ func main() {
panic(err) panic(err)
} }
if err := therm.SetWindowTempLower(TempFToC(-40)); err != nil {
panic(err)
}
lowerTemp, err := therm.WindowTempLower()
if err != nil {
fmt.Printf("Error reading lower temp limit: %s\n", err.Error())
}
fmt.Printf("Lower Temp Limit set to: %fC\n", lowerTemp)
if err := therm.SetWindowTempUpper(TempFToC(80)); err != nil { if err := therm.SetWindowTempUpper(TempFToC(80)); err != nil {
panic(err) panic(err)
} }
fmt.Printf("Set upper temp to %fC\n", TempFToC(80))
upperTemp, _ := therm.WindowTempUpper() upperTemp, _ := therm.WindowTempUpper()
fmt.Printf("Upper Temp Limit set to: %fC\n", upperTemp) fmt.Printf("Upper Temp Limit set to: %fC\n", upperTemp)
@ -55,10 +61,19 @@ func main() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
defer embd.CloseGPIO() defer alert.Close()
alert.SetDirection(embd.In) alert.SetDirection(embd.In)
alert.PullUp() alert.ActiveLow(false)
err = alert.Watch(embd.EdgeRising, func(alert embd.DigitalPin) {
fmt.Printf("Temperature is outside the specified window!\n")
therm.SetInterruptClear(true)
therm.Config()
})
if err != nil {
panic(err)
}
cancel := make(chan bool) cancel := make(chan bool)
go func() { go func() {
@ -78,16 +93,6 @@ func main() {
fmt.Printf("Current temp is: %fF (%fC), Window Alert: %v, Critical Alert: %v\n", fmt.Printf("Current temp is: %fF (%fC), Window Alert: %v, Critical Alert: %v\n",
TempCToF(temp.CelsiusDeg), temp.CelsiusDeg, temp.AboveUpper || temp.BelowLower, temp.AboveCritical) TempCToF(temp.CelsiusDeg), temp.CelsiusDeg, temp.AboveUpper || temp.BelowLower, temp.AboveCritical)
} }
status, err := alert.Read()
if err != nil {
log.Printf("Error reading pin: %s\n", err.Error())
continue
}
fmt.Printf("Status: %d\n\n", status)
if status == embd.High {
fmt.Println("Alert temp has been reached!")
return
}
case <-cancel: case <-cancel:
return return
} }

View File

@ -324,7 +324,8 @@ func convertWordToTempC(temp uint16) float64 {
tempRead := wholeNum + fraction tempRead := wholeNum + fraction
if !(temp&(1<<12) == 0) { // read sign bit // read sign bit
if temp>>12 == 1 {
tempRead *= -1 tempRead *= -1
} }
return tempRead return tempRead
@ -355,11 +356,7 @@ func (d *MCP9808) setTemp(reg byte, newTemp float64) error {
roundedFrac = 4 roundedFrac = 4
} }
newTempWord := signBit + uint16(wholeNum)*16 + roundedFrac*4 newTempWord := signBit + uint16(wholeNum)*16 + roundedFrac*4
return d.Bus.WriteWordToReg(address, reg, newTempWord)
if err := d.Bus.WriteWordToReg(address, reg, newTempWord); err != nil {
return err
}
return nil
} }
// AmbientTemp reads the current sensor value along with the flags denoting what boundaries the // AmbientTemp reads the current sensor value along with the flags denoting what boundaries the