mirror of https://github.com/cjbassi/gotop.git
Improve OSX temp names (#71)
This commit is contained in:
parent
38e3d781ae
commit
e596d524e5
|
@ -8,7 +8,7 @@ import (
|
||||||
"C"
|
"C"
|
||||||
|
|
||||||
"github.com/cjbassi/gotop/src/utils"
|
"github.com/cjbassi/gotop/src/utils"
|
||||||
}
|
)
|
||||||
|
|
||||||
type TemperatureStat struct {
|
type TemperatureStat struct {
|
||||||
SensorKey string `json:"sensorKey"`
|
SensorKey string `json:"sensorKey"`
|
||||||
|
@ -16,37 +16,38 @@ type TemperatureStat struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func SensorsTemperatures() ([]TemperatureStat, error) {
|
func SensorsTemperatures() ([]TemperatureStat, error) {
|
||||||
temperatureKeys := []string{
|
temperatureKeys := map[string]string{
|
||||||
C.AMBIENT_AIR_0,
|
C.AMBIENT_AIR_0: "ambient_air_0",
|
||||||
C.AMBIENT_AIR_1,
|
C.AMBIENT_AIR_1: "ambient_air_1",
|
||||||
C.CPU_0_DIODE,
|
C.CPU_0_DIODE: "cpu_0_diode",
|
||||||
C.CPU_0_HEATSINK,
|
C.CPU_0_HEATSINK: "cpu_0_heatsink",
|
||||||
C.CPU_0_PROXIMITY,
|
C.CPU_0_PROXIMITY: "cpu_0_proximity",
|
||||||
C.ENCLOSURE_BASE_0,
|
C.ENCLOSURE_BASE_0: "enclosure_base_0",
|
||||||
C.ENCLOSURE_BASE_1,
|
C.ENCLOSURE_BASE_1: "enclosure_base_1",
|
||||||
C.ENCLOSURE_BASE_2,
|
C.ENCLOSURE_BASE_2: "enclosure_base_2",
|
||||||
C.ENCLOSURE_BASE_3,
|
C.ENCLOSURE_BASE_3: "enclosure_base_3",
|
||||||
C.GPU_0_DIODE,
|
C.GPU_0_DIODE: "gpu_0_diode",
|
||||||
C.GPU_0_HEATSINK,
|
C.GPU_0_HEATSINK: "gpu_0_heatsink",
|
||||||
C.GPU_0_PROXIMITY,
|
C.GPU_0_PROXIMITY: "gpu_0_proximity",
|
||||||
C.HARD_DRIVE_BAY,
|
C.HARD_DRIVE_BAY: "hard_drive_bay",
|
||||||
C.MEMORY_SLOT_0,
|
C.MEMORY_SLOT_0: "memory_slot_0",
|
||||||
C.MEMORY_SLOTS_PROXIMITY,
|
C.MEMORY_SLOTS_PROXIMITY: "memory_slots_proximity",
|
||||||
C.NORTHBRIDGE,
|
C.NORTHBRIDGE: "northbridge",
|
||||||
C.NORTHBRIDGE_DIODE,
|
C.NORTHBRIDGE_DIODE: "northbridge_diode",
|
||||||
C.NORTHBRIDGE_PROXIMITY,
|
C.NORTHBRIDGE_PROXIMITY: "northbridge_proximity",
|
||||||
C.THUNDERBOLT_0,
|
C.THUNDERBOLT_0: "thunderbolt_0",
|
||||||
C.THUNDERBOLT_1,
|
C.THUNDERBOLT_1: "thunderbolt_1",
|
||||||
C.WIRELESS_MODULE,
|
C.WIRELESS_MODULE: "wireless_module",
|
||||||
}
|
}
|
||||||
|
|
||||||
var temperatures []TemperatureStat
|
var temperatures []TemperatureStat
|
||||||
|
|
||||||
C.open_smc()
|
C.open_smc()
|
||||||
defer C.close_smc()
|
defer C.close_smc()
|
||||||
|
|
||||||
for _, key := range temperatureKeys {
|
for key, val := range temperatureKeys {
|
||||||
temperatures = append(temperatures, TemperatureStat{
|
temperatures = append(temperatures, TemperatureStat{
|
||||||
SensorKey: key,
|
SensorKey: val,
|
||||||
Temperature: float64(C.get_tmp(C.CString(key), C.CELSIUS)),
|
Temperature: float64(C.get_tmp(C.CString(key), C.CELSIUS)),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue