Skip to content

Commit

Permalink
Merge pull request #81 from borisbu/develop
Browse files Browse the repository at this point in the history
Releasing 1.4.2
  • Loading branch information
RobinTail authored Jul 20, 2023
2 parents b7a6f3b + b27ab83 commit 0189809
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Version 1

### 1.4.2

- Fixed `height` property of the icons in the initial config.

### 1.4.1

- Fixed issue with turning relays ON when start printing.
Expand Down
12 changes: 6 additions & 6 deletions octoprint_octorelay/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def get_settings_defaults(self):
initial_value=False,
cmdON="",
cmdOFF="",
iconOn="""<img src="/plugin/octorelay/static/img/3d-printer.png" highth="24" width="24">""",
iconOff="""<img src="/plugin/octorelay/static/img/3d-printer.png" highth="24" width="24" style="filter: opacity(20%)">""",
iconOn="""<img src="/plugin/octorelay/static/img/3d-printer.png" height="24" width="24">""",
iconOff="""<img src="/plugin/octorelay/static/img/3d-printer.png" height="24" width="24" style="filter: opacity(20%)">""",
labelText="Printer",
confirmOff=True,
autoONforPrint=False,
Expand All @@ -65,8 +65,8 @@ def get_settings_defaults(self):
initial_value=False,
cmdON="",
cmdOFF="",
iconOn="""<img highth="24" width="24" src="/plugin/octorelay/static/img/fan-24.png" >""",
iconOff="""<img highth="24" width="24" src="/plugin/octorelay/static/img/fan-24.png" style="filter: opacity(20%)">""",
iconOn="""<img height="24" width="24" src="/plugin/octorelay/static/img/fan-24.png" >""",
iconOff="""<img height="24" width="24" src="/plugin/octorelay/static/img/fan-24.png" style="filter: opacity(20%)">""",
labelText="Fan",
confirmOff=False,
autoONforPrint=True,
Expand All @@ -80,8 +80,8 @@ def get_settings_defaults(self):
initial_value=True,
cmdON="sudo service webcamd start",
cmdOFF="sudo service webcamd stop",
iconOn="""<img highth="24" width="24" src="/plugin/octorelay/static/img/webcam.png" >""",
iconOff="""<img highth="24" width="24" src="/plugin/octorelay/static/img/webcam.png" style="filter: opacity(20%)">""",
iconOn="""<img height="24" width="24" src="/plugin/octorelay/static/img/webcam.png" >""",
iconOff="""<img height="24" width="24" src="/plugin/octorelay/static/img/webcam.png" style="filter: opacity(20%)">""",
labelText="Webcam",
confirmOff=False,
autoONforPrint=True,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
plugin_name = "OctoRelay"

# The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
plugin_version = "1.4.1"
plugin_version = "1.4.2"

# The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
# module
Expand Down

0 comments on commit 0189809

Please sign in to comment.