Skip to content

Commit

Permalink
ADIMLab Granty v1 / v2 (MarlinFirmware#15017)
Browse files Browse the repository at this point in the history
* # 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

* 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
  • Loading branch information
thinkyhead authored Aug 24, 2019
2 parents 7502569 + 334777c commit 20fc66f
Show file tree
Hide file tree
Showing 8 changed files with 4,977 additions and 34 deletions.
4 changes: 3 additions & 1 deletion Marlin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,10 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1141)
else ifeq ($(HARDWARE_MOTHERBOARD),1142)
# Overlord/Overlord Pro
else ifeq ($(HARDWARE_MOTHERBOARD),1143)
# ADIMLab Granty
# ADIMLab Granty v1
else ifeq ($(HARDWARE_MOTHERBOARD),1144)
# ADIMLab Granty v2
else ifeq ($(HARDWARE_MOTHERBOARD),1145)

#
# RAMBo and derivatives
Expand Down
3 changes: 2 additions & 1 deletion Marlin/src/core/boards.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@
#define BOARD_Z_BOLT_X_SERIES 1141 // Z-Bolt X Series
#define BOARD_TT_OSCAR 1142 // TT OSCAR
#define BOARD_OVERLORD 1143 // Overlord/Overlord Pro
#define BOARD_HJC2560C_REV2 1144 // ADIMLab Granty
#define BOARD_HJC2560C_REV1 1144 // ADIMLab Granty v1
#define BOARD_HJC2560C_REV2 1145 // ADIMLab Granty v2

//
// RAMBo and derivatives
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/mega/pins_HJC2560C_REV2.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#error "Oops! Select 'Arduino/Genuino Mega or Mega 2560' in 'Tools > Board.'"
#endif

#define DEFAULT_MACHINE_NAME "HCMaker7"
#define DEFAULT_MACHINE_NAME "ADIMLab Granty v2"
#define BOARD_INFO_NAME "HJC2560-C"

//
Expand Down
Loading

0 comments on commit 20fc66f

Please sign in to comment.