fix machine.ini write and flip endstop min/max

markwal · Jul 3, 2015 · b759587 · b759587
1 parent 2bba085
commit b759587
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/octoprint_GPX/__init__.py b/octoprint_GPX/__init__.py
@@ -125,7 +125,7 @@ def fetch_machine_ini(self, machineid):
 		profile_path = os.path.join(data_folder, machineid + ".ini")
 		from .iniparser import IniParser
 		machine_ini = IniParser(profile_path, self._logger)
-		if os.path.isdir(profile_folder) and os.path.exists(profile_path) and os.path.isfile(profile_path):
+		if os.path.isdir(data_folder) and os.path.exists(profile_path) and os.path.isfile(profile_path):
 			try:
 				machine_ini.read()
 				self._logger.info("Read machine definition from %s" % profile_path)

diff --git a/octoprint_GPX/templates/GPX_settings.jinja2 b/octoprint_GPX/templates/GPX_settings.jinja2
@@ -156,18 +156,18 @@
                     <td class="label-column text-right">{{ _('Home:') }}</td>
                     <td><select class="select-mini" data-bind="value: machine.x.endstop">
                         <option value="undefined">{{ _('') }}</option>
-                        <option value="1">{{ _('Min') }}</option>
-                        <option value="0">{{ _('Max') }}</option>
+                        <option value="0">{{ _('Min') }}</option>
+                        <option value="1">{{ _('Max') }}</option>
                     </select></td>
                     <td><select class="select-mini" data-bind="value: machine.y.endstop">
                         <option value="undefined">{{ _('') }}</option>
-                        <option value="1">{{ _('Min') }}</option>
-                        <option value="0">{{ _('Max') }}</option>
+                        <option value="0">{{ _('Min') }}</option>
+                        <option value="1">{{ _('Max') }}</option>
                     </select></td>
                     <td><select class="select-mini" data-bind="value: machine.z.endstop">
                         <option value="undefined">{{ _('') }}</option>
-                        <option value="1">{{ _('Min') }}</option>
-                        <option value="0">{{ _('Max') }}</option>
+                        <option value="0">{{ _('Min') }}</option>
+                        <option value="1">{{ _('Max') }}</option>
                     </select></td>
                 </tr>
             </table>