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
d57ece57
Commit
d57ece57
authored
9 years ago
by
Simone Primarosa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update 5.0.0 dev
First flash successuful
parent
cb9f5b7c
Changes
32
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
58 additions
and
47 deletions
+58
-47
[need update]Features.md
Documentation/[need update]Features.md
+0
-0
[need update]LCD Menu Tree.pdf
Documentation/[need update]LCD Menu Tree.pdf
+0
-0
[need update]Menu Plans.xlsx
Documentation/[need update]Menu Plans.xlsx
+0
-0
changelog.md
Documentation/changelog.md
+9
-0
MarlinKimbra.ino
MarlinKimbra/MarlinKimbra.ino
+1
-1
MarlinSerial.cpp
MarlinKimbra/MarlinSerial.cpp
+1
-1
Marlin_main.cpp
MarlinKimbra/Marlin_main.cpp
+6
-4
Sd2Card.cpp
MarlinKimbra/Sd2Card.cpp
+1
-1
Sd2Card.h
MarlinKimbra/Sd2Card.h
+1
-1
SdBaseFile.cpp
MarlinKimbra/SdBaseFile.cpp
+1
-1
SdFatUtil.h
MarlinKimbra/SdFatUtil.h
+1
-1
SdFile.cpp
MarlinKimbra/SdFile.cpp
+1
-1
SdVolume.cpp
MarlinKimbra/SdVolume.cpp
+1
-1
base.h
MarlinKimbra/base.h
+2
-2
blinkm.cpp
MarlinKimbra/blinkm.cpp
+1
-1
buzzer.cpp
MarlinKimbra/buzzer.cpp
+1
-1
cardreader.cpp
MarlinKimbra/cardreader.cpp
+1
-1
configuration_store.cpp
MarlinKimbra/configuration_store.cpp
+1
-1
configuration_store.h
MarlinKimbra/configuration_store.h
+1
-1
digipot_mcp4451.cpp
MarlinKimbra/digipot_mcp4451.cpp
+1
-1
external_dac.cpp
MarlinKimbra/external_dac.cpp
+1
-1
firmware_test.cpp
MarlinKimbra/firmware_test.cpp
+1
-1
planner.cpp
MarlinKimbra/planner.cpp
+1
-1
qr_solve.cpp
MarlinKimbra/qr_solve.cpp
+1
-1
sanitycheck.h
MarlinKimbra/sanitycheck.h
+16
-16
servo.cpp
MarlinKimbra/servo.cpp
+1
-1
stepper.cpp
MarlinKimbra/stepper.cpp
+1
-1
stepper_indirection.cpp
MarlinKimbra/stepper_indirection.cpp
+1
-1
temperature.cpp
MarlinKimbra/temperature.cpp
+1
-1
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+1
-1
vector_3.cpp
MarlinKimbra/vector_3.cpp
+1
-1
watchdog.cpp
MarlinKimbra/watchdog.cpp
+1
-1
No files found.
Documentation/Features.md
→
Documentation/
[need update]
Features.md
View file @
d57ece57
File moved
This diff is collapsed.
Click to expand it.
Documentation/[need update
d
]LCD Menu Tree.pdf
→
Documentation/[need update]LCD Menu Tree.pdf
View file @
d57ece57
File moved
This diff is collapsed.
Click to expand it.
Documentation/[need update
d
]Menu Plans.xlsx
→
Documentation/[need update]Menu Plans.xlsx
View file @
d57ece57
File moved
This diff is collapsed.
Click to expand it.
Documentation/changelog.md
View file @
d57ece57
### Version 5.0.0
*
New configuration systems (Now you can create a separate file with all configuration and use it in you FW update)
*
New namings for file
*
Added more documentation inside configuration file
*
More checks for feature incompatibility during compilation
*
Codeclean
*
General bugfix
*
Removed legacy support for old configuration (Do not use your old configuration files, namings and position for configuration has changed)
### Version 4.1.5
*
Added dot for SD write operation
*
Added statistics menu
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/MarlinKimbra.ino
View file @
d57ece57
...
...
@@ -30,7 +30,7 @@
/* All the implementation is done in *.cpp files to get better compatibility with avr-gcc without the Arduino IDE */
/* Use this file to help the Arduino IDE find which Arduino libraries are needed and to keep documentation on GCode */
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(DIGIPOT_I2C) || ENABLED(BLINKM)
#include <Wire.h>
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/MarlinSerial.cpp
View file @
d57ece57
...
...
@@ -20,7 +20,7 @@
Modified 28 September 2010 by Mark Sproul
*/
#include "
elements
.h"
#include "
base
.h"
#include "MarlinSerial.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/Marlin_main.cpp
View file @
d57ece57
...
...
@@ -27,11 +27,11 @@
* - http://reprap.org/pipermail/reprap-dev/2011-May/003323.html
*/
#include "
elements
.h"
#include "
base
.h"
#include "Marlin_main.h"
#include "ultralcd.h"
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
#if ENABLED(AUTO_BED_LEVELING_GRID)
...
...
@@ -4282,7 +4282,7 @@ inline void gcode_G92() {
hasS
=
codenum
>
0
;
}
if
(
HASNTP
&&
HASNT
S
&&
*
args
!=
'\0'
)
if
(
!
hasP
&&
!
has
S
&&
*
args
!=
'\0'
)
lcd_setstatus
(
args
,
true
);
else
{
LCD_MESSAGEPGM
(
MSG_USERWAIT
);
...
...
@@ -8087,7 +8087,9 @@ void kill(const char *lcd_msg) {
sei
();
// enable interrupts
for
(
int
i
=
5
;
i
--
;
lcd_update
())
delay
(
200
);
// Wait a short time
cli
();
// disable interrupts
suicide
();
#if HAS(SUICIDE)
suicide
();
#endif
while
(
1
)
{
/* Intentionally left empty */
}
// Wait for reset
}
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/Sd2Card.cpp
View file @
d57ece57
...
...
@@ -17,7 +17,7 @@
* along with the Arduino Sd2Card Library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(SDSUPPORT)
#include "Sd2Card.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/Sd2Card.h
View file @
d57ece57
...
...
@@ -20,7 +20,7 @@
#ifndef Sd2Card_h
#define Sd2Card_h
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(SDSUPPORT)
/**
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/SdBaseFile.cpp
View file @
d57ece57
...
...
@@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/>.
*/
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(SDSUPPORT)
#include "Marlin_main.h"
#include <stdint.h>
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/SdFatUtil.h
View file @
d57ece57
...
...
@@ -24,7 +24,7 @@
* \file
* \brief Useful utility functions.
*/
#include "
elements
.h"
#include "
base
.h"
#include "MarlinSerial.h"
/** Store and print a string in flash memory.*/
#define PgmPrint(x) SerialPrint_P(PSTR(x))
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/SdFile.cpp
View file @
d57ece57
...
...
@@ -17,7 +17,7 @@
* along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(SDSUPPORT)
#include "Marlin_main.h"
#include "SdFile.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/SdVolume.cpp
View file @
d57ece57
...
...
@@ -17,7 +17,7 @@
* along with the Arduino SdFat Library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#include "
elements
.h"
#include "
base
.h"
#include "Marlin_main.h"
#if ENABLED(SDSUPPORT)
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/
elements
.h
→
MarlinKimbra/
base
.h
View file @
d57ece57
#ifndef
ELEMENTS
_H
#define
ELEMENTS
_H
#ifndef
BASE
_H
#define
BASE
_H
#include "Arduino.h"
#include "pins_arduino.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/blinkm.cpp
View file @
d57ece57
...
...
@@ -3,7 +3,7 @@
Created by Tim Koster, August 21 2013.
*/
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(BLINKM)
#include "blinkm.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/buzzer.cpp
View file @
d57ece57
#include "
elements
.h"
#include "
base
.h"
#if HAS(BUZZER)
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/cardreader.cpp
View file @
d57ece57
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(SDSUPPORT)
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/configuration_store.cpp
View file @
d57ece57
#include "
elements
.h"
#include "
base
.h"
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/configuration_store.h
View file @
d57ece57
#ifndef CONFIGURATION_STORE_H
#define CONFIGURATION_STORE_H
#include "
elements
.h"
#include "
base
.h"
void
Config_ResetDefault
();
void
ConfigSD_ResetDefault
();
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/digipot_mcp4451.cpp
View file @
d57ece57
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(DIGIPOT_I2C)
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/external_dac.cpp
View file @
d57ece57
...
...
@@ -3,7 +3,7 @@
* Externa DAC for Alligator Board
*
****************************************************************/
#include "
elements
.h"
#include "
base
.h"
#if MB(ALLIGATOR)
#include "stepper.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/firmware_test.cpp
View file @
d57ece57
...
...
@@ -4,7 +4,7 @@
By MagoKimbra
*/
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(FIRMWARE_TEST)
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/planner.cpp
View file @
d57ece57
...
...
@@ -48,7 +48,7 @@
*
*/
#include "
elements
.h"
#include "
base
.h"
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/qr_solve.cpp
View file @
d57ece57
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && ENABLED(AUTO_BED_LEVELING_GRID)
#include "qr_solve.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/sanitycheck.h
View file @
d57ece57
...
...
@@ -1594,56 +1594,56 @@
#if ENABLED(MKR4)
#if (EXTRUDERS == 2) && (DRIVER_EXTRUDERS == 1) && !PIN_EXIST(E0E1_CHOICE_PIN)
#if (EXTRUDERS == 2) && (DRIVER_EXTRUDERS == 1) && !PIN_EXIST
S
(E0E1_CHOICE_PIN)
#error DEPENDENCY ERROR: You have to set E0E1_CHOICE_PIN to a valid pin if you enable MKR4 with 2 extruder and 1 driver
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXIST
(E0E1_CHOICE_PIN) || !PIN_EXIST
(E0E2_CHOICE_PIN))
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXIST
S(E0E1_CHOICE_PIN) || !PIN_EXISTS
(E0E2_CHOICE_PIN))
#error DEPENDENCY ERROR: You have to set E0E1_CHOICE_PIN and E0E2_CHOICE_PIN to a valid pin if you enable MKR4 with 3 extruder and 1 driver
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXIST
(E0E1_CHOICE_PIN) || !PIN_EXIST(E0E2_CHOICE_PIN) || !PIN_EXIST
(E0E3_CHOICE_PIN))
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 1) && (!PIN_EXIST
S(E0E1_CHOICE_PIN) || !PIN_EXISTS(E0E2_CHOICE_PIN) || !PIN_EXISTS
(E0E3_CHOICE_PIN))
#error DEPENDENCY ERROR: You have to set E0E1_CHOICE_PIN, E0E2_CHOICE_PIN and E0E3_CHOICE_PIN to a valid pin if you enable MKR4 with 4 extruder and 1 driver
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 2) && !PIN_EXIST(E0E2_CHOICE_PIN)
#elif (EXTRUDERS == 3) && (DRIVER_EXTRUDERS == 2) && !PIN_EXIST
S
(E0E2_CHOICE_PIN)
#error DEPENDENCY ERROR: You have to set E0E2_CHOICE_PIN to a valid pin if you enable MKR4 with 3 extruder and 2 driver
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 2) && (!PIN_EXIST
(E0E1_CHOICE_PIN) || !PIN_EXIST
(E1E3_CHOICE_PIN))
#elif (EXTRUDERS == 4) && (DRIVER_EXTRUDERS == 2) && (!PIN_EXIST
S(E0E1_CHOICE_PIN) || !PIN_EXISTS
(E1E3_CHOICE_PIN))
#error DEPENDENCY ERROR: You have to set E0E2_CHOICE_PIN and E1E3_CHOICE_PIN to a valid pin if you enable MKR4 with 4 extruder and 2 driver
#endif
#endif
#if ENABLED(NPR2) && !PIN_EXIST(E_MIN_PIN)
#if ENABLED(NPR2) && !PIN_EXIST
S
(E_MIN_PIN)
#error DEPENDENCY ERROR: You have to set E_MIN_PIN to a valid pin if you enable NPR2
#endif
#if ENABLED(LASERBEAM) && (!PIN_EXIST
(LASER_PWR_PIN) || !PIN_EXIST
(LASER_TTL_PIN))
#if ENABLED(LASERBEAM) && (!PIN_EXIST
S(LASER_PWR_PIN) || !PIN_EXISTS
(LASER_TTL_PIN))
#error DEPENDENCY ERROR: You have to set LASER_PWR_PIN and LASER_TTL_PIN to a valid pin if you enable LASERBEAM
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && !PIN_EXIST(FILRUNOUT_PIN)
#if ENABLED(FILAMENT_RUNOUT_SENSOR) && !PIN_EXIST
S
(FILRUNOUT_PIN)
#error DEPENDENCY ERROR: You have to set FILRUNOUT_PIN to a valid pin if you enable FILAMENT_RUNOUT_SENSOR
#endif
#if ENABLED(FILAMENT_SENSOR) && !PIN_EXIST(FILWIDTH_PIN)
#if ENABLED(FILAMENT_SENSOR) && !PIN_EXIST
S
(FILWIDTH_PIN)
#error DEPENDENCY ERROR: You have to set FILWIDTH_PIN to a valid pin if you enable FILAMENT_SENSOR
#endif
#if ENABLED(POWER_CONSUMPTION) && !PIN_EXIST(POWER_CONSUMPTION_PIN)
#if ENABLED(POWER_CONSUMPTION) && !PIN_EXIST
S
(POWER_CONSUMPTION_PIN)
#error DEPENDENCY ERROR: You have to set POWER_CONSUMPTION_PIN to a valid pin if you enable POWER_CONSUMPTION
#endif
#if ENABLED(PHOTOGRAPH) && !PIN_EXIST(PHOTOGRAPH_PIN)
#if ENABLED(PHOTOGRAPH) && !PIN_EXIST
S
(PHOTOGRAPH_PIN)
#error DEPENDENCY ERROR: You have to set PHOTOGRAPH_PIN to a valid pin if you enable PHOTOGRAPH
#endif
#if ENABLED(CHDK) && !PIN_EXIST(CHDK_PIN)
#if ENABLED(CHDK) && !PIN_EXIST
S
(CHDK_PIN)
#error DEPENDENCY ERROR: You have to set CHDK_PIN to a valid pin if you enable CHDK
#endif
#if ENABLED(CONTROLLERFAN) && !PIN_EXIST(CONTROLLERFAN_PIN)
#if ENABLED(CONTROLLERFAN) && !PIN_EXIST
S
(CONTROLLERFAN_PIN)
#error DEPENDENCY ERROR: You have to set CONTROLLERFAN_PIN to a valid pin if you enable CONTROLLERFAN
#endif
#if ENABLED(EXTRUDER_AUTO_FAN) && !PIN_EXIST
(EXTRUDER_0_AUTO_FAN_PIN) && !PIN_EXIST(EXTRUDER_1_AUTO_FAN_PIN) && !PIN_EXIST(EXTRUDER_2_AUTO_FAN_PIN) && !PIN_EXIST
(EXTRUDER_3_AUTO_FAN_PIN)
#if ENABLED(EXTRUDER_AUTO_FAN) && !PIN_EXIST
S(EXTRUDER_0_AUTO_FAN_PIN) && !PIN_EXISTS(EXTRUDER_1_AUTO_FAN_PIN) && !PIN_EXISTS(EXTRUDER_2_AUTO_FAN_PIN) && !PIN_EXISTS
(EXTRUDER_3_AUTO_FAN_PIN)
#error DEPENDENCY ERROR: You have to set at least one EXTRUDER_?_AUTO_FAN_PIN to a valid pin if you enable EXTRUDER_AUTO_FAN
#endif
#if ENABLED(X2_IS_TMC) && (!PIN_EXIST
(X2_ENABLE_PIN) || !PIN_EXIST(X2_STEP_PIN) || !PIN_EXIST
(X2_DIR_PIN))
#if ENABLED(X2_IS_TMC) && (!PIN_EXIST
S(X2_ENABLE_PIN) || !PIN_EXISTS(X2_STEP_PIN) || !PIN_EXISTS
(X2_DIR_PIN))
#error DEPENDENCY ERROR: You have to set X2_ENABLE_PIN, X2_STEP_PIN and X2_DIR_PIN to a valid pin if you enable X2_IS_TMC
#endif
...
...
@@ -1651,7 +1651,7 @@
#error DEPENDENCY ERROR: You have to set at least one SERVO?_PIN to a valid pin if you enable ENABLE_SERVOS
#endif
#if ENABLED(Z_PROBE_SLED)
!PIN_EXIST
(SLED_PIN)
#if ENABLED(Z_PROBE_SLED)
&& !PIN_EXISTS
(SLED_PIN)
#error DEPENDENCY ERROR: You have to set SLED_PIN to a valid pin if you enable Z_PROBE_SLED
#endif
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/servo.cpp
View file @
d57ece57
...
...
@@ -44,7 +44,7 @@
*/
#include "
elements
.h"
#include "
base
.h"
#if HAS(SERVOS)
#include "servo.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/stepper.cpp
View file @
d57ece57
...
...
@@ -22,7 +22,7 @@
/* The timer calculations of this module informed by the 'RepRap cartesian firmware' by Zack Smith
and Philipp Tiefenbacher. */
#include "
elements
.h"
#include "
base
.h"
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/stepper_indirection.cpp
View file @
d57ece57
...
...
@@ -19,7 +19,7 @@
along with Marlin. If not, see <http://www.gnu.org/licenses/>.
*/
#include "
elements
.h"
#include "
base
.h"
#include "stepper_indirection.h"
#if ENABLED(HAVE_TMCDRIVER)
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/temperature.cpp
View file @
d57ece57
...
...
@@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "
elements
.h"
#include "
base
.h"
#include "Marlin_main.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/ultralcd.cpp
View file @
d57ece57
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(ULTRA_LCD)
#include "Marlin_main.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/vector_3.cpp
View file @
d57ece57
...
...
@@ -17,7 +17,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
#include "vector_3.h"
...
...
This diff is collapsed.
Click to expand it.
MarlinKimbra/watchdog.cpp
View file @
d57ece57
#include "
elements
.h"
#include "
base
.h"
#if ENABLED(USE_WATCHDOG)
#include <avr/wdt.h>
#include "whatchdog.h"
...
...
This diff is collapsed.
Click to expand it.
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