citadel/heater
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: citadel:0d83d14329e60a4adf7b76d40b023dec0998cc9e
Branches Tags
citadel:master
...
compare: citadel:d101053188e9a18f05407a48864f7312e3dd4093
Branches Tags
citadel:master

3 Commits
0d83d14329 ... d101053188

Author SHA1 Message Date
Nicolas Duhamel
d101053188 code lint 2022-11-02 08:21:08 +01:00
Nicolas Duhamel
ee87938c93 Fix program setpoint not updated 2022-11-02 08:10:31 +01:00
Nicolas Duhamel
4c290b0467 some code lint 2022-11-02 08:03:12 +01:00
3 changed files with 125 additions and 132 deletions
Show Stats Expand all files Collapse all files

41
pkg/device/device.go
View File

@ -25,8 +25,8 @@ type DeviceState struct {
Mode string `json:"mode"` Mode string `json:"mode"`
Setpoint int `json:"setpoint"` Setpoint int `json:"setpoint"`
Time time.Time `json:"time"` Time time.Time `json:"time"`
Program_name string `json:"program_name"` ProgramName string `json:"program_name"`
Until_time time.Time `json:"until_time"` UntilTime time.Time `json:"until_time"`
} }
func (s *DeviceState) Equivalent(state DeviceState) bool { func (s *DeviceState) Equivalent(state DeviceState) bool {
@ -50,11 +50,11 @@ func (s *DeviceState) Equivalent(state DeviceState) bool {
if state.Setpoint != s.Setpoint { if state.Setpoint != s.Setpoint {
return false return false
} }
if !state.Until_time.Equal(s.Until_time) { if !state.UntilTime.Equal(s.UntilTime) {
return false return false
} }
case "program": case "program":
if state.Program_name != s.Program_name { if state.ProgramName != s.ProgramName {
return false return false
} }
} }
@ -81,8 +81,8 @@ func (d Device) ListenTopic() (string, error) {
func (d *Device) Program() (WeekProgram, error) { func (d *Device) Program() (WeekProgram, error) {
// return current device program if specified or default one // return current device program if specified or default one
prog_name := "default" prog_name := "default"
if d.State.Program_name != "" { if d.State.ProgramName != "" {
prog_name = d.State.Program_name prog_name = d.State.ProgramName
} }
program, ok := d.Settings.Programs[prog_name] program, ok := d.Settings.Programs[prog_name]
@ -94,11 +94,10 @@ func (d *Device) Program() (WeekProgram, error) {
} }
func (d *Device) ProgramName() string { func (d *Device) ProgramName() string {
prog_name := "default" if d.State.ProgramName != "" {
if d.State.Program_name != "" { return d.State.ProgramName
prog_name = d.State.Program_name
} }
return prog_name return "default"
} }
func (d *Device) publishState(pubchan chan Message) error { func (d *Device) publishState(pubchan chan Message) error {
@ -152,11 +151,7 @@ func (d *Device) SetState(log *zerolog.Logger, state DeviceState, pubchan chan M
return err return err
} }
if err := d.publishState(pubchan); err != nil { return d.publishState(pubchan)
return err
}
return nil
} }
func (d *Device) CheckSetpoint(log *zerolog.Logger, pubchan chan Message) error { func (d *Device) CheckSetpoint(log *zerolog.Logger, pubchan chan Message) error {
@ -166,9 +161,7 @@ func (d *Device) CheckSetpoint(log *zerolog.Logger, pubchan chan Message) error
} }
if change { if change {
if err := d.publishState(pubchan); err != nil { return d.publishState(pubchan)
return err
}
} }
return nil return nil
@ -182,7 +175,7 @@ func (d *Device) update(log *zerolog.Logger, pubchan chan Message) (bool, error)
Int("current_setpoint", d.CurrentSetpoint). Int("current_setpoint", d.CurrentSetpoint).
Str("State.Mode", d.State.Mode). Str("State.Mode", d.State.Mode).
Int("State.Setpoint", d.State.Setpoint). Int("State.Setpoint", d.State.Setpoint).
Str("State.Program_name", d.State.Program_name). Str("State.Program_name", d.State.ProgramName).
Logger() Logger()
log.Debug().Msg("check if setpoint need an update") log.Debug().Msg("check if setpoint need an update")
@ -254,7 +247,7 @@ func (d *Device) handle_reset_state(log *zerolog.Logger, pubchan chan Message) (
d.State = DeviceState{ d.State = DeviceState{
Setpoint: value, Setpoint: value,
Mode: "program", Mode: "program",
Program_name: d.ProgramName(), ProgramName: d.ProgramName(),
Time: timeNow(), Time: timeNow(),
} }
@ -284,9 +277,9 @@ func (d *Device) handle_always(log *zerolog.Logger, pubchan chan Message) (bool,
} }
func (d *Device) handle_until_time(log *zerolog.Logger, pubchan chan Message) (bool, error) { func (d *Device) handle_until_time(log *zerolog.Logger, pubchan chan Message) (bool, error) {
*log = log.With().Time("until_time", d.State.Until_time).Logger() *log = log.With().Time("until_time", d.State.UntilTime).Logger()
if d.State.Until_time.Before(timeNow()) { if d.State.UntilTime.Before(timeNow()) {
log.Info().Msg("until_time passed, reset") log.Info().Msg("until_time passed, reset")
return d.handle_reset_state(log, pubchan) return d.handle_reset_state(log, pubchan)
} }
@ -336,7 +329,7 @@ func (d *Device) handle_until_next(log *zerolog.Logger, pubchan chan Message) (b
} }
func (d *Device) handle_program(log *zerolog.Logger, pubchan chan Message) (bool, error) { func (d *Device) handle_program(log *zerolog.Logger, pubchan chan Message) (bool, error) {
*log = log.With().Str("program", d.State.Program_name).Logger() *log = log.With().Str("program", d.State.ProgramName).Logger()
program, err := d.Program() program, err := d.Program()
if err != nil { if err != nil {
@ -349,13 +342,13 @@ func (d *Device) handle_program(log *zerolog.Logger, pubchan chan Message) (bool
if err != nil { if err != nil {
return false, err return false, err
} }
d.State.Setpoint = value
if d.CurrentSetpoint != value { if d.CurrentSetpoint != value {
log.Info().Msg("publish setpoint update") log.Info().Msg("publish setpoint update")
if err := d.SetSetpoint(value, pubchan); err != nil { if err := d.SetSetpoint(value, pubchan); err != nil {
return false, err return false, err
} }
d.State.Setpoint = value
return true, nil return true, nil
} }

64
pkg/device/device_test.go
View File

@ -51,7 +51,7 @@ var test_device = Device{
Mode: "program", Mode: "program",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Program_name: "default", ProgramName: "default",
}, },
} }
@ -67,7 +67,7 @@ func TestStateEquivalent(t *testing.T) {
Mode: "program", Mode: "program",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Program_name: "default", ProgramName: "default",
}, },
DeviceState{ DeviceState{
Mode: "always", Mode: "always",
@ -81,13 +81,13 @@ func TestStateEquivalent(t *testing.T) {
Mode: "program", Mode: "program",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Program_name: "default", ProgramName: "default",
}, },
DeviceState{ DeviceState{
Mode: "program", Mode: "program",
Setpoint: 14, Setpoint: 14,
Time: test_time.Add(1 * time.Minute), Time: test_time.Add(1 * time.Minute),
Program_name: "default", ProgramName: "default",
}, },
false, false,
}, },
@ -96,13 +96,13 @@ func TestStateEquivalent(t *testing.T) {
Mode: "program", Mode: "program",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Program_name: "default", ProgramName: "default",
}, },
DeviceState{ DeviceState{
Mode: "program", Mode: "program",
Setpoint: 13, Setpoint: 13,
Time: test_time, Time: test_time,
Program_name: "default", ProgramName: "default",
}, },
true, true,
}, },
@ -111,13 +111,13 @@ func TestStateEquivalent(t *testing.T) {
Mode: "program", Mode: "program",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Program_name: "default", ProgramName: "default",
}, },
DeviceState{ DeviceState{
Mode: "program", Mode: "program",
Setpoint: 13, Setpoint: 13,
Time: test_time, Time: test_time,
Program_name: "other", ProgramName: "other",
}, },
false, false,
}, },
@ -131,8 +131,8 @@ func TestStateEquivalent(t *testing.T) {
Mode: "always", Mode: "always",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Program_name: "other", ProgramName: "other",
Until_time: test_time, UntilTime: test_time,
}, },
true, true,
}, },
@ -146,8 +146,8 @@ func TestStateEquivalent(t *testing.T) {
Mode: "always", Mode: "always",
Setpoint: 15, Setpoint: 15,
Time: test_time, Time: test_time,
Program_name: "other", ProgramName: "other",
Until_time: test_time, UntilTime: test_time,
}, },
false, false,
}, },
@ -161,8 +161,8 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_next", Mode: "until_next",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Program_name: "other", ProgramName: "other",
Until_time: test_time, UntilTime: test_time,
}, },
true, true,
}, },
@ -176,8 +176,8 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_next", Mode: "until_next",
Setpoint: 13, Setpoint: 13,
Time: test_time, Time: test_time,
Program_name: "other", ProgramName: "other",
Until_time: test_time, UntilTime: test_time,
}, },
false, false,
}, },
@ -186,14 +186,14 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_time", Mode: "until_time",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Until_time: test_time.Add(1 * time.Hour), UntilTime: test_time.Add(1 * time.Hour),
}, },
DeviceState{ DeviceState{
Mode: "until_time", Mode: "until_time",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Program_name: "other", ProgramName: "other",
Until_time: test_time.Add(1 * time.Hour), UntilTime: test_time.Add(1 * time.Hour),
}, },
true, true,
}, },
@ -202,14 +202,14 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_time", Mode: "until_time",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Until_time: test_time.Add(1 * time.Hour), UntilTime: test_time.Add(1 * time.Hour),
}, },
DeviceState{ DeviceState{
Mode: "until_time", Mode: "until_time",
Setpoint: 13, Setpoint: 13,
Time: test_time, Time: test_time,
Program_name: "other", ProgramName: "other",
Until_time: test_time.Add(1 * time.Hour), UntilTime: test_time.Add(1 * time.Hour),
}, },
false, false,
}, },
@ -218,14 +218,14 @@ func TestStateEquivalent(t *testing.T) {
Mode: "until_time", Mode: "until_time",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Until_time: test_time.Add(1 * time.Hour), UntilTime: test_time.Add(1 * time.Hour),
}, },
DeviceState{ DeviceState{
Mode: "until_time", Mode: "until_time",
Setpoint: 14, Setpoint: 14,
Time: test_time, Time: test_time,
Program_name: "other", ProgramName: "other",
Until_time: test_time.Add(2 * time.Hour), UntilTime: test_time.Add(2 * time.Hour),
}, },
false, false,
}, },
@ -262,7 +262,7 @@ func TestListenTopic(t *testing.T) {
func TestProgram(t *testing.T) { func TestProgram(t *testing.T) {
//case 1: no program set in state return default //case 1: no program set in state return default
case1_device := test_device case1_device := test_device
case1_device.State.Program_name = "" case1_device.State.ProgramName = ""
//case 2: program set "confort" must return it //case 2: program set "confort" must return it
var test_confort_weekprogram = WeekProgram{ var test_confort_weekprogram = WeekProgram{
@ -279,11 +279,11 @@ func TestProgram(t *testing.T) {
"default": test_weekprogram, "default": test_weekprogram,
"confort": test_confort_weekprogram, "confort": test_confort_weekprogram,
} }
case2_device.State.Program_name = "confort" case2_device.State.ProgramName = "confort"
//case 3: program set "confort" but not exist //case 3: program set "confort" but not exist
case3_device := test_device case3_device := test_device
case3_device.State.Program_name = "confort" case3_device.State.ProgramName = "confort"
var tests = []struct { var tests = []struct {
name string name string
@ -327,12 +327,12 @@ func TestUpdate(t *testing.T) {
Mode: "program", Mode: "program",
Setpoint: 0, Setpoint: 0,
Time: test_time, Time: test_time,
Program_name: "", ProgramName: "",
} }
device2 := test_device device2 := test_device
device2.Name = "2" device2.Name = "2"
device2.State.Program_name = "unknown" device2.State.ProgramName = "unknown"
device3 := test_device device3 := test_device
device3.Name = "3" device3.Name = "3"
@ -348,7 +348,7 @@ func TestUpdate(t *testing.T) {
Mode: "until_time", Mode: "until_time",
Setpoint: 22, Setpoint: 22,
Time: timeNow(), Time: timeNow(),
Until_time: timeNow().Add(2 * time.Hour), UntilTime: timeNow().Add(2 * time.Hour),
} }
device5 := test_device device5 := test_device
@ -358,7 +358,7 @@ func TestUpdate(t *testing.T) {
Mode: "until_time", Mode: "until_time",
Setpoint: 22, Setpoint: 22,
Time: timeNow().Add(-2 * time.Hour), Time: timeNow().Add(-2 * time.Hour),
Until_time: timeNow().Add(-1 * time.Minute), UntilTime: timeNow().Add(-1 * time.Minute),
} }
device6 := test_device device6 := test_device

14
pkg/device/settings.go
View File

@ -34,13 +34,13 @@ func (d DayOfWeek) DaysBetween(n DayOfWeek) int {
} }
const ( const (
Monday DayOfWeek = 0 Monday DayOfWeek = iota
Thuesday DayOfWeek = 1 Thuesday
Wednesday DayOfWeek = 2 Wednesday
Thursday DayOfWeek = 3 Thursday
Friday DayOfWeek = 4 Friday
Saturday DayOfWeek = 5 Saturday
Sunday DayOfWeek = 6 Sunday
) )
func WeekDayEnToFr(weekday time.Weekday) DayOfWeek { func WeekDayEnToFr(weekday time.Weekday) DayOfWeek {