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

Compare commits

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

No commits in common. "d101053188e9a18f05407a48864f7312e3dd4093" and "0d83d14329e60a4adf7b76d40b023dec0998cc9e" have entirely different histories.
d101053188 ... 0d83d14329

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

64
pkg/device/device_test.go
View File

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

14
pkg/device/settings.go
View File

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