ソースを参照

ADIMLab Granty v1 / v2 (#15017)

* # This is a combination of 18 commits.
# This is the 1st commit message:

Add Support for ADIMLab Granty

# The commit message #2 will be skipped:

# Update Configuration.h

# The commit message #3 will be skipped:

# Add files via upload
#
# Add Support for ADIMLab Granty

# The commit message #4 will be skipped:

# Create Configuration.h

# The commit message #5 will be skipped:

# Delete Configuration.h

# The commit message #6 will be skipped:

# Create Test.h

# The commit message #7 will be skipped:

# Add files via upload

# The commit message #8 will be skipped:

# Delete Test.h

# The commit message #9 will be skipped:

# Delete Configuration.h

# The commit message #10 will be skipped:

# Delete Configuration_adv.h

# The commit message #11 will be skipped:

# Add files via upload
#
# Add ADIMLab Pins

# The commit message #12 will be skipped:

# Add files via upload
#
# Add Bootscreen

# The commit message #13 will be skipped:

# Update Configuration.h
#
# Add Bootscreen

# The commit message #14 will be skipped:

# Update pins.h
#
# Add ADIMLab Board

# The commit message #15 will be skipped:

# Update boards.h
#
# Add ADIMLab Granty

# The commit message #16 will be skipped:

# Update Makefile
#
# Add ADIMLab Granty

# The commit message #17 will be skipped:

# Update boards.h

# The commit message #18 will be skipped:

# Update Makefile

* Add Support for ADIMLab Granty

* Optimize bootscreen

* Update Makefile

Updated Description

* Update boards.h

Updated Description

* Update pins_HJC2560C_REV2.h

Updated Description

* Update Configuration.h

Added Author + Custom_Machine_Name

* Create _Bootscreen.h

Add Bootscreen

* Add files via upload

Add ADIMLab Granty v1

* Update boards.h

Add ADIMLab Granty v1

* Update Makefile

Add ADIMLab Granty v1

* Update pins_HJC2560C_REV2.h

* Consolidate Granty configs

* config updates
Scott Lahteine 5年前
コミット
20fc66f875
コミッターのメールアドレスに関連付けられたアカウントが存在しません

+ 3
- 1
Marlin/Makefile ファイルの表示

@@ -251,8 +251,10 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1141)
251 251
 else ifeq ($(HARDWARE_MOTHERBOARD),1142)
252 252
 # Overlord/Overlord Pro
253 253
 else ifeq ($(HARDWARE_MOTHERBOARD),1143)
254
-# ADIMLab Granty
254
+# ADIMLab Granty v1
255 255
 else ifeq ($(HARDWARE_MOTHERBOARD),1144)
256
+# ADIMLab Granty v2
257
+else ifeq ($(HARDWARE_MOTHERBOARD),1145)
256 258
 
257 259
 #
258 260
 # RAMBo and derivatives

+ 2
- 1
Marlin/src/core/boards.h ファイルの表示

@@ -95,7 +95,8 @@
95 95
 #define BOARD_Z_BOLT_X_SERIES         1141  // Z-Bolt X Series
96 96
 #define BOARD_TT_OSCAR                1142  // TT OSCAR
97 97
 #define BOARD_OVERLORD                1143  // Overlord/Overlord Pro
98
-#define BOARD_HJC2560C_REV2           1144  // ADIMLab Granty
98
+#define BOARD_HJC2560C_REV1           1144  // ADIMLab Granty v1
99
+#define BOARD_HJC2560C_REV2           1145  // ADIMLab Granty v2
99 100
 
100 101
 //
101 102
 // RAMBo and derivatives

+ 1
- 1
Marlin/src/pins/mega/pins_HJC2560C_REV2.h ファイルの表示

@@ -29,7 +29,7 @@
29 29
   #error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
30 30
 #endif
31 31
 
32
-#define DEFAULT_MACHINE_NAME "HCMaker7"
32
+#define DEFAULT_MACHINE_NAME "ADIMLab Granty v2"
33 33
 #define BOARD_INFO_NAME      "HJC2560-C"
34 34
 
35 35
 //

+ 2219
- 0
config/examples/ADIMLab/Granty v1/Configuration.h
ファイル差分が大きすぎるため省略します
ファイルの表示


+ 2643
- 0
config/examples/ADIMLab/Granty v1/Configuration_adv.h
ファイル差分が大きすぎるため省略します
ファイルの表示


config/examples/ADIMLab/Granty/Configuration.h → config/examples/ADIMLab/Granty v2/Configuration.h ファイルの表示

@@ -73,7 +73,7 @@
73 73
 // User-specified version info of this build to display in [Pronterface, etc] terminal window during
74 74
 // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
75 75
 // build by the user have been successfully uploaded into firmware.
76
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
76
+#define STRING_CONFIG_H_AUTHOR "(ETE-Design, Granty v2)" // Who made the changes.
77 77
 #define SHOW_BOOTSCREEN
78 78
 #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
79 79
 #define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
@@ -135,7 +135,7 @@
135 135
 #endif
136 136
 
137 137
 // Name displayed in the LCD "Ready" message and Info menu
138
-//#define CUSTOM_MACHINE_NAME "3D Printer"
138
+#define CUSTOM_MACHINE_NAME "ADIMLab Granty v2"
139 139
 
140 140
 // Printer's unique ID, used by some programs to differentiate between machines.
141 141
 // Choose your own or use a service like http://www.uuidgenerator.net/version4
@@ -359,6 +359,7 @@
359 359
  *    -1 : thermocouple with AD595
360 360
  *     0 : not used
361 361
  *     1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
362
+ *   331 : (3.3V scaled thermistor 1 table)
362 363
  *     2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
363 364
  *     3 : Mendel-parts thermistor (4.7k pullup)
364 365
  *     4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
@@ -402,7 +403,7 @@
402 403
  *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
403 404
  *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
404 405
  *
405
- * :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '512':"100k RPW-Ultra hotend thermistor", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950  1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '18':"ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327" '20':"Pt100 (Ultimainboard V2.x)", '201':"Pt100 (Overlord)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" }
406
+ * :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '331':"(3.3V thermistor 1)", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '512':"100k RPW-Ultra hotend thermistor", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950  1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '18':"ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327" '20':"Pt100 (Ultimainboard V2.x)", '201':"Pt100 (Overlord)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" }
406 407
  */
407 408
 #define TEMP_SENSOR_0 1
408 409
 #define TEMP_SENSOR_1 0
@@ -2035,6 +2036,12 @@
2035 2036
 //#define MALYAN_LCD
2036 2037
 
2037 2038
 //
2039
+// LulzBot Color Touch UI for FTDI EVE (FT800/FT810) displays
2040
+// See Configuration_adv.h for all configuration options.
2041
+//
2042
+//#define LULZBOT_TOUCH_UI
2043
+
2044
+//
2038 2045
 // Third-party or vendor-customized controller interfaces.
2039 2046
 // Sources should be installed in 'src/lcd/extensible_ui'.
2040 2047
 //

config/examples/ADIMLab/Granty/Configuration_adv.h → config/examples/ADIMLab/Granty v2/Configuration_adv.h ファイルの表示

@@ -279,9 +279,10 @@
279 279
  */
280 280
 //#define USE_CONTROLLER_FAN
281 281
 #if ENABLED(USE_CONTROLLER_FAN)
282
-  //#define CONTROLLER_FAN_PIN -1        // Set a custom pin for the controller fan
283
-  #define CONTROLLERFAN_SECS 60          // Duration in seconds for the fan to run after all motors are disabled
284
-  #define CONTROLLERFAN_SPEED 255        // 255 == full speed
282
+  //#define CONTROLLER_FAN_PIN -1           // Set a custom pin for the controller fan
283
+  #define CONTROLLERFAN_SECS 60             // Duration in seconds for the fan to run after all motors are disabled
284
+  #define CONTROLLERFAN_SPEED 255           // 255 == full speed
285
+  //#define CONTROLLERFAN_SPEED_Z_ONLY 127  // Reduce noise on machines that keep Z enabled
285 286
 #endif
286 287
 
287 288
 // When first starting the main fan, run it at full speed for the
@@ -657,10 +658,10 @@
657 658
   #endif
658 659
 #endif
659 660
 
660
-// @section extras
661
+// @section motion
661 662
 
662
-// minimum time in microseconds that a movement needs to take if the buffer is emptied.
663
-#define DEFAULT_MINSEGMENTTIME        20000
663
+// Minimum time that a segment needs to take if the buffer is emptied
664
+#define DEFAULT_MINSEGMENTTIME        20000   // (ms)
664 665
 
665 666
 // If defined the movements slow down when the look ahead buffer is only half full
666 667
 #define SLOWDOWN
@@ -850,11 +851,35 @@
850 851
   #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440
851 852
 #endif
852 853
 
853
-// Include a page of printer information in the LCD Main Menu
854
-//#define LCD_INFO_MENU
855
-#if ENABLED(LCD_INFO_MENU)
856
-  //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
857
-#endif
854
+#if HAS_LCD_MENU
855
+
856
+  // Include a page of printer information in the LCD Main Menu
857
+  //#define LCD_INFO_MENU
858
+  #if ENABLED(LCD_INFO_MENU)
859
+    //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
860
+  #endif
861
+
862
+  // BACK menu items keep the highlight at the top
863
+  //#define TURBO_BACK_MENU_ITEM
864
+
865
+  /**
866
+   * LED Control Menu
867
+   * Add LED Control to the LCD menu
868
+   */
869
+  //#define LED_CONTROL_MENU
870
+  #if ENABLED(LED_CONTROL_MENU)
871
+    #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
872
+    #if ENABLED(LED_COLOR_PRESETS)
873
+      #define LED_USER_PRESET_RED        255  // User defined RED value
874
+      #define LED_USER_PRESET_GREEN      128  // User defined GREEN value
875
+      #define LED_USER_PRESET_BLUE         0  // User defined BLUE value
876
+      #define LED_USER_PRESET_WHITE      255  // User defined WHITE value
877
+      #define LED_USER_PRESET_BRIGHTNESS 255  // User defined intensity
878
+      //#define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
879
+    #endif
880
+  #endif
881
+
882
+#endif // HAS_LCD_MENU
858 883
 
859 884
 // Scroll a longer status message into view
860 885
 //#define STATUS_MESSAGE_SCROLLING
@@ -879,23 +904,6 @@
879 904
   #endif
880 905
 #endif
881 906
 
882
-/**
883
- * LED Control Menu
884
- * Enable this feature to add LED Control to the LCD menu
885
- */
886
-//#define LED_CONTROL_MENU
887
-#if ENABLED(LED_CONTROL_MENU)
888
-  #define LED_COLOR_PRESETS                 // Enable the Preset Color menu option
889
-  #if ENABLED(LED_COLOR_PRESETS)
890
-    #define LED_USER_PRESET_RED        255  // User defined RED value
891
-    #define LED_USER_PRESET_GREEN      128  // User defined GREEN value
892
-    #define LED_USER_PRESET_BLUE         0  // User defined BLUE value
893
-    #define LED_USER_PRESET_WHITE      255  // User defined WHITE value
894
-    #define LED_USER_PRESET_BRIGHTNESS 255  // User defined intensity
895
-    //#define LED_USER_PRESET_STARTUP       // Have the printer display the user preset color on startup
896
-  #endif
897
-#endif // LED_CONTROL_MENU
898
-
899 907
 #if ENABLED(SDSUPPORT)
900 908
 
901 909
   // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
@@ -930,6 +938,7 @@
930 938
   #if ENABLED(POWER_LOSS_RECOVERY)
931 939
     //#define POWER_LOSS_PIN         44 // Pin to detect power loss
932 940
     //#define POWER_LOSS_STATE     HIGH // State of pin indicating power loss
941
+    //#define POWER_LOSS_PULL           // Set pullup / pulldown as appropriate
933 942
     //#define POWER_LOSS_PURGE_LEN   20 // (mm) Length of filament to purge on resume
934 943
     //#define POWER_LOSS_RETRACT_LEN 10 // (mm) Length of filament to retract on fail. Requires backup power.
935 944
 
@@ -1134,6 +1143,7 @@
1134 1143
   //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
1135 1144
   //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar
1136 1145
   //#define BOOT_MARLIN_LOGO_SMALL    // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash)
1146
+  //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM.
1137 1147
 
1138 1148
   // Frivolous Game Options
1139 1149
   //#define MARLIN_BRICKOUT
@@ -1143,6 +1153,53 @@
1143 1153
 
1144 1154
 #endif // HAS_GRAPHICAL_LCD
1145 1155
 
1156
+//
1157
+// Lulzbot Touch UI
1158
+//
1159
+#if ENABLED(LULZBOT_TOUCH_UI)
1160
+  // Display board used
1161
+  //#define LCD_FTDI_VM800B35A        // FTDI 3.5" with FT800 (320x240)
1162
+  //#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" (480x272)
1163
+  //#define LCD_HAOYU_FT800CB         // Haoyu with 4.3" or 5" (480x272)
1164
+  //#define LCD_HAOYU_FT810CB         // Haoyu with 5" (800x480)
1165
+  //#define LCD_ALEPHOBJECTS_CLCD_UI  // Aleph Objects Color LCD UI
1166
+
1167
+  // Correct the resolution if not using the stock TFT panel.
1168
+  //#define TOUCH_UI_320x240
1169
+  //#define TOUCH_UI_480x272
1170
+  //#define TOUCH_UI_800x480
1171
+
1172
+  // Mappings for boards with a standard RepRapDiscount Display connector
1173
+  //#define AO_EXP1_PINMAP    // AlephObjects CLCD UI EXP1 mapping
1174
+  //#define AO_EXP2_PINMAP    // AlephObjects CLCD UI EXP2 mapping
1175
+  //#define CR10_TFT_PINMAP   // Rudolph Riedel's CR10 pin mapping
1176
+  //#define OTHER_PIN_LAYOUT  // Define pins manually below
1177
+  #if ENABLED(OTHER_PIN_LAYOUT)
1178
+    // The pins for CS and MOD_RESET (PD) must be chosen.
1179
+    #define CLCD_MOD_RESET  9
1180
+    #define CLCD_SPI_CS    10
1181
+
1182
+    // If using software SPI, specify pins for SCLK, MOSI, MISO
1183
+    //#define CLCD_USE_SOFT_SPI
1184
+    #if ENABLED(CLCD_USE_SOFT_SPI)
1185
+      #define CLCD_SOFT_SPI_MOSI 11
1186
+      #define CLCD_SOFT_SPI_MISO 12
1187
+      #define CLCD_SOFT_SPI_SCLK 13
1188
+    #endif
1189
+  #endif
1190
+
1191
+  // Display Orientation. An inverted (i.e. upside-down) display
1192
+  // is supported on the FT800. The FT810 and beyond also support
1193
+  // portrait and mirrored orientations.
1194
+  //#define TOUCH_UI_INVERTED
1195
+  //#define TOUCH_UI_PORTRAIT
1196
+  //#define TOUCH_UI_MIRRORED
1197
+
1198
+  // Use a numeric passcode for "Screen lock" keypad.
1199
+  // (recommended for smaller displays)
1200
+  //#define TOUCH_UI_PASSCODE
1201
+#endif
1202
+
1146 1203
 // @section safety
1147 1204
 
1148 1205
 /**
@@ -2243,6 +2300,13 @@
2243 2300
 #define EXTENDED_CAPABILITIES_REPORT
2244 2301
 
2245 2302
 /**
2303
+ * Expected Printer Check
2304
+ * Add the M16 G-code to compare a string to the MACHINE_NAME.
2305
+ * M16 with a non-matching string causes the printer to halt.
2306
+ */
2307
+//#define EXPECTED_PRINTER_CHECK
2308
+
2309
+/**
2246 2310
  * Disable all Volumetric extrusion options
2247 2311
  */
2248 2312
 //#define NO_VOLUMETRICS
@@ -2297,6 +2361,13 @@
2297 2361
 #endif
2298 2362
 
2299 2363
 /**
2364
+ * Startup commands
2365
+ *
2366
+ * Execute certain G-code commands immediately after power-on.
2367
+ */
2368
+//#define STARTUP_COMMANDS "M17 Z"
2369
+
2370
+/**
2300 2371
  * G-code Macros
2301 2372
  *
2302 2373
  * Add G-codes M810-M819 to define and run G-code macros.

config/examples/ADIMLab/Granty/_Bootscreen.h → config/examples/ADIMLab/_Bootscreen.h ファイルの表示


読み込み中…
キャンセル
保存