Skip to content

Added support for OpenEVSE 'disabled' state #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpalo wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Added support for OpenEVSE 'disabled' state #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1148694
Add support for OpenEVSE Disabled mode
jpalo Jan 4, 2020
73611f8
Remove extra spaces
jpalo Jan 7, 2020
dbc4d77
Fix turning Smart after Disabled
jpalo Jan 7, 2020
e2109a9
Fix typo
jpalo Jan 7, 2020
43a101d
Revert correct update_interval
jpalo Jan 7, 2020
ce1b627
Merge branch 'user_timezone' into disabled
jpalo Jan 7, 2020
9d78a7a
Add support for OpenEVSE Disabled mode
jpalo Jan 4, 2020
043966d
Remove extra spaces
jpalo Jan 7, 2020
d7e2a8b
Fix turning Smart after Disabled
jpalo Jan 7, 2020
0bf7d46
Fix typo
jpalo Jan 7, 2020
f3ddc8d
Revert correct update_interval
jpalo Jan 7, 2020
3e5cf02
Merge branch 'disabled' of https://github.com/jpalo/demandshaper into…
jpalo Jan 8, 2020
c905ac6
Merge pull request #4 from emoncms/master
jpalo Feb 3, 2020
898e92c
Merge pull request #5 from emoncms/master
jpalo Feb 5, 2020
17ac647
Merge branch 'master' into disabled
jpalo Feb 11, 2020
922f3ee
Add support for EV charging state (2)
jpalo Feb 11, 2020
eca7b21
Remove unused setting of ctrlmode_status as it is only used with Open…
jpalo Feb 11, 2020
748ad93
Merge branch 'master' into disabled
jpalo Apr 23, 2020
5ee9989
Update so support latest changes in master
jpalo Apr 23, 2020
8e9b5d6
Merge pull request #11 from emoncms/master
jpalo Aug 6, 2020
746468a
Merge branch 'master' into disabled
jpalo Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion demandshaper-module/demandshaper_controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,14 @@ function demandshaper_controller()
$state->ctrl_mode = "timer";
}
}
else if ($ret[1]==1 || $ret[1]==3) {
else if ($ret[1]==1 || $ret[1]==2 || $ret[1]==3) {
if ($state->timer_start1==0 && $state->timer_stop1==0) {
$state->ctrl_mode = "on";
} else {
$state->ctrl_mode = "timer";
}
} else if ($ret[1]==255) {
$state->ctrl_mode = "disabled";
}
} else {
$valid = false;
Expand Down
8 changes: 8 additions & 0 deletions demandshaper-module/general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ function load_device(device_id, device_name, device_type)
// $(".device-name").html(" ("+device_name+")");

$(".node-scheduler").attr("node",device_name);

if (device_type=="openevse") {
$("#mode button[mode='disabled']").show();
}

// -------------------------------------------------------------------------
// Defaults
Expand Down Expand Up @@ -243,6 +247,7 @@ function load_device(device_id, device_name, device_type)
if (schedule.settings.ctrlmode=="smart") { $(".smart").show(); $(".timer").hide(); $(".repeat").show(); }
if (schedule.settings.ctrlmode=="on") { $(".smart").hide(); $(".timer").hide(); $(".repeat").hide(); }
if (schedule.settings.ctrlmode=="off") { $(".smart").hide(); $(".timer").hide(); $(".repeat").hide(); }
if (schedule.settings.ctrlmode=="disabled") { $(".smart").hide(); $(".timer").hide(); $(".repeat").hide(); }

// var elapsed = Math.round((new Date()).getTime()*0.001 - schedule.settings.last_update_from_device);
// $("#last_update_from_device").html(elapsed+"s ago");
Expand Down Expand Up @@ -645,6 +650,9 @@ function load_device(device_id, device_name, device_type)
case "off":
$(this).addClass("red").siblings().removeClass('red').removeClass('green');
break;
case "disabled":
$(this).addClass("red").siblings().removeClass('red').removeClass('green');
break;
case "timer":
// if (schedule.settings.period==0) schedule.settings.period = last_period;
// if (schedule.settings.end==0) schedule.settings.end = 8.0;
Expand Down
2 changes: 1 addition & 1 deletion demandshaper-module/general.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- CONTROLS -->
<!---------------------------------------------------------------------------------------------------------------------------->
<div id="mode" class="btn-group">
<button mode="on">On</button><button mode="off">Off</button><button mode="smart" class="active">Smart</button><button mode="timer">Timer</button>
<button mode="on">On</button><button mode="off">Off</button><button mode="disabled" style="display:none">Disabled</button><button mode="smart" class="active">Smart</button><button mode="timer">Timer</button>
</div><br><br>

<div class="openevse hide">
Expand Down
13 changes: 12 additions & 1 deletion demandshaper_run.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@

if ($schedule->settings->ctrlmode=="on") $status = 1;
if ($schedule->settings->ctrlmode=="off") $status = 0;
if ($schedule->settings->ctrlmode=="disabled") $status = -1;

if ($status) {
$log->info(" status: ON");
Expand Down Expand Up @@ -283,6 +284,9 @@
$timer[$device] = time_conv_dec_str($s1)." ".time_conv_dec_str($e1)." ".time_conv_dec_str($s2)." ".time_conv_dec_str($e2);
}
if ($device_type=="openevse") {
// in case it was disabled before
$mqtt_client->publish("$basetopic/$device/rapi/in/\$FE","",0);

$api = "rapi/in/\$ST";
$timer[$device] = time_conv_dec_str($s1," ")." ".time_conv_dec_str($e1," ");
}
Expand All @@ -303,14 +307,15 @@
if ($ctrlmode=="on") $ctrlmode_status = "On";
if ($ctrlmode=="smart") $ctrlmode_status = "Timer";
if ($ctrlmode=="timer") $ctrlmode_status = "Timer";
if ($ctrlmode=="disabled") $ctrlmode_status = "Disabled";

if ($device_type=="smartplug" || $device_type=="hpmon" || $device_type=="wifirelay") {
$mqtt_client->publish("$basetopic/$device/in/ctrlmode",$ctrlmode_status,0);
schedule_log("$device set ctrlmode $ctrlmode_status");
}

if ($device_type=="openevse") {
if ($ctrlmode=="on" || $ctrlmode=="off") {
if ($ctrlmode=="on" || $ctrlmode=="off" || $ctrlmode=="disabled") {
$mqtt_client->publish("$basetopic/$device/rapi/in/\$ST","00 00 00 00",0);
}
if ($ctrlmode=="on") {
Expand All @@ -321,6 +326,10 @@
$mqtt_client->publish("$basetopic/$device/rapi/in/\$FS","",0);
schedule_log("$device turning OFF");
}
if ($ctrlmode=="disabled") {
$mqtt_client->publish("emon/$device/rapi/in/\$FD","",0);
schedule_log("$device turning DISABLED");
}
}
}
$last_ctrlmode[$device] = $ctrlmode;
Expand Down Expand Up @@ -523,6 +532,7 @@ function message($message)
if (isset($p->ctrlmode)) {
if ($p->ctrlmode=="On") $schedules->$device->settings->ctrlmode = "on";
if ($p->ctrlmode=="Off") $schedules->$device->settings->ctrlmode = "off";
if ($p->ctrlmode=="Disabled") $schedules->$device->settings->ctrlmode = "disabled";
if ($p->ctrlmode=="Timer" && $schedules->$device->settings->ctrlmode!="smart") $schedules->$device->settings->ctrlmode = "timer";
}

Expand All @@ -545,6 +555,7 @@ function message($message)
else if ($message->topic=="$basetopic/$device/out/ctrlmode") {
if ($p=="On") $schedules->$device->settings->ctrlmode = "on";
if ($p=="Off") $schedules->$device->settings->ctrlmode = "off";
if ($p=="Disabled") $schedules->$device->settings->ctrlmode = "disabled";
if ($p=="Timer" && $schedules->$device->settings->ctrlmode!="smart") $schedules->$device->settings->ctrlmode = "timer";
$demandshaper->set($userid,$schedules);
}
Expand Down