Skip to content
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

Support for Ortur 4.3 mainboard #17790

Merged
merged 44 commits into from
May 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
ac7ee4b
Release version 2.0.0
thinkyhead Dec 1, 2019
0673f33
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x
thinkyhead Dec 24, 2019
ee17051
Version 2.0.1
thinkyhead Dec 24, 2019
be64261
Merge commit '8bd6b60a0141fa892984f2d5b61f06eadbbf9a5f' into look_at_201
thinkyhead Jan 31, 2020
016e4c0
Version 2.0.2
thinkyhead Jan 27, 2020
1525c25
Merge commit 'dabf3939209fd8ea7f6a6327d764c16743aa22aa' into look_at_201
thinkyhead Jan 31, 2020
e6a7be9
Version 2.0.3
thinkyhead Jan 31, 2020
64ab254
Use a different Configurations branch for CI
thinkyhead Feb 4, 2020
4c76314
Scheduled action to bump the date on bugfix-2.0.x
thinkyhead Feb 4, 2020
d83382e
Add "PR Bad Target" workflow action
thinkyhead Feb 4, 2020
62b9d7d
Direct link to version configs
thinkyhead Feb 5, 2020
dd6a7ca
Fix out-of-order M0 after SD printing
thinkyhead Feb 10, 2020
f9aec26
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x
thinkyhead Feb 21, 2020
7e8505f
Version 2.0.4 Release
thinkyhead Feb 21, 2020
c505626
[cron] Bump distribution date (2020-02-22)
thinkyhead Feb 22, 2020
3543873
Use moves_free in ok_to_send
thinkyhead Feb 21, 2020
730690e
Hotfix for Babystepping
thinkyhead Feb 22, 2020
8670df0
CoreXY Babystepping hotfix
thinkyhead Feb 22, 2020
c41f3f8
Version 2.0.4.1 Release
thinkyhead Feb 22, 2020
282f467
Merge nightly patches
thinkyhead Feb 23, 2020
5f27f7d
Version 2.0.4.2 Release
thinkyhead Feb 23, 2020
2b759b9
Suppress "packed member" warning
thinkyhead Feb 23, 2020
089cc68
Merge nightly patches
thinkyhead Feb 24, 2020
c5f1ff9
Allow Z_SAFE_HOMING_POINT outside bed (#16945)
marciot Feb 24, 2020
130d039
Restore tabs in Makefile (#16944)
marciot Feb 24, 2020
42fa9fc
Fix card_eof error
thinkyhead Feb 24, 2020
1955eea
Version 2.0.4.3 Release
thinkyhead Feb 24, 2020
b29aae6
Merge 'bugfix-2.0.x' into 2.0.x
thinkyhead Feb 27, 2020
d6e767e
Version 2.0.4.4 Release
thinkyhead Feb 26, 2020
fa48fbb
Merge bugfix-2.0.x into 2.0.x
thinkyhead Mar 14, 2020
8dbbcfd
Version 2.0.5 Release
thinkyhead Mar 14, 2020
129b1bb
Merge nightly patches
thinkyhead Mar 16, 2020
d37bfa3
Version 2.0.5.1 Release
thinkyhead Mar 16, 2020
efc1926
Merge patches from bugfix-2.0.x
thinkyhead Mar 24, 2020
7124b21
Version 2.0.5.2
thinkyhead Mar 24, 2020
0f9a14d
Merge latest patches
thinkyhead Mar 31, 2020
015c4e6
Version 2.0.5.3
thinkyhead Mar 31, 2020
0518dec
Correct link to Configurations (#17370)
thisiskeithb Apr 1, 2020
3e1c9b4
Added Ortur v4.3 board
Apr 28, 2020
5df208c
ortur Configuration
Apr 29, 2020
6dcf6ff
Added pins for Ortur 4.3 mainboard
Apr 29, 2020
f1623a2
Update pins.h
thinkyhead May 3, 2020
612c486
Clean up and format
thinkyhead May 3, 2020
93c23ce
Update pins_ORTUR_4.h
thinkyhead May 3, 2020
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 @@ -104,6 +104,7 @@
#define BOARD_TANGO 1148 // BIQU Tango V1
#define BOARD_MKS_GEN_L_V2 1149 // MKS GEN L V2
#define BOARD_COPYMASTER_3D 1150 // Copymaster 3D
#define BOARD_ORTUR_4 1151 // Ortur 4

//
// RAMBo and derivatives
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 @@ -190,6 +190,8 @@
#include "ramps/pins_MKS_GEN_L_V2.h" // ATmega2560 env:mega2560
#elif MB(COPYMASTER_3D)
#include "ramps/pins_COPYMASTER_3D.h" // ATmega2560 env:mega2560
#elif MB(ORTUR_4)
#include "ramps/pins_ORTUR_4.h" // ATmega2560 env:mega2560

//
// RAMBo and derivatives
Expand Down
116 changes: 116 additions & 0 deletions Marlin/src/pins/ramps/pins_ORTUR_4.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
/**
* 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

/**
* Ortur 4 Arduino Mega based on RAMPS v1.4 pin assignments
*/

#define BOARD_INFO_NAME "Ortur 4.3"
#define DEFAULT_MACHINE_NAME BOARD_INFO_NAME

//
// Servos
//
#define SERVO0_PIN 29

//
// Limit Switches
//
#define X_MAX_PIN 18
#define Z_MIN_PIN 63

#define Z_MIN_PROBE_PIN 2
#define FIL_RUNOUT_PIN 59

//
// Steppers
//
#define E0_CS_PIN 44
#define E1_CS_PIN 42

//
// Temperature Sensors
//
#define TEMP_0_PIN 15 // Analog Input
#define TEMP_1_PIN 13 // Analog Input

//
// Software serial
//
#define X_SERIAL_TX_PIN 59
#define X_SERIAL_RX_PIN 63

#define Y_SERIAL_TX_PIN 64
#define Y_SERIAL_RX_PIN 40

#define Z_SERIAL_TX_PIN 44
#define Z_SERIAL_RX_PIN 42

#define E0_SERIAL_TX_PIN 66
#define E0_SERIAL_RX_PIN 65

#include "pins_RAMPS.h"

//
// Steppers
//
#undef E0_STEP_PIN
#undef E0_DIR_PIN
#undef E0_ENABLE_PIN
#define E0_STEP_PIN 36
#define E0_DIR_PIN 34
#define E0_ENABLE_PIN 30

#undef E1_STEP_PIN
#undef E1_DIR_PIN
#undef E1_ENABLE_PIN
#define E1_STEP_PIN 26
#define E1_DIR_PIN 28
#define E1_ENABLE_PIN 24

//
// LCD / Controller
//
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#undef BEEPER_PIN
#define BEEPER_PIN 35

#undef LCD_PINS_RS
#undef LCD_PINS_ENABLE
#undef LCD_PINS_D4
#define LCD_PINS_RS 27
#define LCD_PINS_ENABLE 23
#define LCD_PINS_D4 37

#undef LCD_SDSS
#undef SD_DETECT_PIN
#define LCD_SDSS 53
#define SD_DETECT_PIN 49

#undef BTN_EN1
#undef BTN_EN2
#undef BTN_ENC
#define BTN_EN1 29
#define BTN_EN2 25
#define BTN_ENC 16
#endif