Skip to content

Commit de122c9

Browse files
ETE-Designthinkyhead
authored andcommitted
# This is a combination of 18 commits.
# This is the 1st commit message: Add Support for ADIMLab Granty # The commit message MarlinFirmware#2 will be skipped: # Update Configuration.h # The commit message MarlinFirmware#3 will be skipped: # Add files via upload # # Add Support for ADIMLab Granty # The commit message MarlinFirmware#4 will be skipped: # Create Configuration.h # The commit message MarlinFirmware#5 will be skipped: # Delete Configuration.h # The commit message MarlinFirmware#6 will be skipped: # Create Test.h # The commit message MarlinFirmware#7 will be skipped: # Add files via upload # The commit message MarlinFirmware#8 will be skipped: # Delete Test.h # The commit message MarlinFirmware#9 will be skipped: # Delete Configuration.h # The commit message MarlinFirmware#10 will be skipped: # Delete Configuration_adv.h # The commit message MarlinFirmware#11 will be skipped: # Add files via upload # # Add ADIMLab Pins # The commit message MarlinFirmware#12 will be skipped: # Add files via upload # # Add Bootscreen # The commit message MarlinFirmware#13 will be skipped: # Update Configuration.h # # Add Bootscreen # The commit message MarlinFirmware#14 will be skipped: # Update pins.h # # Add ADIMLab Board # The commit message MarlinFirmware#15 will be skipped: # Update boards.h # # Add ADIMLab Granty # The commit message MarlinFirmware#16 will be skipped: # Update Makefile # # Add ADIMLab Granty # The commit message MarlinFirmware#17 will be skipped: # Update boards.h # The commit message MarlinFirmware#18 will be skipped: # Update Makefile
1 parent e7aba49 commit de122c9

File tree

7 files changed

+5056
-0
lines changed

7 files changed

+5056
-0
lines changed

Marlin/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1141)
251251
else ifeq ($(HARDWARE_MOTHERBOARD),1142)
252252
# Overlord/Overlord Pro
253253
else ifeq ($(HARDWARE_MOTHERBOARD),1143)
254+
# ADIMLab Granty
255+
else ifeq ($(HARDWARE_MOTHERBOARD),1144)
254256

255257
#
256258
# RAMBo and derivatives

Marlin/src/core/boards.h

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
#define BOARD_Z_BOLT_X_SERIES 1141 // Z-Bolt X Series
9696
#define BOARD_TT_OSCAR 1142 // TT OSCAR
9797
#define BOARD_OVERLORD 1143 // Overlord/Overlord Pro
98+
#define BOARD_HJC2560C_REV2 1144 // ADIMLab Granty
9899

99100
//
100101
// RAMBo and derivatives
+193
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
/**
2+
* Marlin 3D Printer Firmware
3+
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
20+
*
21+
*/
22+
23+
/**
24+
* HJC2560-C Rev2.x pin assignments
25+
*/
26+
27+
/**
28+
* Rev 2.x 2 Aug 2018
29+
*/
30+
31+
#ifndef __AVR_ATmega2560__
32+
#error "Oops! Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu."
33+
#endif
34+
35+
// BOARD Info
36+
#define DEFAULT_MACHINE_NAME "HCMaker7"
37+
#define BOARD_NAME "HJC2560-C"
38+
#define BOARD_REV "Rev: 2.1" //主板版本:Rev 2.1, Rs=0.05R
39+
#define R_SENSOR "R-sensor: R050" //检测电阻
40+
41+
// FIRMWARE Info
42+
#define FIRMWARE_NAME "Marlin 1-1-9"
43+
#define FIRMWARE_REV "Rev: 1.4" //固件版本:Rev 1.4
44+
45+
46+
//
47+
// Limit Switches
48+
//
49+
#define X_STOP_PIN 22
50+
#define Y_STOP_PIN 26
51+
#define Z_STOP_PIN 29
52+
#define EXP_STOP_PIN 28
53+
54+
//
55+
// Steppers
56+
//
57+
#define X_STEP_PIN 25
58+
#define X_DIR_PIN 23
59+
#define X_ENABLE_PIN 27
60+
61+
#define Y_STEP_PIN 32
62+
#define Y_DIR_PIN 33
63+
#define Y_ENABLE_PIN 31
64+
65+
#define Z_STEP_PIN 35
66+
#define Z_DIR_PIN 36
67+
#define Z_ENABLE_PIN 34
68+
69+
#define E0_STEP_PIN 42
70+
#define E0_DIR_PIN 43
71+
#define E0_ENABLE_PIN 37
72+
73+
#define E1_STEP_PIN 49
74+
#define E1_DIR_PIN 47
75+
#define E1_ENABLE_PIN 48
76+
77+
#define MOTOR_CURRENT_PWM_XY_PIN 44
78+
#define MOTOR_CURRENT_PWM_Z_PIN 45
79+
#define MOTOR_CURRENT_PWM_E_PIN 46
80+
// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
81+
#ifndef MOTOR_CURRENT_PWM_RANGE
82+
#define MOTOR_CURRENT_PWM_RANGE 2000
83+
#endif
84+
#define DEFAULT_PWM_MOTOR_CURRENT {1300, 1300, 1250}
85+
86+
//
87+
// Temperature Sensors
88+
//
89+
#define TEMP_0_PIN 8 // Analog Input
90+
#define TEMP_1_PIN 9 // Analog Input
91+
#define TEMP_BED_PIN 10 // Analog Input
92+
93+
//
94+
// Heaters / Fans
95+
//
96+
#define HEATER_0_PIN 2
97+
#define HEATER_1_PIN 3
98+
#define HEATER_BED_PIN 4
99+
100+
//#ifndef FAN_PIN
101+
#define FAN_PIN 7 //默认不使用PWM_FAN冷却喷嘴,如果需要,则取消注释
102+
//#endif
103+
104+
//
105+
// Misc. Functions
106+
//
107+
#define SDSS 53
108+
#define SD_DETECT_PIN 39
109+
//#define LED_PIN 8
110+
#define CASE_LIGHT_PIN 8 //8 默认挤出机风扇作为Case LED,如果需要PWM FAN,则需要将FAN_PIN置为7,LED_PIN置为8
111+
//#define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered
112+
//#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
113+
114+
//
115+
// LCD / Controller
116+
//
117+
#if ENABLED(ULTRA_LCD)
118+
119+
#define BEEPER_PIN 18
120+
121+
#if ENABLED(NEWPANEL)
122+
123+
#if ENABLED(HJC_LCD_SMART_CONTROLLER)
124+
#define LCD_PINS_RS 20 //LCD_CS
125+
#define LCD_PINS_ENABLE 15 //LCD_SDA
126+
#define LCD_PINS_D4 14 //LCD_SCK
127+
#define LCD_BACKLIGHT_PIN 5 //LCD_Backlight
128+
// #ifndef LCD_CONTRAST_PIN
129+
// #define LCD_CONTRAST_PIN 5 //LCD_Contrast
130+
// #endif
131+
// define digital pin 24 for the filament runout sensor.
132+
#ifndef FIL_RUNOUT_PIN
133+
#define FIL_RUNOUT_PIN 24 //Filament runout
134+
#endif
135+
#else
136+
#define LCD_PINS_RS 20 //LCD_CS
137+
#define LCD_PINS_ENABLE 15 //LCD_SDA
138+
#define LCD_PINS_D4 14 //LCD_SCK
139+
#define LCD_PINS_D5 21
140+
#define LCD_PINS_D6 5
141+
#define LCD_PINS_D7 6
142+
#endif
143+
144+
// buttons are directly attached
145+
#define BTN_EN1 41
146+
#define BTN_EN2 40
147+
#define BTN_ENC 19
148+
149+
#define SD_DETECT_PIN 39
150+
151+
#else // !NEWPANEL - Old style panel with shift register
152+
153+
// buttons are attached to a shift register
154+
#define SHIFT_CLK 38
155+
#define SHIFT_LD 42
156+
#define SHIFT_OUT 40
157+
#define SHIFT_EN 17
158+
159+
#define LCD_PINS_RS 16
160+
#define LCD_PINS_ENABLE 5
161+
#define LCD_PINS_D4 6
162+
#define LCD_PINS_D5 21
163+
#define LCD_PINS_D6 20
164+
#define LCD_PINS_D7 19
165+
166+
#define SD_DETECT_PIN -1
167+
168+
#endif // !NEWPANEL
169+
170+
#endif // ULTRA_LCD
171+
172+
173+
//
174+
// M3/M4/M5 - Spindle/Laser Control,默认,主轴/激光器使用独立的PWM引脚(D9)控制
175+
// 如果使用了PWM_FAN,Case_Light和Spindle/Laser, 并希望Spindle/Laser使用CASE_Light的线,则将
176+
//SPINDLE_LASER_PWM_PIN 定义为8
177+
//
178+
#if ENABLED(SPINDLE_LASER_ENABLE) // use the LED_PIN for spindle speed control or case light
179+
// #undef LED_PIN
180+
#define SPINDLE_DIR_PIN 16
181+
#define SPINDLE_LASER_ENABLE_PIN 17 // Pin should have a pullup!
182+
#define SPINDLE_LASER_PWM_PIN 9 // MUST BE HARDWARE PWM,
183+
//#else
184+
// #undef LED_PIN
185+
// #define CASE_LIGHT_PIN 7
186+
#endif
187+
188+
//
189+
// Servos
190+
//
191+
//#ifndef SERVO0_PIN
192+
// #define SERVO0_PIN 11
193+
//#endif

Marlin/src/pins/pins.h

+2
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@
236236
#include "mega/pins_WANHAO_ONEPLUS.h" // ATmega2560 env:megaatmega2560
237237
#elif MB(OVERLORD)
238238
#include "mega/pins_OVERLORD.h" // ATmega2560 env:megaatmega2560
239+
#elif MB(HJC2560C_REV2)
240+
#include "mega/pins_HJC2560C_REV2.h" // ATmega2560 env:megaatmega2560
239241

240242
//
241243
// ATmega1281, ATmega2561

0 commit comments

Comments
 (0)