Skip to content

Commit

Permalink
Merge pull request #70 from Qrome/2.4
Browse files Browse the repository at this point in the history
2.4
  • Loading branch information
Qrome authored Jan 18, 2019
2 parents a6154ba + b7e31ee commit 221c6f9
Show file tree
Hide file tree
Showing 9 changed files with 1,853 additions and 1,693 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ SOFTWARE.
* Supports OTA (loading firmware over WiFi connection on same LAN)
* Basic Authentication to protect your settings
* Version 2.2 added the ability to update firmware through web interface from a compiled binary
* Can query the Octoprint [PSU Control plugin](https://plugins.octoprint.org/plugins/psucontrol/) to enter clock or blank mode when PSU is off
* Video: https://youtu.be/niRv9SCgAPk
* Detailed build video by Chris Riley: https://youtu.be/Rm-l1FSuJpI

Expand Down Expand Up @@ -114,9 +115,10 @@ Please do not feel obligated, but donations and tips are warmly welcomed. I hav
[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6VPMTLASLSKWE)

## Contributors
David Payne
David Payne -- Principal developer and architect
Daniel Eichhorn -- Author of the TimeClient class and OLEDDisplayUi
Florian Schütte -- added flip display to web interface
Owen Carter -- Added psu control setting (v2.4)

Contributing to this software is warmly welcomed. You can do this basically by
forking from master, committing modifications and then making a pulling requests to be reviewed (follow the links above
Expand Down
Binary file added printermonitor.ino.d1_mini_SH1106-2.4.bin
Binary file not shown.
Binary file removed printermonitor.ino.d1_mini_SH1106.bin
Binary file not shown.
Binary file added printermonitor.ino.d1_mini_SSD1306-2.4.bin
Binary file not shown.
Binary file removed printermonitor.ino.d1_mini_SSD1306.bin
Binary file not shown.
Loading

0 comments on commit 221c6f9

Please sign in to comment.