This commit is contained in:
clinton 2016-09-29 13:01:27 +10:00
parent fb8e15108e
commit f4c803b036
1 changed files with 34 additions and 34 deletions

View File

@ -289,7 +289,7 @@ func New(bus embd.I2CBus, addr byte) (*BME280, error) {
fmt.Printf("H1: %f, H2: %f, H3: %f, H4: %f, H5: %f, H6: %f\n", s.Cal.H1, s.Cal.H2, s.Cal.H3, s.Cal.H4, s.Cal.H5, s.Cal.H6)
// Put the sensor in sleep mode and configure.
err = bus.WriteByteToReg(addr, CTRL_MEAS_REG, 0x00);
err = bus.WriteByteToReg(addr, CTRL_MEAS_REG, 0x00)
if err != nil {
return s, err
}
@ -325,8 +325,8 @@ func (s *BME280) fineT() (int32, error) {
if err != nil {
return 0, err
}
var1 := ((((adcT>>3) - (int32(s.Cal.T1) <<1))) * (int32(s.Cal.T2))) >> 11;
var2 := (((((adcT>>4) - (int32(s.Cal.T1))) * ((adcT>>4) - (int32(s.Cal.T1)))) >> 12) * (int32(s.Cal.T3))) >> 14;
var1 := (((adcT >> 3) - (int32(s.Cal.T1) << 1)) * (int32(s.Cal.T2))) >> 11
var2 := (((((adcT >> 4) - (int32(s.Cal.T1))) * ((adcT >> 4) - (int32(s.Cal.T1)))) >> 12) * (int32(s.Cal.T3))) >> 14
return (var1 + var2), nil
}
@ -372,7 +372,7 @@ func (s *BME280) Pressure() (float64, error) {
var2 = var2 + (var1 * s.Cal.P5 << 17)
var2 = var2 + (s.Cal.P4 << 35)
var1 = (var1 * var1 * s.Cal.P3 >> 8) + (var1 * s.Cal.P2 << 12)
var1 = (((int64(1)<<47)+var1))*s.Cal.P1>>33
var1 = ((int64(1) << 47) + var1) * s.Cal.P1 >> 33
if var1 == 0 {
return 0, nil // avoid exception caused by division by zero
}