Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
ff481101
Commit
ff481101
authored
Sep 04, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update 4.2.0
parent
03152a21
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
78 additions
and
20 deletions
+78
-20
Boards.h
MarlinKimbra/Boards.h
+1
-0
Configuration_Basic.h
MarlinKimbra/Configuration_Basic.h
+13
-13
Configuration_Delta.h
MarlinKimbra/Configuration_Delta.h
+5
-5
comunication.h
MarlinKimbra/comunication.h
+1
-1
marlinkimbra_v0_2.tft
MarlinKimbra/nextion/marlinkimbra_v0_2.tft
+0
-0
marlinkimbra_v0_5_1.tft
MarlinKimbra/nextion/marlinkimbra_v0_5_1.tft
+0
-0
pins.h
MarlinKimbra/pins.h
+58
-1
No files found.
MarlinKimbra/Boards.h
View file @
ff481101
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
#define BOARD_RADDS 402 // RADDS ARM 32
#define BOARD_RADDS 402 // RADDS ARM 32
#define BOARD_RAMPS_FDV1 403 // RAMPS-FD V1 ARM 32
#define BOARD_RAMPS_FDV1 403 // RAMPS-FD V1 ARM 32
#define BOARD_RAMPS_FDV2 404 // RAMPS-FD V2 ARM 32
#define BOARD_RAMPS_FDV2 404 // RAMPS-FD V2 ARM 32
#define BOARD_SMART_RAMPS 408 // SMART RAMPS ARM 32
#define BOARD_RAMPS4DUE 433 // RAMPS4DUE with AndrewBCN's RAMPS mods (http://forums.reprap.org/read.php?219,479626,page=1) ARM 32
#define BOARD_RAMPS4DUE 433 // RAMPS4DUE with AndrewBCN's RAMPS mods (http://forums.reprap.org/read.php?219,479626,page=1) ARM 32
#define BOARD_GEN6 5 // Gen6
#define BOARD_GEN6 5 // Gen6
...
...
MarlinKimbra/Configuration_Basic.h
View file @
ff481101
...
@@ -6,9 +6,9 @@
...
@@ -6,9 +6,9 @@
* - Serial comunication type
* - Serial comunication type
* - Board type
* - Board type
* - Mechanism type
* - Mechanism type
* - Extruders number
* - Thermistor type
* - Thermistor type
* - Temperature limits
* - Temperature limits
* - Extruders number
* - UI Language
* - UI Language
*
*
* Mechanisms-settings can be found in Configuration_Xxxxxx.h (where Xxxxxx can be: Cartesian - Delta - Core - Scara)
* Mechanisms-settings can be found in Configuration_Xxxxxx.h (where Xxxxxx can be: Cartesian - Delta - Core - Scara)
...
@@ -89,8 +89,19 @@
...
@@ -89,8 +89,19 @@
/*************************************************************************************/
/*************************************************************************************/
/***********************************************************************
************************** Extruders number ***************************
***********************************************************************/
// This defines the number of extruder real or virtual
#define EXTRUDERS 1
// This defines the number of Driver extruder you have and use
#define DRIVER_EXTRUDERS 1
/***********************************************************************/
/*****************************************************************************************************
/*****************************************************************************************************
************************************
Thermistor type
*************************************
************************************
** Thermistor type *********
*************************************
*****************************************************************************************************
*****************************************************************************************************
* *
* *
* 4.7kohm PULLUP! *
* 4.7kohm PULLUP! *
...
@@ -197,17 +208,6 @@
...
@@ -197,17 +208,6 @@
/*****************************************************************************************************/
/*****************************************************************************************************/
/***********************************************************************
************************** Extruders number ***************************
***********************************************************************/
// This defines the number of extruder real or virtual
#define EXTRUDERS 1
// This defines the number of Driver extruder you have and use
#define DRIVER_EXTRUDERS 1
/***********************************************************************/
/***********************************************************************
/***********************************************************************
*************************** UI Language ******************************
*************************** UI Language ******************************
***********************************************************************
***********************************************************************
...
...
MarlinKimbra/Configuration_Delta.h
View file @
ff481101
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
#define DELTA_CARRIAGE_OFFSET 20.0 // mm
#define DELTA_CARRIAGE_OFFSET 20.0 // mm
// Bed Printer radius
// Bed Printer radius
#define
PRINTER_RADIUS 75
// mm
#define
BED_PRINTER_RADIUS 75
// mm
//Endstop Offset Adjustment - All values are in mm and must be negative (to move down away from endstop switches)
//Endstop Offset Adjustment - All values are in mm and must be negative (to move down away from endstop switches)
#define TOWER_A_ENDSTOP_ADJ 0 // Front Left Tower
#define TOWER_A_ENDSTOP_ADJ 0 // Front Left Tower
...
@@ -269,10 +269,10 @@
...
@@ -269,10 +269,10 @@
* Travel limits after homing (units are in mm) *
* Travel limits after homing (units are in mm) *
* *
* *
*****************************************************************************************/
*****************************************************************************************/
#define X_MAX_POS PRINTER_RADIUS
#define X_MAX_POS
BED_
PRINTER_RADIUS
#define X_MIN_POS -PRINTER_RADIUS
#define X_MIN_POS -
BED_
PRINTER_RADIUS
#define Y_MAX_POS PRINTER_RADIUS
#define Y_MAX_POS
BED_
PRINTER_RADIUS
#define Y_MIN_POS -PRINTER_RADIUS
#define Y_MIN_POS -
BED_
PRINTER_RADIUS
#define Z_MAX_POS MANUAL_Z_HOME_POS
#define Z_MAX_POS MANUAL_Z_HOME_POS
#define Z_MIN_POS 0
#define Z_MIN_POS 0
#define E_MIN_POS 0
#define E_MIN_POS 0
...
...
MarlinKimbra/comunication.h
View file @
ff481101
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#define ER "error: " // error for host
#define ER "error: " // error for host
#define WT "wait" // wait for host
#define WT "wait" // wait for host
#define DB "echo: " // message for user
#define DB "echo: " // message for user
#define RS "
R
esend: " // resend for host
#define RS "
r
esend: " // resend for host
#define PAUSE "//action:pause" // command for host that support action
#define PAUSE "//action:pause" // command for host that support action
#define RESUME "//action:resume" // command for host that support action
#define RESUME "//action:resume" // command for host that support action
#define DISCONNECT "//action:disconnect" // command for host that support action
#define DISCONNECT "//action:disconnect" // command for host that support action
...
...
MarlinKimbra/nextion/marlinkimbra_v0_2.tft
deleted
100644 → 0
View file @
03152a21
File deleted
MarlinKimbra/nextion/marlinkimbra_v0_5_1.tft
0 → 100644
View file @
ff481101
File added
MarlinKimbra/pins.h
View file @
ff481101
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
*401 BOARD_RADDS - Radds Arduino DUE
*401 BOARD_RADDS - Radds Arduino DUE
*403 BOARD_RAMPS_FD_V1 - Ramps FD version 1 Arduino DUE
*403 BOARD_RAMPS_FD_V1 - Ramps FD version 1 Arduino DUE
*404 BOARD_RAMPS_FD_V2 - Ramps FD version 2 Arduino DUE
*404 BOARD_RAMPS_FD_V2 - Ramps FD version 2 Arduino DUE
*408 BOARD_SMART_RAMPS - Smart Ramps for Arduino DUE
*433 BOARD_RAMPS4DUE - Ramps for Arduino DUE
*433 BOARD_RAMPS4DUE - Ramps for Arduino DUE
*
*
* 5 BOARD_GEN6 - Gen6
* 5 BOARD_GEN6 - Gen6
...
@@ -2309,13 +2310,69 @@
...
@@ -2309,13 +2310,69 @@
/****************************************************************************************
* 408
* Arduino Due pin assignment
* for SMART_RAMPS
****************************************************************************************/
#if MB(SMART_RAMPS)
#define KNOWN_BOARD
#ifndef __SAM3X8E__
#error Oops! Make sure you have 'Arduino Due' selected from the 'Tools -> Boards' menu.
#endif
#define ORIG_X_STEP_PIN 54
#define ORIG_X_DIR_PIN 55
#define ORIG_X_MIN_PIN 3
#define ORIG_X_MAX_PIN 2
#define ORIG_X_ENABLE_PIN 38
#define ORIG_Y_STEP_PIN 60
#define ORIG_Y_DIR_PIN 61
#define ORIG_Y_MIN_PIN 14
#define ORIG_Y_MAX_PIN 15
#define ORIG_Y_ENABLE_PIN 56
#define ORIG_Z_STEP_PIN 46
#define ORIG_Z_DIR_PIN 48
#define ORIG_Z_MIN_PIN 18
#define ORIG_Z_MAX_PIN 19
#define ORIG_Z_ENABLE_PIN 62
// Note that on the Due pin A0 on the board is channel 2 on the ARM chip
#define ORIG_HEATER_0_PIN 10
#define ORIG_TEMP_0_PIN 11 // Due analog pin #
#define ORIG_HEATER_1_PIN 8
#define ORIG_TEMP_1_PIN 12 // Due analog pin #
#define ORIG_HEATER_BED_PIN 9
#define ORIG_TEMP_BED_PIN 13 // Due analog pin #
#define ORIG_E0_STEP_PIN 26
#define ORIG_E0_DIR_PIN 28
#define ORIG_E0_ENABLE_PIN 24
#define ORIG_E1_STEP_PIN 36
#define ORIG_E1_DIR_PIN 34
#define ORIG_E1_ENABLE_PIN 30
#define SDPOWER -1
#define SDSS 53 // 10 if using HW SPI. 53 if using SW SPI
#define LED_PIN 13
#define ORIG_FAN_PIN 9
#define PS_ON_PIN 12
#define KILL_PIN -1
#define SUICIDE_PIN -1 // PIN that has to be turned on right after start, to keep power flowing
/****************************************************************************************/
/****************************************************************************************
/****************************************************************************************
* 433
* 433
* Arduino Due pin assignment
* Arduino Due pin assignment
* for RAMPS4DUE (http://forums.reprap.org/read.php?219,479626,page=1)
* for RAMPS4DUE (http://forums.reprap.org/read.php?219,479626,page=1)
****************************************************************************************/
****************************************************************************************/
#if MB(RAMPS4DUE)
#if MB(RAMPS4DUE)
#define KNOWN_BOARD
1
#define KNOWN_BOARD
#ifndef __SAM3X8E__
#ifndef __SAM3X8E__
#error Oops! Make sure you have 'Arduino Due' selected from the 'Tools -> Boards' menu.
#error Oops! Make sure you have 'Arduino Due' selected from the 'Tools -> Boards' menu.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment