Browse Source

[2.0.x] UltiMachine Archim2 (#8190)

* UltiMachine Archim2 support

* SPI gets included by the library

* Invert TMC2130 diag pin state

* Clean up Archim2 pins

* Update Archim2 config

* FAN2 -> FAN1

* Cleanup

* Add brief Archim installation instructions

* Bring pins into compliance

* Update 1.0 SD Detect pin for 1.1

* Update Configuration.h

* Update pins_ARCHIM2.h
pull/1/head
teemuatlut 7 years ago
committed by Scott Lahteine
parent
commit
70be4d206e
  1. 1
      Marlin/Marlin.ino
  2. 86
      Marlin/src/HAL/HAL_DUE/fastio_Due.h
  3. 1729
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
  4. 1451
      Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
  5. 1
      Marlin/src/core/boards.h
  6. 2
      Marlin/src/module/stepper_indirection.cpp
  7. 2
      Marlin/src/pins/pins.h
  8. 137
      Marlin/src/pins/pins_ARCHIM2.h

1
Marlin/Marlin.ino

@ -54,7 +54,6 @@
#endif
#if ENABLED(HAVE_TMC2130)
#include <SPI.h>
#include <TMC2130Stepper.h>
#endif

86
Marlin/src/HAL/HAL_DUE/fastio_Due.h

@ -404,31 +404,81 @@ pins
#define DIO91_PIN 15
#define DIO91_WPORT PIOB
#define DIO92_PIN 5
#define DIO92_WPORT PIOA
#if ARDUINO_SAM_ARCHIM
#define DIO92_PIN 11
#define DIO92_WPORT PIOC
#define DIO93_PIN 12
#define DIO93_WPORT PIOB
#define DIO93_PIN 2
#define DIO93_WPORT PIOB
#define DIO94_PIN 22
#define DIO94_WPORT PIOB
#define DIO94_PIN 1
#define DIO94_WPORT PIOB
#define DIO95_PIN 23
#define DIO95_WPORT PIOB
#define DIO95_PIN 0
#define DIO95_WPORT PIOB
#define DIO96_PIN 24
#define DIO96_WPORT PIOB
#define DIO96_PIN 10
#define DIO96_WPORT PIOC
#define DIO97_PIN 20
#define DIO97_WPORT PIOC
#define DIO97_PIN 24
#define DIO97_WPORT PIOB
#define DIO98_PIN 27
#define DIO98_WPORT PIOC
#define DIO98_PIN 7
#define DIO98_WPORT PIOB
#define DIO99_PIN 10
#define DIO99_WPORT PIOC
#define DIO99_PIN 6
#define DIO99_WPORT PIOB
#define DIO100_PIN 11
#define DIO100_WPORT PIOC
#define DIO100_PIN 8
#define DIO100_WPORT PIOB
#define DIO101_PIN 5
#define DIO101_WPORT PIOB
#define DIO102_PIN 4
#define DIO102_WPORT PIOB
#define DIO103_PIN 3
#define DIO103_WPORT PIOB
#define DIO104_PIN 20
#define DIO104_WPORT PIOC
#define DIO105_PIN 22
#define DIO105_WPORT PIOB
#define DIO106_PIN 27
#define DIO106_WPORT PIOC
#define DIO107_PIN 10
#define DIO107_WPORT PIOB
#else
#define DIO92_PIN 5
#define DIO92_WPORT PIOA
#define DIO93_PIN 12
#define DIO93_WPORT PIOB
#define DIO94_PIN 22
#define DIO94_WPORT PIOB
#define DIO95_PIN 23
#define DIO95_WPORT PIOB
#define DIO96_PIN 24
#define DIO96_WPORT PIOB
#define DIO97_PIN 20
#define DIO97_WPORT PIOC
#define DIO98_PIN 27
#define DIO98_WPORT PIOC
#define DIO99_PIN 10
#define DIO99_WPORT PIOC
#define DIO100_PIN 11
#define DIO100_WPORT PIOC
#endif
#endif // _FASTIO_DUE_H

1729
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h

File diff suppressed because it is too large

1451
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h

File diff suppressed because it is too large

1
Marlin/src/core/boards.h

@ -174,6 +174,7 @@
#define BOARD_RAMPS4DUE_EFF 1545 // RAMPS4DUE (Power outputs: Hotend, Fan0, Fan1)
#define BOARD_RAMPS4DUE_EEF 1546 // RAMPS4DUE (Power outputs: Hotend0, Hotend1, Fan)
#define BOARD_RAMPS4DUE_SF 1548 // RAMPS4DUE (Power outputs: Spindle, Controller Fan)
#define BOARD_ARCHIM2 1590 // UltiMachine Archim2 (with TMC2130 drivers)
#define BOARD_ALLIGATOR 1602 // Alligator Board R2
//

2
Marlin/src/module/stepper_indirection.cpp

@ -181,7 +181,7 @@
st.power_down_delay(128); // ~2s until driver lowers to hold current
st.hysterisis_start(0); // HSTRT = 1
st.hysterisis_low(1); // HEND = -2
st.diag1_active_high(1); // For sensorless homing
st.diag1_active_high(0); // For sensorless homing
#if ENABLED(STEALTHCHOP)
st.stealth_freq(1); // f_pwm = 2/683 f_clk
st.stealth_autoscale(1);

2
Marlin/src/pins/pins.h

@ -302,6 +302,8 @@
#include "pins_RAMPS4DUE.h"
#elif MB(RAMPS4DUE_SF)
#include "pins_RAMPS4DUE.h"
#elif MB(ARCHIM2)
#include "pins_ARCHIM2.h"
#elif MB(ALLIGATOR)
#include "pins_ALLIGATOR_R2.h"
#elif MB(STM32F1R)

137
Marlin/src/pins/pins_ARCHIM2.h

@ -0,0 +1,137 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 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/>.
*
*/
/**
* ARCHIM2 pin assignment (pins_ARCHIM2.h)
*
* The Archim2 board requires Arduino Archim addons installed.
* Add the following URL to Arduino IDE's Additional Board Manager URLs:
* https://raw.githubusercontent.com/ultimachine/ArduinoAddons/master/package_ultimachine_index.json
* In the Arduino IDE Board Manager search for Archim and install the package.
* Change your target board to "Archim".
*
* Further information is provided by UltiMachine
* https://github.com/ultimachine/Archim/wiki/Archim-v2.0
* https://github.com/ultimachine/Archim/wiki
*
*/
#ifndef __SAM3X8E__
#error "Oops! Make sure you have 'Archim' selected from the 'Tools -> Boards' menu."
#endif
//
// Items marked * have been altered from Archim v1.0
//
//
// Limit Switches
//
#define X_MIN_PIN 14 // PD4 MIN ES1
#define X_MAX_PIN 32 // PD10 MAX ES1
#define Y_MIN_PIN 29 // PD6 MIN ES2
#define Y_MAX_PIN 15 // PD5 MAX ES2
#define Z_MIN_PIN 31 // PA7 MIN ES3
#define Z_MAX_PIN 30 // PD9 MAX ES3
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 32
#endif
//
// Steppers
//
#define X_STEP_PIN 38 // PC6 X-STEP *
#define X_DIR_PIN 37 // PC5 X-DIR *
#define X_ENABLE_PIN 41 // PC9 EN1
#define X_CS_PIN 39 // PC7 X_nCS
#define X_DIAG_PIN 59 // PA4 X_DIAG
#define Y_STEP_PIN 51 // PC12 Y-STEP *
#define Y_DIR_PIN 92 // PC11 Y-DIR -AddOns *
#define Y_ENABLE_PIN 49 // PC14 Y-EN *
#define Y_CS_PIN 50 // PC13 Y_nCS
#define Y_DIAG_PIN 48 // PC15 Y_DIAG
#define Z_STEP_PIN 46 // PC17 Z-STEP *
#define Z_DIR_PIN 47 // PC16 Z-DIR *
#define Z_ENABLE_PIN 44 // PC19 Z-END *
#define Z_CS_PIN 45 // PC18 Z_nCS
#define Z_DIAG_PIN 36 // PC4 Z_DIAG
#define E0_STEP_PIN 107 // PB10 E1-STEP -AddOns *
#define E0_DIR_PIN 96 // PC10 E1-DIR -AddOns *
#define E0_ENABLE_PIN 105 // PB22 E1-EN -AddOns *
#define E0_CS_PIN 104 // PC20 E1_nCS -AddOns *
#define E0_DIAG_PIN 78 // PB23 E1_DIAG
#define E1_STEP_PIN 22 // PB26 E2_STEP *
#define E1_DIR_PIN 97 // PB24 E2_DIR -AddOns *
#define E1_ENABLE_PIN 18 // PA11 E2-EN
#define E1_CS_PIN 19 // PA10 E2_nCS
#define E1_DIAG_PIN 25 // PD0 E2_DIAG
//
// Temperature Sensors
//
#define TEMP_0_PIN 10 // D10 PB19 THERM AN1 *
#define TEMP_1_PIN 9 // D9 PB18 THERM AN2 *
#define TEMP_2_PIN 8 // D8 PB17 THERM AN4 *
#define TEMP_BED_PIN 11 // D11 PB20 THERM AN3 *
//
// Heaters / Fans
//
#define FAN_PIN 4 // D4 PC26 FET_PWM1
#define FAN1_PIN 5 // D5 PC25 FET_PWM2
#define HEATER_0_PIN 6 // D6 PC24 FET_PWM3
#define HEATER_1_PIN 7 // D7 PC23 FET_PWM4
#define HEATER_2_PIN 8 // D8 PC22 FET_PWM5
#define HEATER_BED_PIN 9 // D9 PC21 BED_PWM
//////////////////////////
// LCDs and Controllers //
//////////////////////////
#if ENABLED(ULTRA_LCD)
#if ENABLED(NEWPANEL)
#define BEEPER_PIN 23 // D24 PA15_CTS1
#define LCD_PINS_RS 17 // D17 PA12_RXD1
#define LCD_PINS_ENABLE 24 // D23 PA14_RTS1
#define LCD_PINS_D4 69 // D69 PA0_CANTX0
#define LCD_PINS_D5 54 // D54 PA16_SCK1
#define LCD_PINS_D6 68 // D68 PA1_CANRX0
#define LCD_PINS_D7 34 // D34 PC2_PWML0
#define SD_DETECT_PIN 2 // D2 PB25_TIOA0
#define SDSS 87 // D87 PA29 CS
// Buttons on AUX-2
#define BTN_EN1 60 // D60 PA3_TIOB1
#define BTN_EN2 13 // D13 PB27_TIOB0
#define BTN_ENC 16 // D16 PA13_TXD1 // the click
#endif // NEWPANEL
#endif // ULTRA_LCD
Loading…
Cancel
Save