Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
23021e2
Merge pull request #1 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 21, 2021
a5cdf57
Merge pull request #2 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 23, 2021
c632f12
Merge pull request #3 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 27, 2021
751676e
Merge pull request #4 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 28, 2021
c5f2515
Merge pull request #5 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 29, 2021
ccfcc2e
Add support mini12864 v3 for e3p board
mks-viva Jul 29, 2021
54916c2
Update pins_MKS_ROBIN_E3P.h
mks-viva Jul 29, 2021
12a95be
Tweak formatting
thinkyhead Jul 29, 2021
1114e86
Merge pull request #6 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 29, 2021
45d9815
Add support MKS new board: MKS Monster8 V1.x
mks-viva Jul 29, 2021
e1447d8
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/22455
thinkyhead Jul 31, 2021
71b8828
Update stm32f4.ini
thinkyhead Jul 31, 2021
6c8b634
apply formatter
thinkyhead Jul 31, 2021
a169e63
Merge pull request #7 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 31, 2021
88c3407
Merge pull request #8 from MarlinFirmware/bugfix-2.0.x
mks-viva Jul 31, 2021
e30f40d
Merge pull request #9 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 2, 2021
3e16bde
Merge pull request #10 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 6, 2021
7b7c1f7
Add support MKS PWC function in configuration
mks-viva Aug 6, 2021
1d77003
mks pwc function
mks-viva Aug 6, 2021
3c3f792
Update Configuration.h
mks-viva Aug 6, 2021
0d20548
Update pins_MKS_MONSTER8.h
mks-viva Aug 6, 2021
744b65a
Update pins_MKS_ROBIN_NANO_V3.h
mks-viva Aug 6, 2021
a7c2ef6
Update Configuration.h
mks-viva Aug 6, 2021
86915fc
Enforce MKS_PWC with sanity check
thinkyhead Aug 6, 2021
9b68967
Replace MKS_PWC/MKSPWC with PSU_CONTROL
thinkyhead Aug 6, 2021
f8a2118
cleanup
thinkyhead Aug 7, 2021
a9229d6
Merge pull request #11 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 9, 2021
08c5f40
Merge pull request #12 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 10, 2021
cc7ba24
Merge pull request #13 from MarlinFirmware/bugfix-2.0.x
mks-viva Aug 19, 2021
cc88536
Merge pull request #14 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 1, 2021
879fff5
Merge pull request #15 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 3, 2021
ff6818f
Merge pull request #16 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 6, 2021
96a69e5
Merge pull request #17 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 11, 2021
6441480
Support MKS Robin Nano V1.3 F4(include Nano V1.3 and Nano-S V1.3)
mks-viva Sep 11, 2021
7e25c22
cleanup
thinkyhead Sep 13, 2021
ea295b1
Combine common pins
thinkyhead Sep 13, 2021
8a43bed
Merge pull request #18 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 15, 2021
e5ac3da
Fix MKS Monster8 use eeprom the board restart issues
mks-viva Sep 15, 2021
2fc2230
Update stm32f4.ini
thinkyhead Sep 15, 2021
a9adffd
Merge pull request #19 from MarlinFirmware/bugfix-2.0.x
mks-viva Sep 23, 2021
1ef32f3
Merge pull request #20 from MarlinFirmware/bugfix-2.0.x
mks-viva Oct 6, 2021
368ec71
Add mks eagle board
mks-viva Oct 6, 2021
36a51b7
update mks eagle and monster8 env
mks-viva Oct 6, 2021
be90830
Update stm32f4.ini
mks-viva Oct 6, 2021
265b83c
Update stm32f4.ini
mks-viva Oct 6, 2021
fc11a74
Update pins_MKS_EAGLE.h
thinkyhead Oct 9, 2021
03d6d8f
Update pins_MKS_ROBIN_NANO_V3_common.h
thinkyhead Oct 9, 2021
f3946d6
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into mks_viva_po…
thinkyhead Oct 9, 2021
c017435
Merge remote-tracking branch 'mks-viva/bugfix-2.0.x' into mks_viva_po…
thinkyhead Oct 9, 2021
f590484
Merge 'upstream/bugfix-2.0.x' into pr/22897
thinkyhead Oct 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Marlin/src/core/boards.h
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@
#define BOARD_TH3D_EZBOARD_LITE_V2 4232 // TH3D EZBoard Lite v2.0
#define BOARD_INDEX_REV03 4233 // Index PnP Controller REV03 (STM32F407VET6/VGT6)
#define BOARD_MKS_ROBIN_NANO_V1_3_F4 4234 // MKS Robin Nano V1.3 and MKS Robin Nano-S V1.3 (STM32F407VET6)
#define BOARD_MKS_EAGLE 4235 // MKS Eagle (STM32F407VET6)

//
// ARM Cortex M7
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/pins/pins.h
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,8 @@
#include "stm32f4/pins_INDEX_REV03.h" // STM32F4 env:Index_Mobo_Rev03
#elif MB(MKS_ROBIN_NANO_V1_3_F4)
#include "stm32f4/pins_MKS_ROBIN_NANO_V1_3_F4.h" // STM32F4 env:mks_robin_nano_v1_3_f4
#elif MB(MKS_EAGLE)
#include "stm32f4/pins_MKS_EAGLE.h" // STM32F4 env:mks_eagle

//
// ARM Cortex M7
Expand Down
35 changes: 35 additions & 0 deletions Marlin/src/pins/stm32f4/pins_MKS_EAGLE.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#pragma once

#define ALLOW_STM32DUINO
#include "env_validate.h"

#if HOTENDS > 2 || E_STEPPERS > 2
#error "MKS Eagle supports up to 2 hotends / E-steppers."
#elif HAS_FSMC_TFT
#error "MKS Eagle doesn't support FSMC-based TFT displays."
#endif

#define BOARD_INFO_NAME "MKS Eagle"

#include "pins_MKS_ROBIN_NANO_V3_common.h"
Loading