diff --git a/RevidCLI.go b/RevidCLI.go index b12cfe41..8330df3f 100644 --- a/RevidCLI.go +++ b/RevidCLI.go @@ -79,16 +79,9 @@ const ( ) const ( - lightRelayPin = 19 - ds18b20Temp = 60 - dht11Temp = 40 - dht11Hum = 41 - dht22Temp = 50 - dht22Hum = 51 - dhtPin = 22 - cpuTemp = 21 - cpuUsage = 20 - priority = 25 + cpuUsage = 20 + cpuTemp = 21 + revidBitrate = 23 ) // Globals @@ -430,47 +423,6 @@ func updateRevid(stop bool) { func revidReportActions(pin int) (int, error) { switch { - // case pin == ds18b20Temp: - // sensors, err := ds18b20.Sensors() - // if err != nil { - // processManager.Logger.Log("Error", "Error retrieving connected sensors: "+err.Error()) - // return -1, errors.New("No sensors connected") - // } - - // t, err := ds18b20.Temperature(sensors[0]) - // if err == nil { - // return int(t), nil - // } - - // return -1, errors.New("Unable to read temperature") - - // case pin == dht11Temp: - // if val, _, _, err := dht.ReadDHTxxWithRetry(dht.DHT11, dhtPin, false, 5); err != nil { - // return -1, errors.New("DHT Read Err: " + err.Error()) - // } else { - // return int(val), nil - // } - - // case pin == dht11Hum: - // if _, val, _, err := dht.ReadDHTxxWithRetry(dht.DHT11, dhtPin, false, 5); err != nil { - // return -1, errors.New("DHT Read Err: " + err.Error()) - // } else { - // return int(val), nil - // } - - // case pin == dht22Temp: - // if val, _, _, err := dht.ReadDHTxxWithRetry(dht.DHT22, dhtPin, false, 5); err != nil { - // return -1, errors.New("DHT Read Err: " + err.Error()) - // } else { - // return int(val), nil - // } - - // case pin == dht22Hum: - // if _, val, _, err := dht.ReadDHTxxWithRetry(dht.DHT22, dhtPin, false, 5); err != nil { - // return -1, errors.New("DHT Read Err: " + err.Error()) - // } else { - // return int(val), nil - // } //function to measure temp of cpu case pin == cpuTemp: @@ -510,8 +462,8 @@ func revidReportActions(pin int) (int, error) { return int((1.0 - (float64(idle2-idle1) / float64(total2-total1))) * 100), nil - // case pin == priority: - // return int(processManager.PriorityLevel), nil + case pin == revidBitrate: + return int(revidInst.GetBitrate()), nil default: return -1, errors.New("External pin" + strconv.Itoa(pin) + " not defined") diff --git a/revid/Revid.go b/revid/Revid.go index e3176298..46600e88 100644 --- a/revid/Revid.go +++ b/revid/Revid.go @@ -91,6 +91,7 @@ type Revid interface { GetConfigRef() *Config Log(logType, m string) IsRunning() bool + GetBitrate() int64 } // The revid struct provides fields to describe the state of a Revid.