Skip to content

Commit

Permalink
upgrade marlinslider graphics
Browse files Browse the repository at this point in the history
  • Loading branch information
CmdrCody51 committed Mar 5, 2024
1 parent 9ab7cb8 commit 8b816f1
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 38 deletions.
34 changes: 6 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,30 +1,20 @@
GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.0)
activesupport (7.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
afm (0.2.2)
async (2.6.3)
console (~> 1.10)
fiber-annotation
io-event (~> 1.1)
timers (~> 4.1)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
commonmarker (0.23.10)
concurrent-ruby (1.2.2)
console (1.21.0)
fiber-annotation
fiber-local
dnsruby (1.70.0)
simpleidn (~> 0.2.1)
em-websocket (0.5.3)
Expand All @@ -39,8 +29,6 @@ GEM
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
ffi (1.15.5)
fiber-annotation (0.2.0)
fiber-local (1.0.0)
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (228)
Expand Down Expand Up @@ -94,23 +82,21 @@ GEM
octokit (~> 4.0)
public_suffix (>= 3.0, < 5.0)
typhoeus (~> 1.3)
hashery (2.1.2)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
html-proofer (5.0.8)
html-proofer (4.4.3)
addressable (~> 2.3)
async (~> 2.1)
mercenary (~> 0.3)
nokogiri (~> 1.13)
pdf-reader (~> 2.11)
parallel (~> 1.10)
rainbow (~> 3.0)
typhoeus (~> 1.3)
yell (~> 2.0)
zeitwerk (~> 2.5)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
io-event (1.2.3)
jekyll (3.9.3)
addressable (~> 2.4)
colorator (~> 1.0)
Expand Down Expand Up @@ -236,21 +222,16 @@ GEM
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.19.0)
nokogiri (1.16.2-x86_64-linux)
nokogiri (1.15.5-x86_64-linux)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
oj (3.15.1)
optimist (3.1.0)
parallel (1.24.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pdf-reader (2.11.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
ttfunk
public_suffix (4.0.7)
racc (1.7.3)
rainbow (3.1.1)
Expand All @@ -259,7 +240,6 @@ GEM
ffi (~> 1.0)
rexml (3.2.6)
rouge (3.26.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
safe_yaml (1.0.5)
Expand All @@ -275,8 +255,6 @@ GEM
unf (~> 0.1.4)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
timers (4.3.5)
ttfunk (1.7.0)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (2.0.6)
Expand All @@ -299,4 +277,4 @@ DEPENDENCIES
webrick (~> 1.7)

BUNDLED WITH
2.4.10
2.4.13
26 changes: 16 additions & 10 deletions _plugins/marlinslider.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,35 @@ tags:
- UI
- Controls

screenshots:
- url: /assets/img/plugins/marlinslider/slider-tools.png
alt: MarlinSlider Control tab with Tools
caption: Control tab view of MarlonSlider using multiple tools
- url: /assets/img/plugins/marlinslider/settings.png
alt: Settings for MarlinSlider usage
caption: MarlinSlider settings

featuredimage: /assets/img/plugins/marlinslider/slider-tools.png

compatibility:

octoprint:
- 1.4.0

python: ">=3,<4"

featuredimage: /assets/img/plugins/marlinslider/slider-tools.png

---

Adds sliders to the controls page for setting the speed of your fans, feedrate and flowrate.
With a settings page that allows limiting the fan's output power and min/max feedrates and flowrates.

See the web page for more detailed information.

![screenshot](/assets/img/plugins/marlinslider/slider-tools.png)

![screenshot](/assets/img/plugins/marlinslider/settings.png)

NOTE: When you are printing from an SD card that is attached directly to the printer, NONE of this works as the gcode does not pass through OctoPrint.

If you experience issues with this plugin or need assistance please use the issue tracker at the plugin's Homepage linked on the right.

Check out my other plugins [here](https://plugins.octoprint.org/by_author/#CmdrCody51)

I, CmdrCody51, programmed this plugin for fun and do my best effort to support those that have issues with it, please return the favor
and leave me a tip or become a Patron if you find this plugin helpful and want me to continue future development.

[![Ko-Fi](/assets/img/plugins/marlinslider/Ko-fi_Donate.png)](https://ko-fi.com/cmdrcody) or [![GitHub](/assets/img/plugins/marlinslider/github-mark-small.png)](https://github.com/CmdrCody51/OctoPrint-MarlinSlider)Use GitHub!

<small>You can also send funds via PayPal to cmdrcody&#64;pharowt&#46;com</small>
Binary file added assets/img/plugins/marlinslider/Ko-fi_Donate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/plugins/marlinslider/slider-tools.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8b816f1

Please sign in to comment.