Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
xyzaxyz committed Apr 29, 2017
2 parents a7964b1 + c85c613 commit 89a918d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
3 changes: 2 additions & 1 deletion octoprint_finetunerptr/static/css/style.css
Expand Up @@ -77,7 +77,8 @@
.finetunerptr_dropdown {
position: absolute;
top: 100%;
left: -100%;
right: 10px;
/*left: -100%;*/
/*position: fixed;
top: 5%;
left: 38%;*/
Expand Down
5 changes: 0 additions & 5 deletions octoprint_finetunerptr/static/js/finetunerptr.js
Expand Up @@ -23,8 +23,6 @@

/*
TODO:
- //Kategorie "Other" für nicht erkannte einrichten
- //Add Extruder+HeatBed Category
- Export/Import Full EEPROM compatible for Repetier Host
- Settings hier abspeichern http://docs.octoprint.org/en/master/plugins/mixins.html#settingsplugin
statt localStorage
Expand All @@ -33,8 +31,6 @@
- Wenn EEPROM geladen wird, werden Favoriten angezeigt und in ihrer normalen Kategorie
sind die Einträge noch vorhanden.
Wenn man wieder lädt, verschwinden die Einträge aus den ursprünglichen Kategorien.
- Mobile wird das onclick auf dem btn nicht richtig ausgeführt,
Load/Save EEPROM Buttons erscheinen nicht.
*/

$(function() {
Expand Down Expand Up @@ -183,7 +179,6 @@ $(function() {
for (let j in self.categorizedEeprom()[i].EEPROM_Values()) {
var valObj = self.categorizedEeprom()[i].EEPROM_Values()[j];
if (valObj.origValue !== valObj.value) {
// console.log("Change detected: ", valObj.value, valObj.origValue, valObj, i, j);
self._requestSaveDataToEeprom(valObj.dataType, valObj.position, valObj.value);
valObj.origValue = valObj.value;
}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -14,7 +14,7 @@
plugin_name = "Octoprint_FineTuneRptr"

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

# 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 89a918d

Please sign in to comment.