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
65f6f7d7
Commit
65f6f7d7
authored
Aug 31, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX
parent
601175ac
Changes
24
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
505 additions
and
2381 deletions
+505
-2381
Configuration_Cartesian.h
MarlinKimbra/Configuration_Cartesian.h
+146
-20
Configuration_Core.h
MarlinKimbra/Configuration_Core.h
+146
-20
Configuration_Delta.h
MarlinKimbra/Configuration_Delta.h
+86
-49
Configuration_Overall.h
MarlinKimbra/Configuration_Overall.h
+1
-1
Configuration_Scara.h
MarlinKimbra/Configuration_Scara.h
+33
-45
SdFile.cpp
MarlinKimbra/SdFile.cpp
+1
-1
SdInfo.h
MarlinKimbra/SdInfo.h
+1
-1
SdVolume.h
MarlinKimbra/SdVolume.h
+1
-1
boards.h
MarlinKimbra/boards.h
+0
-72
configuration_basic.h
MarlinKimbra/configuration_basic.h
+0
-235
configuration_feature.h
MarlinKimbra/configuration_feature.h
+0
-1561
macros.h
MarlinKimbra/macros.h
+5
-2
pins.h
MarlinKimbra/pins.h
+22
-22
planner.cpp
MarlinKimbra/planner.cpp
+1
-3
planner.h
MarlinKimbra/planner.h
+2
-0
sanitycheck.h
MarlinKimbra/sanitycheck.h
+10
-11
servo.cpp
MarlinKimbra/servo.cpp
+3
-2
stepper.cpp
MarlinKimbra/stepper.cpp
+0
-1
stepper.h
MarlinKimbra/stepper.h
+2
-0
temperature.h
MarlinKimbra/temperature.h
+0
-1
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+37
-325
ultralcd.h
MarlinKimbra/ultralcd.h
+6
-6
vector_3.cpp
MarlinKimbra/vector_3.cpp
+1
-1
vector_3.h
MarlinKimbra/vector_3.h
+1
-1
No files found.
MarlinKimbra/Configuration_Cartesian.h
View file @
65f6f7d7
This diff is collapsed.
Click to expand it.
MarlinKimbra/Configuration_Core.h
View file @
65f6f7d7
This diff is collapsed.
Click to expand it.
MarlinKimbra/Configuration_Delta.h
View file @
65f6f7d7
This diff is collapsed.
Click to expand it.
MarlinKimbra/Configuration_Overall.h
View file @
65f6f7d7
MarlinKimbra/Configuration_Scara.h
View file @
65f6f7d7
#ifndef CONFIGURATION_MECHANISM
#ifndef CONFIGURATION_MECHANISM
#define CONFIGURATION_MECHANISM
#define CONFIGURATION_MECHANISM
#define KNOWN_MECH 1
#define KNOWN_MECH 1
/*
/*
* This configuration file contains mechanism settings for cartesian printer.
* This configuration file contains mechanism settings for cartesian printer.
*
*
...
@@ -30,7 +29,7 @@
...
@@ -30,7 +29,7 @@
*/
*/
/*****************************************************************************************
/*****************************************************************************************
***********************************
** Machine name
**************************************
***********************************
Machine name **
**************************************
*****************************************************************************************
*****************************************************************************************
* *
* *
* This to set a custom name for your generic Mendel. *
* This to set a custom name for your generic Mendel. *
...
@@ -67,20 +66,23 @@
...
@@ -67,20 +66,23 @@
/*****************************************************************************************
/*****************************************************************************************
****************************** Endstop pullup resistors *********************************
************************* Endstop pullup resistors **************************************
*****************************************************************************************
* *
* Comment this out (using // at the start of the line) to *
* disable the endstop pullup resistors *
* *
*****************************************************************************************/
*****************************************************************************************/
#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
//
#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
#if DISABLED(ENDSTOPPULLUPS)
#if DISABLED(ENDSTOPPULLUPS)
// fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
// fine endstop settings: Individual pullups. will be ignored if ENDSTOPPULLUPS is defined
//#define ENDSTOPPULLUP_XMIN
#define ENDSTOPPULLUP_XMIN // open pin, inverted
//#define ENDSTOPPULLUP_YMIN
#define ENDSTOPPULLUP_YMIN // open pin, inverted
//#define ENDSTOPPULLUP_ZMIN
//#define ENDSTOPPULLUP_ZMIN
//#define ENDSTOPPULLUP_Z2MIN
//#define ENDSTOPPULLUP_XMAX
//#define ENDSTOPPULLUP_XMAX
//#define ENDSTOPPULLUP_YMAX
//#define ENDSTOPPULLUP_YMAX
//#define ENDSTOPPULLUP_ZMAX
#define ENDSTOPPULLUP_ZMAX // open pin, inverted
//#define ENDSTOPPULLUP_Z2MAX
//#define ENDSTOPPULLUP_ZPROBE
//#define ENDSTOPPULLUP_ZPROBE
//#define ENDSTOPPULLUP_EMIN
//#define ENDSTOPPULLUP_EMIN
#endif
#endif
...
@@ -182,7 +184,8 @@
...
@@ -182,7 +184,8 @@
#define DISABLE_Y false
#define DISABLE_Y false
#define DISABLE_Z false
#define DISABLE_Z false
#define DISABLE_E false // For all extruder
#define DISABLE_E false // For all extruder
#define DISABLE_INACTIVE_EXTRUDER false //disable only inactive extruder and keep active extruder enabled
// Disable only inactive extruder and keep active extruder enabled
#define DISABLE_INACTIVE_EXTRUDER false
/*****************************************************************************************/
/*****************************************************************************************/
...
@@ -197,7 +200,7 @@
...
@@ -197,7 +200,7 @@
#define X_MIN_POS 0
#define X_MIN_POS 0
#define Y_MAX_POS 200
#define Y_MAX_POS 200
#define Y_MIN_POS 0
#define Y_MIN_POS 0
#define Z_MAX_POS 2
00
#define Z_MAX_POS 2
25
#define Z_MIN_POS MANUAL_Z_HOME_POS
#define Z_MIN_POS MANUAL_Z_HOME_POS
#define E_MIN_POS 0
#define E_MIN_POS 0
/*****************************************************************************************/
/*****************************************************************************************/
...
@@ -210,30 +213,8 @@
...
@@ -210,30 +213,8 @@
/*****************************************************************************************/
/*****************************************************************************************/
/*****************************************************************************************
************************************** MBL or ABL ***************************************
/*****************************************************************************************
* *
* Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings *
* Set the rectangle in which to probe in MBL or ABL. *
* *
*****************************************************************************************/
#define LEFT_PROBE_BED_POSITION 20
#define RIGHT_PROBE_BED_POSITION 180
#define FRONT_PROBE_BED_POSITION 20
#define BACK_PROBE_BED_POSITION 180
#define XY_TRAVEL_SPEED 10000 // X and Y axis travel speed between probes, in mm/min
/*****************************************************************************************/
/*****************************************************************************************
/*****************************************************************************************
******************************** Manual home positions **********************************
******************************** Manual home positions **********************************
/*****************************************************************************************
* *
* Manual Bed Leveling (MBL) or Auto Bed Leveling (ABL) settings *
* Set the rectangle in which to probe in MBL or ABL. *
* *
*****************************************************************************************/
*****************************************************************************************/
// The position of the homing switches
// The position of the homing switches
#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used
#define MANUAL_HOME_POSITIONS // If defined, MANUAL_*_HOME_POS below will be used
...
@@ -249,14 +230,16 @@
...
@@ -249,14 +230,16 @@
/*****************************************************************************************
/*****************************************************************************************
******************************* Axis steps per unit *************************************
******************************* Axis steps per unit *************************************
*****************************************************************************************/
*****************************************************************************************/
#define DEFAULT_AXIS_STEPS_PER_UNIT {103.69,103.69,200/1.25,625,625,625,625} // X, Y, Z, E0...(per extruder). Default steps per unit
// Default steps per unit X, Y, Z, E0...(per extruder)
#define DEFAULT_AXIS_STEPS_PER_UNIT {104, 104, 160, 625, 625, 625, 625}
/*****************************************************************************************/
/*****************************************************************************************/
/*****************************************************************************************
/*****************************************************************************************
********************************** Axis feedrate ****************************************
********************************** Axis feedrate ****************************************
*****************************************************************************************/
*****************************************************************************************/
#define DEFAULT_MAX_FEEDRATE {300,300,4,45,45,45,45} // X, Y, Z, E0...(per extruder). (mm/sec)
// X, Y, Z, E0...(per extruder). (mm/sec)
#define DEFAULT_MAX_FEEDRATE {300, 300, 4, 45, 45, 45, 45}
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
#define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate
#define DEFAULT_MINTRAVELFEEDRATE 0.0
#define DEFAULT_MINTRAVELFEEDRATE 0.0
...
@@ -270,10 +253,14 @@
...
@@ -270,10 +253,14 @@
/*****************************************************************************************
/*****************************************************************************************
******************************** Axis accelleration *************************************
******************************** Axis accelleration *************************************
*****************************************************************************************/
*****************************************************************************************/
#define DEFAULT_MAX_ACCELERATION {5000,5000,50,5000,5000,5000,5000} // X, Y, Z, E0...(per extruder). Maximum start speed for accelerated moves.
// Maximum start speed for accelerated moves. X, Y, Z, E0...(per extruder)
#define DEFAULT_RETRACT_ACCELERATION {10000,10000,10000,10000} // E0... (per extruder) max acceleration in mm/s^2 for retracts
#define DEFAULT_MAX_ACCELERATION {3000, 3000, 50, 1000, 1000, 1000, 1000}
#define DEFAULT_ACCELERATION 400 // X, Y, Z and E* max acceleration in mm/s^2 for printing moves
// Maximum acceleration in mm/s^2 for retracts E0... (per extruder)
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
#define DEFAULT_RETRACT_ACCELERATION {10000, 10000, 10000, 10000}
// X, Y, Z and E* maximum acceleration in mm/s^2 for printing moves
#define DEFAULT_ACCELERATION 400
// X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
#define DEFAULT_TRAVEL_ACCELERATION 400
/*****************************************************************************************/
/*****************************************************************************************/
...
@@ -287,7 +274,8 @@
...
@@ -287,7 +274,8 @@
*****************************************************************************************/
*****************************************************************************************/
#define DEFAULT_XYJERK 10.0 // (mm/sec)
#define DEFAULT_XYJERK 10.0 // (mm/sec)
#define DEFAULT_ZJERK 0.4 // (mm/sec)
#define DEFAULT_ZJERK 0.4 // (mm/sec)
#define DEFAULT_EJERK {5.0,5.0,5.0,5.0} // E0... (mm/sec) per extruder, max initial speed for retract moves
// max initial speed for retract moves E0... (mm/sec) per extruder
#define DEFAULT_EJERK {5.0, 5.0, 5.0, 5.0}
/*****************************************************************************************/
/*****************************************************************************************/
...
@@ -296,7 +284,7 @@
...
@@ -296,7 +284,7 @@
*****************************************************************************************/
*****************************************************************************************/
#define HOMING_FEEDRATE {40*60, 40*60, 10*60, 0} // set the homing speeds (mm/min)
#define HOMING_FEEDRATE {40*60, 40*60, 10*60, 0} // set the homing speeds (mm/min)
//homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
//
homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
#define X_HOME_BUMP_MM 5
#define X_HOME_BUMP_MM 5
#define Y_HOME_BUMP_MM 5
#define Y_HOME_BUMP_MM 5
#define Z_HOME_BUMP_MM 2
#define Z_HOME_BUMP_MM 2
...
...
MarlinKimbra/SdFile.cpp
View file @
65f6f7d7
MarlinKimbra/SdInfo.h
View file @
65f6f7d7
MarlinKimbra/SdVolume.h
View file @
65f6f7d7
MarlinKimbra/boards.h
deleted
100644 → 0
View file @
601175ac
#ifndef BOARD_H
#define BOARD_H
// Macros for board type
#define BOARD_UNKNOWN -1
#define BOARD_GEN7_CUSTOM 10 // Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics"
#define BOARD_GEN7_12 11 // Gen7 v1.1, v1.2
#define BOARD_GEN7_13 12 // Gen7 v1.3
#define BOARD_GEN7_14 13 // Gen7 v1.4
#define BOARD_CHEAPTRONIC 2 // Cheaptronic v1.0
#define BOARD_SETHI 20 // Sethi 3D_1
#define BOARD_ELEFU_3 21 // Elefu Ra Board (v3)
#define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics
#define BOARD_RAMPS_OLD 3 // MEGA/RAMPS up to 1.2
#define BOARD_RAMPS_13_EFB 33 // RAMPS 1.3 / 1.4 (Power outputs: Hotend, Fan, Bed)
#define BOARD_RAMPS_13_EEB 34 // RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Bed)
#define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Power outputs: Hotend, Fan, Fan)
#define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Fan)
#define BOARD_RAMPS_13_EEE 37 // RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Hotend2)
#define BOARD_RAMBO 301 // Rambo
#define BOARD_MINIRAMBO 302 // Mini-Rambo
#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignments
#define BOARD_RADDS 402 // RADDS
#define BOARD_RAMPS_FDV1 403 // RAMPS-FD V1
#define BOARD_RAMPS_FDV2 404 // RAMPS-FD V2
#define BOARD_RAMPS4DUE 433 // RAMPS4DUE with AndrewBCN's RAMPS mods (http://forums.reprap.org/read.php?219,479626,page=1)
#define BOARD_GEN6 5 // Gen6
#define BOARD_GEN6_DELUXE 51 // Gen6 deluxe
#define BOARD_ALLIGATOR 502 // ALLIGATOR R2 ARM 32
#define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2
#define BOARD_SANGUINOLOLU_12 62 // Sanguinololu 1.2 and above
#define BOARD_MELZI 63 // Melzi
#define BOARD_STB_11 64 // STB V1.1
#define BOARD_AZTEEG_X1 65 // Azteeg X1
#define BOARD_MELZI_MAKR3D 66 // Melzi with ATmega1284 (MaKr3d version)
#define BOARD_AZTEEG_X3 67 // Azteeg X3
#define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro
#define BOARD_ULTIMAKER 7 // Ultimaker
#define BOARD_MEGATRONICS 70 // Megatronics
#define BOARD_MEGATRONICS_2 701 // Megatronics v2.0
#define BOARD_MINITRONICS 702 // Minitronics v1.0
#define BOARD_MEGATRONICS_3 703 // Megatronics v3.0
#define BOARD_ULTIMAKER_OLD 71 // Ultimaker (Older electronics. Pre 1.5.4. This is rare)
#define BOARD_ULTIMAIN_2 72 // Ultimainboard 2.x (Uses TEMP_SENSOR 20)
#define BOARD_3DRAG 77 // 3Drag Controller
#define BOARD_K8200 78 // Vellemann K8200 Controller (derived from 3Drag Controller)
#define BOARD_TEENSYLU 8 // Teensylu
#define BOARD_RUMBA 80 // Rumba
#define BOARD_PRINTRBOARD 81 // Printrboard (AT90USB1286)
#define BOARD_BRAINWAVE 82 // Brainwave (AT90USB646)
#define BOARD_SAV_MKI 83 // SAV Mk-I (AT90USB1286)
#define BOARD_TEENSY2 84 // Teensy++2.0 (AT90USB1286)
#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board
#define BOARD_GEN3_PLUS 9 // Gen3+
#define BOARD_OMCA_A 90 // Alpha OMCA board
#define BOARD_OMCA 91 // Final OMCA board
#define BOARD_LEAPFROG 999 // Leapfrog
#define BOARD_99 99 // This is in pins.h but...?
#define MB(board) (MOTHERBOARD==BOARD_##board)
#endif
MarlinKimbra/configuration_basic.h
deleted
100644 → 0
View file @
601175ac
This diff is collapsed.
Click to expand it.
MarlinKimbra/configuration_feature.h
deleted
100644 → 0
View file @
601175ac
This diff is collapsed.
Click to expand it.
MarlinKimbra/macros.h
View file @
65f6f7d7
...
@@ -28,6 +28,9 @@
...
@@ -28,6 +28,9 @@
// Function macro
// Function macro
#define FORCE_INLINE __attribute__((always_inline)) inline
#define FORCE_INLINE __attribute__((always_inline)) inline
#define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli();
#if DISABLED(CRITICAL_SECTION_START)
#define CRITICAL_SECTION_END SREG = _sreg;
#define CRITICAL_SECTION_START unsigned char _sreg = SREG; cli();
#define CRITICAL_SECTION_END SREG = _sreg;
#endif
#endif //__MACROS_H
#endif //__MACROS_H
MarlinKimbra/pins.h
View file @
65f6f7d7
...
@@ -14,11 +14,11 @@
...
@@ -14,11 +14,11 @@
* 22 BOARD_GEN3_MONOLITHIC - Gen3 Monolithic Electronics
* 22 BOARD_GEN3_MONOLITHIC - Gen3 Monolithic Electronics
*
*
* 3 BOARD_RAMPS_OLD - MEGA/RAMPS up to 1.2
* 3 BOARD_RAMPS_OLD - MEGA/RAMPS up to 1.2
* 33 BOARD_RAMPS_13_
E
FB - RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Fan, Bed)
* 33 BOARD_RAMPS_13_
H
FB - RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Fan, Bed)
* 34 BOARD_RAMPS_13_
EE
B - RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Bed)
* 34 BOARD_RAMPS_13_
HH
B - RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Bed)
* 35 BOARD_RAMPS_13_
E
FF - RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Fan, Fan)
* 35 BOARD_RAMPS_13_
H
FF - RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Fan, Fan)
* 36 BOARD_RAMPS_13_
EE
F - RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Fan)
* 36 BOARD_RAMPS_13_
HH
F - RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Fan)
* 37 BOARD_RAMPS_13_
EEE
- RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Hotend2)
* 37 BOARD_RAMPS_13_
HHH
- RAMPS 1.3 / 1.4 (Power outputs: Hotend0, Hotend1, Hotend2)
*
*
*301 BOARD_RAMBO - Rambo
*301 BOARD_RAMBO - Rambo
*302 BOARD_MINIRAMBO - Mini Rambo
*302 BOARD_MINIRAMBO - Mini Rambo
...
@@ -186,7 +186,7 @@
...
@@ -186,7 +186,7 @@
#error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu.
#error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu.
#endif
#endif
#if
NOTEXIST
(GEN7_VERSION)
#if
DISABLED
(GEN7_VERSION)
#define GEN7_VERSION 12 // v1.x
#define GEN7_VERSION 12 // v1.x
#endif
#endif
...
@@ -261,7 +261,7 @@
...
@@ -261,7 +261,7 @@
#error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu.
#error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu.
#endif
#endif
#if
NOTEXIST
(GEN7_VERSION)
#if
DISABLED
(GEN7_VERSION)
#define GEN7_VERSION 13 // v1.x
#define GEN7_VERSION 13 // v1.x
#endif
#endif
...
@@ -502,7 +502,7 @@
...
@@ -502,7 +502,7 @@
#error Oops! Make sure you have 'Sethi 3D' selected from the 'Tools -> Boards' menu.
#error Oops! Make sure you have 'Sethi 3D' selected from the 'Tools -> Boards' menu.
#endif
#endif
#if
NOTEXIST
(GEN7_VERSION)
#if
DISABLED
(GEN7_VERSION)
#define GEN7_VERSION 12 // v1.x
#define GEN7_VERSION 12 // v1.x
#endif
#endif
...
@@ -843,10 +843,10 @@
...
@@ -843,10 +843,10 @@
/****************************************************************************************
/****************************************************************************************
* 33
* 33
* RAMPS 1.3 / 1.4
* RAMPS 1.3 / 1.4
* RAMPS_13_
EFB (Extruder
, Fan, Bed)
* RAMPS_13_
HFB (Hotend0
, Fan, Bed)
****************************************************************************************/
****************************************************************************************/
#if MB(RAMPS_13_
E
FB)
#if MB(RAMPS_13_
H
FB)
#define KNOWN_BOARD 1
#define KNOWN_BOARD 1
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
...
@@ -1044,7 +1044,7 @@
...
@@ -1044,7 +1044,7 @@
#define MAX6675_SS 66// Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS 66// Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
#endif
#endif // RAMPS_13_
E
FB
#endif // RAMPS_13_
H
FB
/****************************************************************************************/
/****************************************************************************************/
...
@@ -1052,10 +1052,10 @@
...
@@ -1052,10 +1052,10 @@
/****************************************************************************************
/****************************************************************************************
* 34
* 34
* RAMPS 1.3 / 1.4
* RAMPS 1.3 / 1.4
* RAMPS_13_
EEB (Extruder, Extruder
, Bed)
* RAMPS_13_
HHB (Hotend0, Hotend1
, Bed)
****************************************************************************************/
****************************************************************************************/
#if MB(RAMPS_13_
EE
B)
#if MB(RAMPS_13_
HH
B)
#define KNOWN_BOARD 1
#define KNOWN_BOARD 1
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
...
@@ -1255,10 +1255,10 @@
...
@@ -1255,10 +1255,10 @@
/****************************************************************************************
/****************************************************************************************
* 35
* 35
* RAMPS 1.3 / 1.4
* RAMPS 1.3 / 1.4
* RAMPS_13_
EFF (Extruder
, Fan, Fan)
* RAMPS_13_
HFF (Hotend0
, Fan, Fan)
****************************************************************************************/
****************************************************************************************/
#if MB(RAMPS_13_
E
FF)
#if MB(RAMPS_13_
H
FF)
#define KNOWN_BOARD 1
#define KNOWN_BOARD 1
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
...
@@ -1450,7 +1450,7 @@
...
@@ -1450,7 +1450,7 @@
#define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
#endif
#endif // RAMPS_13_
E
FF
#endif // RAMPS_13_
H
FF
/****************************************************************************************/
/****************************************************************************************/
...
@@ -1458,10 +1458,10 @@
...
@@ -1458,10 +1458,10 @@
/****************************************************************************************
/****************************************************************************************
* 36
* 36
* RAMPS 1.3 / 1.4
* RAMPS 1.3 / 1.4
* RAMPS_13_
EEF (Extruder, Extruder
, Fan)
* RAMPS_13_
HHF (Hotend0, Hotend1
, Fan)
****************************************************************************************/
****************************************************************************************/
#if MB(RAMPS_13_
EE
F)
#if MB(RAMPS_13_
HH
F)
#define KNOWN_BOARD 1
#define KNOWN_BOARD 1
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
...
@@ -1653,7 +1653,7 @@
...
@@ -1653,7 +1653,7 @@
#define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
#endif
#endif // RAMPS_13_
EE
F
#endif // RAMPS_13_
HH
F
/****************************************************************************************/
/****************************************************************************************/
...
@@ -1661,10 +1661,10 @@
...
@@ -1661,10 +1661,10 @@
/****************************************************************************************
/****************************************************************************************
* 37
* 37
* RAMPS 1.3 / 1.4
* RAMPS 1.3 / 1.4
* RAMPS_13_
EEF
(Hotend0, Hotend1, Hotend2)
* RAMPS_13_
HHH
(Hotend0, Hotend1, Hotend2)
****************************************************************************************/
****************************************************************************************/
#if MB(RAMPS_13_
EEE
)
#if MB(RAMPS_13_
HHH
)
#define KNOWN_BOARD 1
#define KNOWN_BOARD 1
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
...
@@ -1856,7 +1856,7 @@
...
@@ -1856,7 +1856,7 @@
#define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
#endif
#endif // RAMPS_13_
EEE
#endif // RAMPS_13_
HHH
/****************************************************************************************/
/****************************************************************************************/
...
...
MarlinKimbra/planner.cpp
View file @
65f6f7d7
...
@@ -51,14 +51,12 @@
...
@@ -51,14 +51,12 @@
#include "base.h"
#include "base.h"
#include "Marlin_main.h"
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
#endif
#include "planner.h"
#include "planner.h"
#include "stepper_indirection.h"
#include "stepper_indirection.h"
#include "stepper.h"
#include "stepper.h"
#include "temperature.h"
#include "temperature.h"
#include "ultralcd.h"
#include "ultralcd.h"
#include "language.h"
//===========================================================================
//===========================================================================
//============================= public variables ============================
//============================= public variables ============================
...
...
MarlinKimbra/planner.h
View file @
65f6f7d7
...
@@ -82,6 +82,8 @@ FORCE_INLINE uint8_t movesplanned() { return BLOCK_MOD(block_buffer_head - block
...
@@ -82,6 +82,8 @@ FORCE_INLINE uint8_t movesplanned() { return BLOCK_MOD(block_buffer_head - block
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
// Transform required to compensate for bed level
// Transform required to compensate for bed level
extern
matrix_3x3
plan_bed_level_matrix
;
extern
matrix_3x3
plan_bed_level_matrix
;
...
...
MarlinKimbra/sanitycheck.h
View file @
65f6f7d7
...
@@ -1450,9 +1450,7 @@
...
@@ -1450,9 +1450,7 @@
#if !PIN_EXISTS(Z_PROBE)
#if !PIN_EXISTS(Z_PROBE)
#error DEPENDENCY ERROR: You must set Z_PROBE_PIN to a valid pin if you enable Z_PROBE_ENDSTOP
#error DEPENDENCY ERROR: You must set Z_PROBE_PIN to a valid pin if you enable Z_PROBE_ENDSTOP
#endif
#endif
#if DISABLED(ENABLE_SERVOS)
#if ENABLED(ENABLE_SERVOS)
#error DEPENDENCY ERROR: You must enable ENABLE_SERVOS and must have NUM_SERVOS EXIST and there must be at least 1 configured to use Z_PROBE_ENDSTOP.
#endif
#if NUM_SERVOS < 1
#if NUM_SERVOS < 1
#error DEPENDENCY ERROR: You must have at least 1 servo EXIST for NUM_SERVOS to use Z_PROBE_ENDSTOP.
#error DEPENDENCY ERROR: You must have at least 1 servo EXIST for NUM_SERVOS to use Z_PROBE_ENDSTOP.
#endif
#endif
...
@@ -1463,6 +1461,7 @@
...
@@ -1463,6 +1461,7 @@
#error DEPENDENCY ERROR: You must have SERVO_ENDSTOP_ANGLES EXIST for Z Extend and Retract to use Z_PROBE_ENDSTOP.
#error DEPENDENCY ERROR: You must have SERVO_ENDSTOP_ANGLES EXIST for Z Extend and Retract to use Z_PROBE_ENDSTOP.
#endif
#endif
#endif
#endif
#endif
/**
/**
* Check if Probe_Offset * Grid Points is greater than Probing Range
* Check if Probe_Offset * Grid Points is greater than Probing Range
*/
*/
...
...
MarlinKimbra/servo.cpp
View file @
65f6f7d7
...
@@ -227,7 +227,7 @@ static boolean isTimerActive(timer16_Sequence_t timer) {
...
@@ -227,7 +227,7 @@ static boolean isTimerActive(timer16_Sequence_t timer) {
/****************** end of static functions ******************************/
/****************** end of static functions ******************************/
Servo
::
Servo
()
{
Servo
::
Servo
()
{
if
(
ServoCount
<
MAX_SERVOS
)
{
if
(
ServoCount
<
MAX_SERVOS
)
{
this
->
servoIndex
=
ServoCount
++
;
// assign a servo index to this instance
this
->
servoIndex
=
ServoCount
++
;
// assign a servo index to this instance
servo_info
[
this
->
servoIndex
].
ticks
=
usToTicks
(
DEFAULT_PULSE_WIDTH
);
// store default values - 12 Aug 2009
servo_info
[
this
->
servoIndex
].
ticks
=
usToTicks
(
DEFAULT_PULSE_WIDTH
);
// store default values - 12 Aug 2009
}
}
...
@@ -265,7 +265,8 @@ void Servo::detach() {
...
@@ -265,7 +265,8 @@ void Servo::detach() {
}
}
void
Servo
::
write
(
int
value
)
{
void
Servo
::
write
(
int
value
)
{
if
(
value
<
MIN_PULSE_WIDTH
)
{
// treat values less than 544 as angles in degrees (valid values in microseconds are handled as microseconds)
// treat values less than 544 as angles in degrees (valid values in microseconds are handled as microseconds)
if
(
value
<
MIN_PULSE_WIDTH
)
{
if
(
value
<
0
)
value
=
0
;
if
(
value
<
0
)
value
=
0
;
if
(
value
>
180
)
value
=
180
;
if
(
value
>
180
)
value
=
180
;
value
=
map
(
value
,
0
,
180
,
SERVO_MIN
(),
SERVO_MAX
());
value
=
map
(
value
,
0
,
180
,
SERVO_MIN
(),
SERVO_MAX
());
...
...
MarlinKimbra/stepper.cpp
View file @
65f6f7d7
...
@@ -1136,7 +1136,6 @@ long st_get_position(uint8_t axis) {
...
@@ -1136,7 +1136,6 @@ long st_get_position(uint8_t axis) {
float
st_get_position_mm
(
AxisEnum
axis
)
{
return
st_get_position
(
axis
)
/
axis_steps_per_unit
[
axis
];
}
float
st_get_position_mm
(
AxisEnum
axis
)
{
return
st_get_position
(
axis
)
/
axis_steps_per_unit
[
axis
];
}
void
enable_all_steppers
()
{
void
enable_all_steppers
()
{
enable_x
();
enable_x
();
enable_y
();
enable_y
();
...
...
MarlinKimbra/stepper.h
View file @
65f6f7d7
...
@@ -21,6 +21,8 @@
...
@@ -21,6 +21,8 @@
#ifndef STEPPER_H
#ifndef STEPPER_H
#define STEPPER_H
#define STEPPER_H
#include "planner.h"
#include "stepper_indirection.h"
/**
/**
* Axis indices as enumerated constants
* Axis indices as enumerated constants
...
...
MarlinKimbra/temperature.h
View file @
65f6f7d7
...
@@ -152,5 +152,4 @@ void setExtruderAutoFanState(int pin, bool state);
...
@@ -152,5 +152,4 @@ void setExtruderAutoFanState(int pin, bool state);
void
checkExtruderAutoFans
();
void
checkExtruderAutoFans
();
extern
void
autotempShutdown
();
extern
void
autotempShutdown
();
#endif // TEMPERATURE_H
#endif // TEMPERATURE_H
MarlinKimbra/ultralcd.cpp
View file @
65f6f7d7
This diff is collapsed.
Click to expand it.
MarlinKimbra/ultralcd.h
View file @
65f6f7d7
...
@@ -46,11 +46,6 @@
...
@@ -46,11 +46,6 @@
FORCE_INLINE
void
lcd_buttons_update
()
{}
FORCE_INLINE
void
lcd_buttons_update
()
{}
#endif
#endif
#if ENABLED(SDSUPPORT) && ENABLED(SD_SETTINGS)
extern
void
set_sd_dot
();
extern
void
unset_sd_dot
();
#endif
extern
int
plaPreheatHotendTemp
;
extern
int
plaPreheatHotendTemp
;
extern
int
plaPreheatHPBTemp
;
extern
int
plaPreheatHPBTemp
;
extern
int
plaPreheatFanSpeed
;
extern
int
plaPreheatFanSpeed
;
...
@@ -116,7 +111,7 @@
...
@@ -116,7 +111,7 @@
#elif ENABLED(NEXTION)
#elif ENABLED(NEXTION)
#define LCD_UPDATE_INTERVAL
1
00
#define LCD_UPDATE_INTERVAL
2
00
void
setpagePopCallback
(
void
*
ptr
);
void
setpagePopCallback
(
void
*
ptr
);
void
hotPopCallback
(
void
*
ptr
);
void
hotPopCallback
(
void
*
ptr
);
...
@@ -152,6 +147,11 @@
...
@@ -152,6 +147,11 @@
#endif //ULTRA_LCD
#endif //ULTRA_LCD
#if ENABLED(SDSUPPORT) && ENABLED(SD_SETTINGS)
extern
void
set_sd_dot
();
extern
void
unset_sd_dot
();
#endif
char
*
itostr2
(
const
uint8_t
&
x
);
char
*
itostr2
(
const
uint8_t
&
x
);
char
*
itostr31
(
const
int
&
xx
);
char
*
itostr31
(
const
int
&
xx
);
char
*
itostr3
(
const
int
&
xx
);
char
*
itostr3
(
const
int
&
xx
);
...
...
MarlinKimbra/vector_3.cpp
View file @
65f6f7d7
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
License along with this library; if not, write to the Free Software
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
#include <math.h>
#include "base.h"
#include "base.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
...
...
MarlinKimbra/vector_3.h
View file @
65f6f7d7
...
@@ -57,4 +57,4 @@ struct matrix_3x3
...
@@ -57,4 +57,4 @@ struct matrix_3x3
void
apply_rotation_xyz
(
matrix_3x3
rotationMatrix
,
float
&
x
,
float
&
y
,
float
&
z
);
void
apply_rotation_xyz
(
matrix_3x3
rotationMatrix
,
float
&
x
,
float
&
y
,
float
&
z
);
#endif //
AUTO_BED_LEVELING_FEATURE
#endif //
VECTOR_3_H
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