From e6c6392a990b1fd3b2b9511db5c8d3632570a307 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Thu, 31 Dec 2020 22:23:38 +0100 Subject: Disable go-logger (missing license) The go-logger library does not have copyright information in the git repository, neither license headers in the go files nor a separate license file. Therefore no rights to share and modify the code are granted and it does not meet the DFSG. So disable logging for now until go-logger comes with an open source license. Bug: https://github.com/d2r2/go-logger/issues/5 Signed-off-by: Benjamin Drung --- examples/example1.go | 102 ++++++++++++++++++++++--------------------- logger.go | 8 ++-- sht3x.go | 50 ++++++++++----------- 3 files changed, 81 insertions(+), 79 deletions(-) diff --git a/examples/example1.go b/examples/example1.go index 19b6fa6..a2c1c2d 100644 --- a/examples/example1.go +++ b/examples/example1.go @@ -2,20 +2,22 @@ package main import ( "context" + "fmt" "time" + lg "log" i2c "github.com/d2r2/go-i2c" - logger "github.com/d2r2/go-logger" + //logger "github.com/d2r2/go-logger" sht3x "github.com/d2r2/go-sht3x" ) -var lg = logger.NewPackageLogger("main", - logger.DebugLevel, +//var lg = logger.NewPackageLogger("main", +// logger.DebugLevel, // logger.InfoLevel, -) +//) func main() { - defer logger.FinalizeLogger() + //defer logger.FinalizeLogger() // Create new connection to i2c-bus on 0 line with address 0x44. // Use i2cdetect utility to find device address over the i2c-bus i2c, err := i2c.NewI2C(0x44, 0) @@ -24,12 +26,12 @@ func main() { } defer i2c.Close() - lg.Notify("**********************************************************************************************") - lg.Notify("*** !!! READ THIS !!!") - lg.Notify("*** You can change verbosity of output, by modifying logging level of modules \"i2c\", \"sht3x\".") - lg.Notify("*** Uncomment/comment corresponding lines with call to ChangePackageLogLevel(...)") - lg.Notify("*** !!! READ THIS !!!") - lg.Notify("**********************************************************************************************") + //lg.Notify("**********************************************************************************************") + //lg.Notify("*** !!! READ THIS !!!") + //lg.Notify("*** You can change verbosity of output, by modifying logging level of modules \"i2c\", \"sht3x\".") + //lg.Notify("*** Uncomment/comment corresponding lines with call to ChangePackageLogLevel(...)") + //lg.Notify("*** !!! READ THIS !!!") + //lg.Notify("**********************************************************************************************") // Uncomment/comment next line to suppress/increase verbosity of output // logger.ChangePackageLogLevel("i2c", logger.InfoLevel) // logger.ChangePackageLogLevel("sht3x", logger.InfoLevel) @@ -41,53 +43,53 @@ func main() { lg.Fatal(err) } - lg.Notify("**********************************************************************************************") - lg.Notify("*** Read sensor states") - lg.Notify("**********************************************************************************************") + fmt.Printf("**********************************************************************************************") + fmt.Printf("*** Read sensor states") + fmt.Printf("**********************************************************************************************") hs, err := sensor.GetHeaterStatus(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Heater ON status = %v", hs) + fmt.Printf("Heater ON status = %v", hs) aps, err := sensor.GetAlertPendingStatus(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Alert pending status = %v", aps) + fmt.Printf("Alert pending status = %v", aps) tas, err := sensor.GetTemperatureAlertStatus(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Temperature alert pending status = %v", tas) + fmt.Printf("Temperature alert pending status = %v", tas) has, err := sensor.GetHumidityAlertStatus(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Humidity alert pending status = %v", has) + fmt.Printf("Humidity alert pending status = %v", has) rsd, err := sensor.CheckResetDetected(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Reset status detected = %v", rsd) + fmt.Printf("Reset status detected = %v", rsd) - lg.Notify("**********************************************************************************************") - lg.Notify("*** Single shot measurement mode") - lg.Notify("**********************************************************************************************") + fmt.Printf("**********************************************************************************************") + fmt.Printf("*** Single shot measurement mode") + fmt.Printf("**********************************************************************************************") ut, urh, err := sensor.ReadUncompTemperatureAndHumidity(i2c, sht3x.RepeatabilityMedium) if err != nil { lg.Fatal(err) } - lg.Infof("Temperature and RH uncompensated = %v, %v", ut, urh) + fmt.Printf("Temperature and RH uncompensated = %v, %v", ut, urh) temp, rh, err := sensor.ReadTemperatureAndRelativeHumidity(i2c, sht3x.RepeatabilityLow) if err != nil { lg.Fatal(err) } - lg.Infof("Temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Temperature and relative humidity = %v*C, %v%%", temp, rh) - lg.Notify("**********************************************************************************************") - lg.Notify("*** Periodic data acquisition mode ") - lg.Notify("**********************************************************************************************") + fmt.Printf("**********************************************************************************************") + fmt.Printf("*** Periodic data acquisition mode ") + fmt.Printf("**********************************************************************************************") err = sensor.StartPeriodicTemperatureAndHumidityMeasure(i2c, sht3x.Periodic4MPS, sht3x.RepeatabilityLow) if err != nil { lg.Fatal(err) @@ -97,42 +99,42 @@ func main() { if err != nil { lg.Fatal(err) } - lg.Infof("Temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Temperature and relative humidity = %v*C, %v%%", temp, rh) } err = sensor.Break(i2c) if err != nil { lg.Fatal(err) } - lg.Notify("**********************************************************************************************") - lg.Notify("*** Get temperature and humidity alert limits") - lg.Notify("**********************************************************************************************") + fmt.Printf("**********************************************************************************************") + fmt.Printf("*** Get temperature and humidity alert limits") + fmt.Printf("**********************************************************************************************") temp, rh, err = sensor.ReadAlertHighSet(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Read alert HIGH SET limit for temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Read alert HIGH SET limit for temperature and relative humidity = %v*C, %v%%", temp, rh) temp, rh, err = sensor.ReadAlertHighClear(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Read alert HIGH CLEAR limit for temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Read alert HIGH CLEAR limit for temperature and relative humidity = %v*C, %v%%", temp, rh) temp, rh, err = sensor.ReadAlertLowClear(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Read alert LOW CLEAR limit for temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Read alert LOW CLEAR limit for temperature and relative humidity = %v*C, %v%%", temp, rh) temp, rh, err = sensor.ReadAlertLowSet(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Read alert LOW SET limit for temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Read alert LOW SET limit for temperature and relative humidity = %v*C, %v%%", temp, rh) - lg.Notify("**********************************************************************************************") - lg.Notify("*** Set temperature and humidity alert limits.") - lg.Notify("*** Equation must be respected: HIGH SET > HIGH CLEAR > LOW CLEAR > LOW SET") - lg.Notify("**********************************************************************************************") + fmt.Printf("**********************************************************************************************") + fmt.Printf("*** Set temperature and humidity alert limits.") + fmt.Printf("*** Equation must be respected: HIGH SET > HIGH CLEAR > LOW CLEAR > LOW SET") + fmt.Printf("**********************************************************************************************") err = sensor.WriteAlertHighSet(i2c, 110, 90) if err != nil { @@ -154,26 +156,26 @@ func main() { if err != nil { lg.Fatal(err) } - lg.Infof("Read alert HIGH SET limit for temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Read alert HIGH SET limit for temperature and relative humidity = %v*C, %v%%", temp, rh) temp, rh, err = sensor.ReadAlertHighClear(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Read alert HIGH CLEAR limit for temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Read alert HIGH CLEAR limit for temperature and relative humidity = %v*C, %v%%", temp, rh) temp, rh, err = sensor.ReadAlertLowClear(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Read alert LOW CLEAR limit for temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Read alert LOW CLEAR limit for temperature and relative humidity = %v*C, %v%%", temp, rh) temp, rh, err = sensor.ReadAlertLowSet(i2c) if err != nil { lg.Fatal(err) } - lg.Infof("Read alert LOW SET limit for temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Read alert LOW SET limit for temperature and relative humidity = %v*C, %v%%", temp, rh) - lg.Notify("**********************************************************************************************") - lg.Notify("*** Activate heater for 10 secs and make a measurement ") - lg.Notify("**********************************************************************************************") + fmt.Printf("**********************************************************************************************") + fmt.Printf("*** Activate heater for 10 secs and make a measurement ") + fmt.Printf("**********************************************************************************************") // create context with cancellation possibility ctx, cancel := context.WithCancel(context.Background()) // use done channel as a trigger to exit from signal waiting goroutine @@ -190,9 +192,9 @@ func main() { if err != nil { lg.Fatal(err) } - lg.Infof("Heater ON status = %v", hs) + fmt.Printf("Heater ON status = %v", hs) pause := time.Second * 10 - lg.Infof("Waiting %v...", pause) + fmt.Printf("Waiting %v...", pause) select { // Check for termination request. case <-ctx.Done(): @@ -212,11 +214,11 @@ func main() { if err != nil { lg.Fatal(err) } - lg.Infof("Heater ON status = %v", hs) + fmt.Printf("Heater ON status = %v", hs) temp, rh, err = sensor.ReadTemperatureAndRelativeHumidity(i2c, sht3x.RepeatabilityLow) if err != nil { lg.Fatal(err) } - lg.Infof("Temperature and relative humidity = %v*C, %v%%", temp, rh) + fmt.Printf("Temperature and relative humidity = %v*C, %v%%", temp, rh) } diff --git a/logger.go b/logger.go index bd9bd26..f288aae 100644 --- a/logger.go +++ b/logger.go @@ -1,10 +1,10 @@ package sht3x -import logger "github.com/d2r2/go-logger" +//import logger "github.com/d2r2/go-logger" // You can manage verbosity of log output // in the package by changing last parameter value. -var lg = logger.NewPackageLogger("sht3x", - logger.DebugLevel, +//var lg = logger.NewPackageLogger("sht3x", +// logger.DebugLevel, // logger.InfoLevel, -) +//) diff --git a/sht3x.go b/sht3x.go index 0b86202..3812d58 100644 --- a/sht3x.go +++ b/sht3x.go @@ -275,10 +275,10 @@ func (v *SHT3X) readDataWithCRCCheck(i2c *i2c.I2C, blockCount int) ([]uint16, er "CRCs doesn't match: CRC from sensor (0x%0X) != calculated CRC (0x%0X)", crc, calcCRC)) return nil, err - } else { - lg.Debugf("CRCs verified: CRC from sensor (0x%0X) = calculated CRC (0x%0X)", - crc, calcCRC) - } + } //else { + // lg.Debugf("CRCs verified: CRC from sensor (0x%0X) = calculated CRC (0x%0X)", + // crc, calcCRC) + //} results = append(results, getU16BE(data[i].Data[:2])) } @@ -287,7 +287,7 @@ func (v *SHT3X) readDataWithCRCCheck(i2c *i2c.I2C, blockCount int) ([]uint16, er // Reset reboot a sensor. func (v *SHT3X) Reset(i2c *i2c.I2C) error { - lg.Debug("Reset sensor...") + //lg.Debug("Reset sensor...") cmd := CMD_RESET _, err := i2c.WriteBytes(cmd) if err != nil { @@ -301,7 +301,7 @@ func (v *SHT3X) Reset(i2c *i2c.I2C) error { // SetHeaterStatus enable or disable heater. func (v *SHT3X) SetHeaterStatus(i2c *i2c.I2C, enableHeater bool) error { - lg.Debug("Setting heater on/off...") + //lg.Debug("Setting heater on/off...") var cmd []byte if enableHeater { cmd = CMD_ENABLE_HEATER @@ -321,7 +321,7 @@ func (v *SHT3X) SetHeaterStatus(i2c *i2c.I2C, enableHeater bool) error { // GetHeaterStatus return heater status: enabled (true) or disabled (false). func (v *SHT3X) GetHeaterStatus(i2c *i2c.I2C) (bool, error) { - lg.Debug("Getting heater status...") + //lg.Debug("Getting heater status...") v.lastStatusReg = nil ur, err := v.ReadStatusReg(i2c) if err != nil { @@ -332,7 +332,7 @@ func (v *SHT3X) GetHeaterStatus(i2c *i2c.I2C) (bool, error) { // GetAlertPendingStatus return alert pending status: found (true) or not (false). func (v *SHT3X) GetAlertPendingStatus(i2c *i2c.I2C) (bool, error) { - lg.Debug("Getting alert pending status...") + //lg.Debug("Getting alert pending status...") v.lastStatusReg = nil ur, err := v.ReadStatusReg(i2c) if err != nil { @@ -343,7 +343,7 @@ func (v *SHT3X) GetAlertPendingStatus(i2c *i2c.I2C) (bool, error) { // GetHumidityAlertStatus return humidity alert pending status: found (true) or not (false). func (v *SHT3X) GetHumidityAlertStatus(i2c *i2c.I2C) (bool, error) { - lg.Debug("Getting humidity alert status...") + //lg.Debug("Getting humidity alert status...") v.lastStatusReg = nil ur, err := v.ReadStatusReg(i2c) if err != nil { @@ -354,7 +354,7 @@ func (v *SHT3X) GetHumidityAlertStatus(i2c *i2c.I2C) (bool, error) { // GetTemperatureAlertStatus return humidity alert pending status: found (true) or not (false). func (v *SHT3X) GetTemperatureAlertStatus(i2c *i2c.I2C) (bool, error) { - lg.Debug("Getting temperature alert status...") + //lg.Debug("Getting temperature alert status...") v.lastStatusReg = nil ur, err := v.ReadStatusReg(i2c) if err != nil { @@ -365,7 +365,7 @@ func (v *SHT3X) GetTemperatureAlertStatus(i2c *i2c.I2C) (bool, error) { // CheckResetDetected return system reset detected : found (true) or not (false). func (v *SHT3X) CheckResetDetected(i2c *i2c.I2C) (bool, error) { - lg.Debug("Checking system reset status...") + //lg.Debug("Checking system reset status...") v.lastStatusReg = nil ur, err := v.ReadStatusReg(i2c) if err != nil { @@ -376,7 +376,7 @@ func (v *SHT3X) CheckResetDetected(i2c *i2c.I2C) (bool, error) { // CheckCommandFailed return last command status: failed (true) or not (false). func (v *SHT3X) CheckCommandFailed(i2c *i2c.I2C) (bool, error) { - lg.Debug("Checking last command status...") + //lg.Debug("Checking last command status...") v.lastStatusReg = nil ur, err := v.ReadStatusReg(i2c) if err != nil { @@ -387,7 +387,7 @@ func (v *SHT3X) CheckCommandFailed(i2c *i2c.I2C) (bool, error) { // CheckWrittedChecksumIsIncorrect return last command status: not correct (true) correct (false). func (v *SHT3X) CheckWrittenChecksumIsIncorrect(i2c *i2c.I2C) (bool, error) { - lg.Debug("Checking last written data checksum status...") + //lg.Debug("Checking last written data checksum status...") v.lastStatusReg = nil ur, err := v.ReadStatusReg(i2c) if err != nil { @@ -417,7 +417,7 @@ func (v *SHT3X) initiateMeasure(i2c *i2c.I2C, cmd []byte, func (v *SHT3X) ReadUncompTemperatureAndHumidity(i2c *i2c.I2C, precision MeasureRepeatability) (uint16, uint16, error) { - lg.Debug("Measuring temperature and humidity...") + //lg.Debug("Measuring temperature and humidity...") var cmd []byte switch precision { case RepeatabilityLow: @@ -448,7 +448,7 @@ func (v *SHT3X) ReadTemperatureAndRelativeHumidity(i2c *i2c.I2C, if err != nil { return 0, 0, err } - lg.Debugf("Temperature and humidity uncompensated = %v, %v", ut, urh) + //lg.Debugf("Temperature and humidity uncompensated = %v, %v", ut, urh) temp := v.uncompTemperatureToCelsius(ut) rh := v.uncompHumidityToRelativeHumidity(urh) return temp, rh, nil @@ -559,7 +559,7 @@ func (v *SHT3X) StartPeriodicTemperatureAndHumidityMeasure(i2c *i2c.I2C, // Break interrupt "periodic data acquisition mode" and // return sensor to "single shot mode". func (v *SHT3X) Break(i2c *i2c.I2C) error { - lg.Debug("Interrupt periodic data acquisition mode...") + //lg.Debug("Interrupt periodic data acquisition mode...") cmd := CMD_BREAK _, err := i2c.WriteBytes(cmd) if err != nil { @@ -673,7 +673,7 @@ func (v *SHT3X) FetchTemperatureAndRelativeHumidityWithContext(parent context.Co if err != nil { return 0, 0, err } - lg.Debugf("Temperature and RH uncompensated = %v, %v", ut, urh) + //lg.Debugf("Temperature and RH uncompensated = %v, %v", ut, urh) temp = v.uncompTemperatureToCelsius(ut) hum = v.uncompHumidityToRelativeHumidity(urh) return temp, hum, nil @@ -725,7 +725,7 @@ func (v *SHT3X) writeAlertData(i2c *i2c.I2C, cmd []byte, temp, hum float32) erro // ReadAlertHighSet read sensor alert HIGH SET limits // for temperature and humidity. func (v *SHT3X) ReadAlertHighSet(i2c *i2c.I2C) (float32, float32, error) { - lg.Debug("Getting alert HIGH SET limit...") + //lg.Debug("Getting alert HIGH SET limit...") temp, rh, err := v.readAlertData(i2c, CMD_ALERT_READ_HIGH_SET) if err != nil { return 0, 0, err @@ -737,7 +737,7 @@ func (v *SHT3X) ReadAlertHighSet(i2c *i2c.I2C) (float32, float32, error) { // ReadAlertHighClear read sensor alert HIGH CLEAR limits // for temperature and humidity. func (v *SHT3X) ReadAlertHighClear(i2c *i2c.I2C) (float32, float32, error) { - lg.Debug("Getting alert HIGH CLEAR limit...") + //lg.Debug("Getting alert HIGH CLEAR limit...") temp, rh, err := v.readAlertData(i2c, CMD_ALERT_READ_HIGH_CLEAR) if err != nil { return 0, 0, err @@ -749,7 +749,7 @@ func (v *SHT3X) ReadAlertHighClear(i2c *i2c.I2C) (float32, float32, error) { // ReadAlertLowClear read sensor alert LOW CLEAR limits // for temperature and humidity. func (v *SHT3X) ReadAlertLowClear(i2c *i2c.I2C) (float32, float32, error) { - lg.Debug("Getting alert LOW CLEAR limit...") + //lg.Debug("Getting alert LOW CLEAR limit...") temp, rh, err := v.readAlertData(i2c, CMD_ALERT_READ_LOW_CLEAR) if err != nil { return 0, 0, err @@ -761,7 +761,7 @@ func (v *SHT3X) ReadAlertLowClear(i2c *i2c.I2C) (float32, float32, error) { // ReadAlertLowSet read sensor alert LOW SET limits // for temperature and humidity. func (v *SHT3X) ReadAlertLowSet(i2c *i2c.I2C) (float32, float32, error) { - lg.Debug("Getting alert LOW SET limit...") + //lg.Debug("Getting alert LOW SET limit...") temp, rh, err := v.readAlertData(i2c, CMD_ALERT_READ_LOW_SET) if err != nil { return 0, 0, err @@ -773,7 +773,7 @@ func (v *SHT3X) ReadAlertLowSet(i2c *i2c.I2C) (float32, float32, error) { // WriteAlertHighSet write alert HIGH SET limits // for temperature and humidity to the sensor. func (v *SHT3X) WriteAlertHighSet(i2c *i2c.I2C, temp, hum float32) error { - lg.Debug("Setting alert HIGH SET limit...") + //lg.Debug("Setting alert HIGH SET limit...") err := v.writeAlertData(i2c, CMD_ALERT_WRITE_HIGH_SET, temp, hum) if err != nil { return err @@ -785,7 +785,7 @@ func (v *SHT3X) WriteAlertHighSet(i2c *i2c.I2C, temp, hum float32) error { // WriteAlertHighClear write alert HIGH CLEAR limits // for temperature and humidity to the sensor. func (v *SHT3X) WriteAlertHighClear(i2c *i2c.I2C, temp, hum float32) error { - lg.Debug("Setting alert HIGH CLEAR limit...") + //lg.Debug("Setting alert HIGH CLEAR limit...") err := v.writeAlertData(i2c, CMD_ALERT_WRITE_HIGH_CLEAR, temp, hum) if err != nil { return err @@ -797,7 +797,7 @@ func (v *SHT3X) WriteAlertHighClear(i2c *i2c.I2C, temp, hum float32) error { // WriteAlertLowClear write alert LOW CLEAR limits // for temperature and humidity to the sensor. func (v *SHT3X) WriteAlertLowClear(i2c *i2c.I2C, temp, hum float32) error { - lg.Debug("Setting alert LOW CLEAR limit...") + //lg.Debug("Setting alert LOW CLEAR limit...") err := v.writeAlertData(i2c, CMD_ALERT_WRITE_LOW_CLEAR, temp, hum) if err != nil { return err @@ -809,7 +809,7 @@ func (v *SHT3X) WriteAlertLowClear(i2c *i2c.I2C, temp, hum float32) error { // WriteAlertLowSet write alert LOW SET limits // for temperature and humidity to the sensor. func (v *SHT3X) WriteAlertLowSet(i2c *i2c.I2C, temp, hum float32) error { - lg.Debug("Setting alert LOW SET limit...") + //lg.Debug("Setting alert LOW SET limit...") err := v.writeAlertData(i2c, CMD_ALERT_WRITE_LOW_SET, temp, hum) if err != nil { return err -- 2.27.0