mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/ausocean/av

This commit is contained in:
Saxon Milton 2018-05-14 16:24:45 +09:30
parent 839ac9d922 3792c7953d
commit 8e806b59dc
2 changed files with 6 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
RevidCLI.go
View File

@ -79,16 +79,9 @@ const (
) )
const ( const (
lightRelayPin = 19
ds18b20Temp = 60
dht11Temp = 40
dht11Hum = 41
dht22Temp = 50
dht22Hum = 51
dhtPin = 22
cpuTemp = 21
cpuUsage = 20 cpuUsage = 20
priority = 25 cpuTemp = 21
revidBitrate = 23
) )
// Globals // Globals
@ -430,47 +423,6 @@ func updateRevid(stop bool) {
func revidReportActions(pin int) (int, error) { func revidReportActions(pin int) (int, error) {
switch { 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 //function to measure temp of cpu
case pin == cpuTemp: 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 return int((1.0 - (float64(idle2-idle1) / float64(total2-total1))) * 100), nil
// case pin == priority: case pin == revidBitrate:
// return int(processManager.PriorityLevel), nil return int(revidInst.GetBitrate()), nil
default: default:
return -1, errors.New("External pin" + strconv.Itoa(pin) + " not defined") return -1, errors.New("External pin" + strconv.Itoa(pin) + " not defined")

1
revid/Revid.go
View File

@ -91,6 +91,7 @@ type Revid interface {
GetConfigRef() *Config GetConfigRef() *Config
Log(logType, m string) Log(logType, m string)
IsRunning() bool IsRunning() bool
GetBitrate() int64
} }
// The revid struct provides fields to describe the state of a Revid. // The revid struct provides fields to describe the state of a Revid.