ManuelW/OctoPrint-MyStromSwitch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: ManuelW:master
Branches Tags
ManuelW:master
ManuelW:Beta
ManuelW:1.2.0
ManuelW:1.1.0
ManuelW:1.0.4
ManuelW:1.0.3
ManuelW:1.0.1
ManuelW:1.0.0
ManuelW:0.4.0
ManuelW:0.3.0
ManuelW:0.2.0
ManuelW:0.1.0
..
compare: ManuelW:1.1.0
Branches Tags
ManuelW:Beta
ManuelW:master
ManuelW:1.2.0
ManuelW:1.1.0
ManuelW:1.0.4
ManuelW:1.0.3
ManuelW:1.0.1
ManuelW:1.0.0
ManuelW:0.4.0
ManuelW:0.3.0
ManuelW:0.2.0
ManuelW:0.1.0

No commits in common. "master" and "1.1.0" have entirely different histories.
master ... 1.1.0

4 changed files with 30 additions and 33 deletions
Show Stats Expand all files Collapse all files

50
.idea/workspace.xml generated
View File

@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7e2e0eec-b22e-4d48-8f24-196d1ed9b51a" name="Default Changelist" comment=""> <list default="true" id="7e2e0eec-b22e-4d48-8f24-196d1ed9b51a" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -47,6 +47,27 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1574193087583</updated> <updated>1574193087583</updated>
</task> </task>
<task id="LOCAL-00053" summary="#17 Logging zur Fehleranalyse eingebaut">
<created>1578938604039</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1578938604039</updated>
</task>
<task id="LOCAL-00054" summary="#17 Logging zur Fehleranalyse eingebaut">
<created>1578939868815</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1578939868816</updated>
</task>
<task id="LOCAL-00055" summary="#17 Logging zur Fehleranalyse eingebaut">
<created>1578940345174</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1578940345174</updated>
</task>
<task id="LOCAL-00056" summary="#17 Logging zur Fehleranalyse eingebaut"> <task id="LOCAL-00056" summary="#17 Logging zur Fehleranalyse eingebaut">
<created>1578941071143</created> <created>1578941071143</created>
<option name="number" value="00056" /> <option name="number" value="00056" />
@ -369,28 +390,7 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1593631764282</updated> <updated>1593631764282</updated>
</task> </task>
<task id="LOCAL-00102" summary="#24 API Token Support"> <option name="localTasksCounter" value="102" />
<created>1593632006106</created>
<option name="number" value="00102" />
<option name="presentableId" value="LOCAL-00102" />
<option name="project" value="LOCAL" />
<updated>1593632006106</updated>
</task>
<task id="LOCAL-00103" summary="#25 Python 3 Compatibility">
<created>1593633576198</created>
<option name="number" value="00103" />
<option name="presentableId" value="LOCAL-00103" />
<option name="project" value="LOCAL" />
<updated>1593633576198</updated>
</task>
<task id="LOCAL-00104" summary="#25 Python 3 Compatibility">
<created>1593633696895</created>
<option name="number" value="00104" />
<option name="presentableId" value="LOCAL-00104" />
<option name="project" value="LOCAL" />
<updated>1593633696895</updated>
</task>
<option name="localTasksCounter" value="105" />
<servers /> <servers />
</component> </component>
<component name="UnknownFeatures"> <component name="UnknownFeatures">
@ -420,6 +420,7 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="#5 Rest Api integration&#10;&#10;- Nullpointer fix" />
<MESSAGE value="#6 UI Updates senden und anzeigen&#10;&#10;- unnötigen Code entfernen, erster Versuch" /> <MESSAGE value="#6 UI Updates senden und anzeigen&#10;&#10;- unnötigen Code entfernen, erster Versuch" />
<MESSAGE value="Revert &quot;#6 UI Updates senden und anzeigen&quot;&#10;&#10;This reverts commit f83d4259" /> <MESSAGE value="Revert &quot;#6 UI Updates senden und anzeigen&quot;&#10;&#10;This reverts commit f83d4259" />
<MESSAGE value="#6 UI Updates senden und anzeigen" /> <MESSAGE value="#6 UI Updates senden und anzeigen" />
@ -444,7 +445,6 @@
<MESSAGE value="#22 Button taucht nicht auf&#10;&#10;Fehler anzeigen wenn Verbindung zu switch nicht klappt" /> <MESSAGE value="#22 Button taucht nicht auf&#10;&#10;Fehler anzeigen wenn Verbindung zu switch nicht klappt" />
<MESSAGE value="#21 Add PowerOFF when print is finished" /> <MESSAGE value="#21 Add PowerOFF when print is finished" />
<MESSAGE value="#24 API Token Support" /> <MESSAGE value="#24 API Token Support" />
<MESSAGE value="#25 Python 3 Compatibility" /> <option name="LAST_COMMIT_MESSAGE" value="#24 API Token Support" />
<option name="LAST_COMMIT_MESSAGE" value="#25 Python 3 Compatibility" />
</component> </component>
</project> </project>

3
octoprint_mystromswitch/__init__.py
View File

@ -168,7 +168,7 @@ class MyStromSwitchPlugin(octoprint.plugin.SettingsPlugin,
self._logger.info("Shutting down system with command: {command}".format(command=shutdown_command)) self._logger.info("Shutting down system with command: {command}".format(command=shutdown_command))
try: try:
import sarge import sarge
p = sarge.run(shutdown_command, async_=True) p = sarge.run(shutdown_command, async=True)
except Exception as e: except Exception as e:
self._logger.exception("Error when shutting down: {error}".format(error=e)) self._logger.exception("Error when shutting down: {error}".format(error=e))
return return
@ -429,7 +429,6 @@ class MyStromSwitchPlugin(octoprint.plugin.SettingsPlugin,
__plugin_name__ = "MyStrom Switch" __plugin_name__ = "MyStrom Switch"
__plugin_pythoncompat__ = ">=2.7,<4"
def __plugin_load__(): def __plugin_load__():

4
octoprint_mystromswitch/templates/mystromswitch_sidebar.jinja2
View File

@ -4,11 +4,11 @@
<button class="btn btn-primary" data-bind="click: onToggleRelayEvent, visible : onOffButtonEnabled">{{ _('Toggle Relais') }}</button> <button class="btn btn-primary" data-bind="click: onToggleRelayEvent, visible : onOffButtonEnabled">{{ _('Toggle Relais') }}</button>
<label class="checkbox" data-bind="visible :showShutdownOctopiOption"> <label class="checkbox" data-bind="visible :showShutdownOctopiOption">
<input type="checkbox" data-bind="enable: loginState.isUser(), checked: automaticShutdownEnabled, visible :showShutdownOctopiOption"> <input type="checkbox" data-bind="enable: loginState.isUser(), checked: automaticShutdownEnabled, visible :showShutdownOctopiOption">
{{ _('Shutdown Octoprint after print finished') }} {{ _('Shutdown Octoprint after print finishes') }}
</label> </label>
<label class="checkbox" data-bind="visible: showPowerOffPrintFinishOption"> <label class="checkbox" data-bind="visible: showPowerOffPrintFinishOption">
<input type="checkbox" data-bind="enable: loginState.isUser(), checked: automaticPowerOffEnabled, visible: showPowerOffPrintFinishOption"> <input type="checkbox" data-bind="enable: loginState.isUser(), checked: automaticPowerOffEnabled, visible: showPowerOffPrintFinishOption">
{{ _('Power Off Relais after print finished') }} {{ _('Power Off Relais after print finishes') }}
</label> </label>
</div> </div>

6
setup.py
View File

@ -14,7 +14,7 @@ plugin_package = "octoprint_mystromswitch"
plugin_name = "OctoPrint-MyStromSwitch" plugin_name = "OctoPrint-MyStromSwitch"
# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
plugin_version = "1.2.0" plugin_version = "1.1.0"
# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
# module # module
@ -57,9 +57,7 @@ plugin_ignored_packages = []
# Example: # Example:
# plugin_requires = ["someDependency==dev"] # plugin_requires = ["someDependency==dev"]
# additional_setup_parameters = {"dependency_links": ["https://github.com/someUser/someRepo/archive/master.zip#egg=someDependency-dev"]} # additional_setup_parameters = {"dependency_links": ["https://github.com/someUser/someRepo/archive/master.zip#egg=someDependency-dev"]}
additional_setup_parameters = { additional_setup_parameters = {}
"use_2to3": True,
}
######################################################################################################################## ########################################################################################################################