-
-
Notifications
You must be signed in to change notification settings - Fork 19.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add MKS Base 1.6 board #16783
Merged
thinkyhead
merged 1 commit into
MarlinFirmware:bugfix-2.0.x
from
thisiskeithb:pr/add_mks_base_16
Feb 5, 2020
Merged
Add MKS Base 1.6 board #16783
thinkyhead
merged 1 commit into
MarlinFirmware:bugfix-2.0.x
from
thisiskeithb:pr/add_mks_base_16
Feb 5, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Please consider this pins, as they are resolving in clear way potential conflicts with RAMPS definitions and add definition for second servo /**
* Marlin 3D Printer Firmware
* Copyright (c) 2020 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 <http://www.gnu.org/licenses/>.
*
*/
#pragma once
/**
* MKS BASE v1.6 with A4982 stepper drivers and digital micro-stepping
*/
#if HOTENDS > 2 || E_STEPPERS > 2
#error "MKS BASE 1.6 only supports up to 2 hotends / E-steppers. Comment out this line to continue."
#endif
#define BOARD_INFO_NAME "MKS BASE 1.6"
/**
* Microstepping pins
*/
#define X_MS1_PIN 5 // Digital 3 / Pin 5 / PE3
#define X_MS2_PIN 6 // Digital 6 / Pin 14 / PH3
#define Y_MS1_PIN 59 // Analog 5 / Pin 92 / PF5
#define Y_MS2_PIN 58 // Analog 4 / Pin 93 / PF4
#define Z_MS1_PIN 22 // Digital 22 / Pin 78 / PA0
#define Z_MS2_PIN 39 // Digital 39 / Pin 70 / PG2
#define E0_MS1_PIN 63 // Analog 9 / Pin 86 / PK1
#define E0_MS2_PIN 64 // Analog 10 / Pin 87 / PK2
#define E1_MS1_PIN 57 // Analog 3 / Pin 93 / PF3
#define E1_MS2_PIN 4 // Digital 4 / Pin 1 / PG5
/**
* Servos pins
*/
#define SERVO1_PIN 12 // Digital 12 / Pin 25
#ifndef SERVO2_PIN
#define SERVO2_PIN -1
#endif
#ifndef SERVO3_PIN
#define SERVO3_PIN -1
#endif
/**
* Heaters / Fans
*/
#define MOSFET_D_PIN 7
#ifndef FILWIDTH_PIN
#define FILWIDTH_PIN -1
#endif
#ifndef FIL_RUNOUT_PIN
#define FIL_RUNOUT_PIN -1
#endif
#ifndef PS_ON_PIN
#define PS_ON_PIN -1
#endif
#include "pins_RAMPS.h"
|
@DanielMazurkiewicz — Thanks for the post. Are Pull Requests not working for you? It's lucky your post didn't get lost, because we commonly ignore comments on merged PRs. |
@thinkyhead Here is the PR: #16806 |
StJa
added a commit
to StJa/Marlin
that referenced
this pull request
Mar 9, 2020
* Add sanity-check for new Advanced Pause option Followup to MarlinFirmware#16372 * Include macros for delta ABC * Update Russian language (MarlinFirmware#16745) * Fix BTT SKR 1.4 extra endstop pins (MarlinFirmware#16738) * Option for Trigorilla 1.4 with add-on endstops board (MarlinFirmware#16737) * Consistent M112 with Emergency Parser (MarlinFirmware#16747) * Improve mfadd helper script - Use the original branch name if none is supplied - Set the remote tracking to the source - Accept User/Branch or User:Branch syntax * Clean up i2c encoder, sanitize serial * Misc cleanup, whitespace * Encapsulate probe as singleton class (MarlinFirmware#16751) * G34 automatic point assignment (MarlinFirmware#16473) * Fix Temperature::over_autostart_threshold (MarlinFirmware#16749) * Update Russian language (MarlinFirmware#16750) * Fix CURRENT_STEP_DOWN compile error * Drop obsolete SD special char handling See MarlinFirmware#14035 * Probe singleton patch Followup to MarlinFirmware#16751 * Fix RGB / Neopixel white color bug See MarlinFirmware#16752 * Suppress a compile warning * More 8-extruder fixups * Add EXP labels to SKR pins * Fix LPC build with USE_WATCHDOG off * Minor string storage optimization * Apply REPEAT, RREPEAT, and loop macros (MarlinFirmware#16757) * Revert breaking change to _FAN_PWM macro * Add Z_AFTER_HOMING to raise Z more in G28 (MarlinFirmware#16755) * Corner Leveling: Add inset for each side (MarlinFirmware#16759) * (c) 2020 * Tweak mfqp script * Use a different Configurations branch for CI * Fix LCD Z Move character LCD display line (MarlinFirmware#16772) * Fix warning for ESP32 (MarlinFirmware#16771) * [cron] Bump distribution date * Force T0 in UBL G29 on all multi-hotend setups (MarlinFirmware#16774) * Keep secure credentials in a separate config file (MarlinFirmware#16773) * STM32duino - Use SDIO for onboard SD (MarlinFirmware#16756) * Fix E stepper stays on bug Fixes MarlinFirmware#16753 * Fix Arduino IDE compile for DUE Fixes MarlinFirmware#16767 * Fix CALIBRATION_GCODE pin handling * Upgrade an ifdef * More updates for 8 extruders, REPEAT * [cron] Bump distribution date (2020-02-05) * Add MKS Base 1.6 board (MarlinFirmware#16783) * Direct download link for configs * [cron] Bump distribution date (2020-02-06) * Split up MKS_RUMBA32 into two variants (MarlinFirmware#16781) * G26: Allow to set retraction for UBL mesh test (MarlinFirmware#16511) * Remove extraneous Serial init (MarlinFirmware#16794) * Fix probe with multi-endstops (MarlinFirmware#16793) * [cron] Bump distribution date (2020-02-07) * [cron] Bump distribution date (2020-02-08) * Clean up Makefle indentation * Add .editorconfig file * Tweak ABL logging, document probing * [cron] Bump distribution date (2020-02-09) * Coolstep for TMC2130, 2209, 5130, 5160 (MarlinFirmware#16790) * Better probe fail handling (MarlinFirmware#16811) * Adafruit Grand Central M4 fixes (MarlinFirmware#16812) * Minor HAL cleanup * Move MSG_MARLIN * Show print time with PRINTER_EVENT_LEDS * Tweak parser warning * Bump config version to 020004 (MarlinFirmware#16816) * Add PID, probe offsets to ExtUI (MarlinFirmware#16792) * [cron] Bump distribution date (2020-02-10) * Tweak LPC1768 upload py script * Add mftest -b (auto-build) and -u (upload) - Implement the equivalent of auto-build for the shell environment by using the MOTHERBOARD setting to look up the env: entries. * Revert change to AXIS_DRIVER_TYPE_X2 - Revisit this to figure out why it breaks * Revert "Coolstep for TMC2130, 2209, 5130, 5160" Reverting MarlinFirmware#16790 as not ready for primetime. * Add a caution to drivers.h * Update MKS BASE and v1.6 pins (MarlinFirmware#16806) * Add g-code quoted strings, improve stream code (MarlinFirmware#16818) * Fix out-of-order M0 after SD printing Fixes MarlinFirmware#14774 Co-Authored-By: tol2cj <[email protected]> * Fix out-of-order M0 after SD printing Fixes MarlinFirmware#14774 Co-Authored-By: tol2cj <[email protected]> * Enable hotend / bed PID separately in ExtUI (MarlinFirmware#16827) * Fix MKS Robin Nano platformio.ini entry (MarlinFirmware#16826) * Unify step pulse timing of ISR / babystep (MarlinFirmware#16813) * [cron] Bump distribution date (2020-02-11) * Update SAMD51 EEPROM repo link (MarlinFirmware#16832) * Undo driver type auto-assignment for now Good general concept but needs more time to develop and group with a stepper suite. * No Z sensorless req'd if homing with probe Fixes MarlinFirmware#16674 * Recommend Z Safe Homing Co-Authored-By: Vertabreaker <[email protected]> * Use prior babystep delay method (MarlinFirmware#16833) * Function-style critical section macros * Fix up tests * Simplify old safe homing sanity check * Prevent pin glitches on out commutation (MarlinFirmware#16835) Better for switching from pulled input to output and also set real output (with no input enabled). * [cron] Bump distribution date (2020-02-12) * Define MarlinSerial instances for DGUS (MarlinFirmware#16841) * No limit needed on this raise Remove an extraneous limit from MarlinFirmware#16811. * [cron] Bump distribution date (2020-02-13) * [cron] Bump distribution date (2020-02-14) * Fix G-code line parsing (MarlinFirmware#16840) * Ping the job timer in M140 (MarlinFirmware#16849) * Remove unused queue.stopped_N (MarlinFirmware#16850) * Don't assert safe homing for delta/scara * Fix ESP32 warning, specify supported version * Add ESPAsyncTCP to lib_ignore (MarlinFirmware#16844) * Add RAMPS 1.4.4 to AGCM4 (MarlinFirmware#16606) * Clean up host actions code (MarlinFirmware#16856) * Optimize "Dismiss" string * Clean up stepper and babystep (MarlinFirmware#16857) * Fysetc S6 pins / LCD updates (MarlinFirmware#16830) * [cron] Bump distribution date (2020-02-15) * Fix mftest -b and -u. Add --help. * Fix a BORG compile warning * Fix byte-to-percent display Fixes MarlinFirmware#16866 * Conceal float rounding errors on display Fix MarlinFirmware#16866 * [cron] Bump distribution date (2020-02-16) * Double ADC read frequency (MarlinFirmware#16864) * EXPERIMENTAL integrated BABYSTEPPING (MarlinFirmware#16829) * Show '*' for zero 'stst' flag * Require TMCStepper 0.6.2 * Defer updated ADC * Move SAMD51 Temperature timer to RTC (MarlinFirmware#16868) * Fix unknown command on empty lines (MarlinFirmware#16867) * Fix mftest -b -u line match * Update French language (MarlinFirmware#16877) * Put ESP32 I2S stepper task and Marlin on the same core (MarlinFirmware#16874) * Fix babystep include, typos in stepper.cpp Fix MarlinFirmware#16881 * [cron] Bump distribution date (2020-02-17) * [cron] Bump distribution date (2020-02-18) * [cron] Bump distribution date (2020-02-19) * [cron] Bump distribution date (2020-02-20) * Serial redirect for Move Command when stopping (MarlinFirmware#16906) * [cron] Bump distribution date (2020-02-21) * Single envs for specific boards * Inline manage_inactivity, tweak autoreport_paused * Function for CONFIG_ECHO_HEADING * Show end prompt with Print Event LEDs * Add a note on EEPROM todo * Tweak process_line_done for speed * More EEPROM cleanup * Followup to autoreport patch (MarlinFirmware#16914) See a1f026f * Disable spreadcycle in tmc_enable_stallguard<2209> (MarlinFirmware#16890) * Fix EEPROM errors with EXTRUDERS == 0 (MarlinFirmware#16898) * Add PICA shields support (MarlinFirmware#16891) * Tweak pins spacing, comments * Version 2.0.4 Release * [cron] Bump distribution date (2020-02-22) * Use moves_free in ok_to_send * Hotfix for Babystepping * CoreXY Babystepping hotfix * Use moves_free in ok_to_send * [cron] Bump distribution date (2020-02-22) * Hotfix for Babystepping * [ESP32] Allow user to define pins for hardware Serial1 and Serial2 (MarlinFirmware#16918) * CoreXY Babystepping hotfix * Version 2.0.4.1 Release * [cron] Bump distribution date (2020-02-23) * Finish Custom User Menu sanity-check (MarlinFirmware#16917) * Followup to babystep hotfix * Fix M0/M1 broken wait loop (MarlinFirmware#16921) * Define ANET_FULL_GRAPHICS_LCD pins for SKR 1.4 (MarlinFirmware#16928) * Version 2.0.4.2 Release * Suppress "packed member" warning * Suppress "packed member" warning * Commit last SD line before fileHasFinished * Allow LCD_PIXEL_WIDTH/HEIGHT override * Allow USE_GCODE_SUBCODES for debugging * Sync Italian language (MarlinFirmware#16935) * Reduce default TMC baudrate to 57600 with Software Serial (MarlinFirmware#16930) * [cron] Bump distribution date (2020-02-24) * Fix AXIS_HAS_SW_SERIAL * Simplified E_AXIS_HAS macro * "Init. Media" => "Attach Media" * Fix Babystepping loop (again) * BS_TOTAL_AXIS => BS_TOTAL_IND * Allow Z_SAFE_HOMING_POINT outside bed (MarlinFirmware#16945) * Restore tabs in Makefile (MarlinFirmware#16944) * Fix card_eof error * Version 2.0.4.3 Release * Allow Z_SAFE_HOMING_POINT outside bed (MarlinFirmware#16945) * Restore tabs in Makefile (MarlinFirmware#16944) * Fix card_eof error * [cron] Bump distribution date (2020-02-25) * Update POWER_LOSS_PIN comment (MarlinFirmware#16957) * Update Italian language (MarlinFirmware#16947) * Fix LCD cutter/bed icons overlapping (MarlinFirmware#16956) * Fix SKR 1.4 Turbo SD_DETECT_PIN (MarlinFirmware#16955) * Fix the wait loop in M0 / M1 * [cron] Bump distribution date (2020-02-26) * Ensure proper SD print completion (MarlinFirmware#16967) * HAS_SDCARD_CONNECTION is more obsolete * Fix GTR10 overlapping defines (MarlinFirmware#16976) * Toolchange improvements (MarlinFirmware#16979) * Language: "failsafe" => "Defaults" * Use a STR_ prefix for non-translated strings * Set LCD status for EEPROM errors (MarlinFirmware#16977) * More serial strings * Add LPC1768 Serial ports for pinsDebug (MarlinFirmware#16980) * Correct SKR expansion port pins (MarlinFirmware#16974) * String optimize followup * Fix Trinamic pulse rate auto-assignment (MarlinFirmware#16966) * Allow weird probe values in G33 * Serial strings in macros * Sanity check for LPC serial pin conflict (MarlinFirmware#16981) * Allow servo features in combination (MarlinFirmware#16960) * Add TRAVEL_EXTRA_XYJERK option See MarlinFirmware#16949 Co-Authored-By: josedpedroso <[email protected]> * Quick-homing sensorless back-off (MarlinFirmware#16872) * Prevent park_point compile error * More extra travel jerk changes Co-Authored-By: josedpedroso <[email protected]> * Fix unified status bed temp display * Allow print recovery after parking * Case-insensitive g-code option (MarlinFirmware#16932) * Define DIAG pins for MKS SGen-L * Handle print completed LED event in M0 * [cron] Bump distribution date (2020-02-27) * Fix planner.cpp compile (MarlinFirmware#16996) * Update Slovak language (MarlinFirmware#17002) * Version 2.0.4.4 Release Co-authored-by: Scott Lahteine <[email protected]> Co-authored-by: Acenotass <[email protected]> Co-authored-by: rebel1 <[email protected]> Co-authored-by: Jason Smith <[email protected]> Co-authored-by: Scott Lahteine <[email protected]> Co-authored-by: InsanityAutomation <[email protected]> Co-authored-by: ellensp <[email protected]> Co-authored-by: felixstorm <[email protected]> Co-authored-by: Bob Kuhn <[email protected]> Co-authored-by: thisiskeithb <[email protected]> Co-authored-by: Tanguy Pruvot <[email protected]> Co-authored-by: Robby Candra <[email protected]> Co-authored-by: Robert Stein <[email protected]> Co-authored-by: Fabio Santos <[email protected]> Co-authored-by: Giuliano Zaro <[email protected]> Co-authored-by: Daniel Mazurkiewicz <[email protected]> Co-authored-by: tol2cj <[email protected]> Co-authored-by: proferabg <[email protected]> Co-authored-by: darksiah <[email protected]> Co-authored-by: Vertabreaker <[email protected]> Co-authored-by: Gaston Dombiak <[email protected]> Co-authored-by: vivian-ng <[email protected]> Co-authored-by: George Fu <[email protected]> Co-authored-by: Karl Andersson <[email protected]> Co-authored-by: Jamie <[email protected]> Co-authored-by: ZMiguel Alves <[email protected]> Co-authored-by: Marcio T <[email protected]> Co-authored-by: josedpedroso <[email protected]> Co-authored-by: Makoto Schoppert <[email protected]> Co-authored-by: Roman Moravčík <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
#16764 requested MKS Base 1.6 support, which was pin compatible with the 1.5.
Benefits
Marlin will now report the correct board name.
Related Issues
#16764