Browse Source

added support for the UltiController

Bernhard 13 years ago
parent
commit
464b755918
2 changed files with 22 additions and 5 deletions
  1. 10
    1
      Marlin/Configuration.h
  2. 12
    4
      Marlin/pins.h

+ 10
- 1
Marlin/Configuration.h View File

196
 //#define ULTRA_LCD  //general lcd support, also 16x2
196
 //#define ULTRA_LCD  //general lcd support, also 16x2
197
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
197
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
198
 
198
 
199
-#define ULTIPANEL
199
+//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
200
+//#define ULTIPANEL  //the ultipanel as on thingiverse
201
+
202
+
203
+#ifdef ULTIMAKERCONTROLLER    //automatic expansion
204
+ #define ULTIPANEL
205
+ #define NEWPANEL
206
+#endif 
207
+ 
208
+
200
 #ifdef ULTIPANEL
209
 #ifdef ULTIPANEL
201
 //  #define NEWPANEL  //enable this if you have a click-encoder panel
210
 //  #define NEWPANEL  //enable this if you have a click-encoder panel
202
   #define SDSUPPORT
211
   #define SDSUPPORT

+ 12
- 4
Marlin/pins.h View File

729
     #define LCD_PINS_D7 19
729
     #define LCD_PINS_D7 19
730
     
730
     
731
     //encoder rotation values
731
     //encoder rotation values
732
-    #define encrot0 0
733
-    #define encrot1 2
734
-    #define encrot2 3
735
-    #define encrot3 1
732
+    #ifndef ULTIMAKERCONTROLLER
733
+     #define encrot0 0
734
+     #define encrot1 2
735
+     #define encrot2 3
736
+     #define encrot3 1
737
+    #else
738
+     #define encrot0 0
739
+     #define encrot1 1
740
+     #define encrot2 3
741
+     #define encrot3 2
742
+
743
+    #endif
736
 
744
 
737
     #define SDCARDDETECT -1
745
     #define SDCARDDETECT -1
738
     //bits in the shift register that carry the buttons for:
746
     //bits in the shift register that carry the buttons for:

Loading…
Cancel
Save