Update

Author: usr577

octoprint_psucontrol_raspberrymatic/__init__.py

@@ -22,10 +22,10 @@ def __init__(self):
 
     def get_settings_defaults(self):
         return dict(
+            ip = 'None',
             onCommand = 'None',
             offCommand = 'None',
             senseCommand = 'None',
-            enableSensing = False,
         )
 
 
@@ -57,35 +57,35 @@ def on_startup(self, host, port):
         psucontrol_helpers['register_plugin'](self)
 
     def turn_psu_on(self):
-        if self.config['onCommand'] == 'None' or self.config['offCommand'] == 'None':
+        if self.config['onCommand'] == 'None' or self.config['offCommand'] == 'None' or self.config['ip'] == 'None':
             self._logger.warning("Switching is not enabled")
             return
         try:
-            requests.get(self.config['onCommand'])
+            requests.get(self.config['ip'] + self.config['onCommand'])
         except Exception:
             self._logger.exception("Exception while Switching")
 
 
 
 
     def turn_psu_off(self):
-        if self.config['offCommand'] == 'None' or self.config['onCommand'] == 'None':
+        if self.config['offCommand'] == 'None' or self.config['onCommand'] == 'None' or self.config['ip'] == 'None':
             self._logger.warning("Switching is not enabled")
             return
         try:
-            requests.get(self.config['offCommand'])
+            requests.get(self.config['ip'] + self.config['offCommand'])
         except Exception:
             self._logger.exception("Exception while Switching")
 
 
     def get_psu_state(self):
-        if self.config['senseCommand'] == 'None':
+        if self.config['senseCommand'] == 'None' or self.config['ip'] == 'None':
             self._logger.warning("Sensing is not enabled")
             return 0
 
         r = 0
         try:
-            r = ET.fromstring(requests.get(self.config['senseCommand']).text).find("datapoint").get("value")
+            r = ET.fromstring(requests.get(self.config['ip'] + self.config['senseCommand']).text).find("datapoint").get("value")
         except Exception:
             self._logger.exception("Exception while reading State")
             return False

octoprint_psucontrol_raspberrymatic/templates/psucontrol_raspberrymatic_settings.jinja2

@@ -3,26 +3,33 @@
 <!-- /ko -->
 
 <form class="form-horizontal">
+    <h4>General</h4>
+    <div class="control-group">
+        <div class="controls">
+        <label class="control-label">HM-IP<br/><span class="help-inline">IP of raspberrymatic with "http(s)://"</span></label>
+            <input type="text" class="input-mini" data-bind="value: settings.plugins.psucontrol_raspberrymatic.ip"> <input type="checkbox" data-bind="checked: settings.plugins.psucontrol_raspberrymatic.enableSensing"> Enable
+        </div>
+    </div>
     <h4>Switching</h4>
     <div class="control-group">
         <label class="control-label">On Command<br/><span class="help-inline">None to disable</span></label>
         <div class="controls">
-            <input type="text" class="input-mini" data-bind="value: settings.plugins.psucontrol_raspberrymatic.onCommand">
+            <textarea rows="1" class="block" data-bind="value: settings.plugins.psucontrol_raspberrymatic.onCommand"></textarea>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label">Off Command<br/><span class="help-inline">None to disable</span></label>
         <div class="controls">
-            <input type="text" class="input-mini" data-bind="value: settings.plugins.psucontrol_raspberrymatic.offCommand">
+            <textarea rows="1" class="block" data-bind="value: settings.plugins.psucontrol_raspberrymatic.offCommand"></textarea>
         </div>
     </div>
     <br />
 
     <h4>Sensing</h4>
     <div class="control-group">
-        <label class="control-label">Pin<br/><span class="help-inline">Zero to disable</span></label>
         <div class="controls">
-            <input type="text" class="input-mini" data-bind="value: settings.plugins.psucontrol_raspberrymatic.sensingCommand"> <input type="checkbox" data-bind="checked: settings.plugins.psucontrol_raspberrymatic.enableSensing"> Enable
+            <label class="control-label">Sensing Command<br/><span class="help-inline">None to disable</span></label>
+            <input type="text" class="input-mini" data-bind="value: settings.plugins.psucontrol_raspberrymatic.sensingCommand">
         </div>
     </div>
 </form>