 daid
|
993bcd370f
|
Merge pull request #1373 from MarlinFirmware/revert-1350-Development
Revert "Reduce PROGMEM warnings"
|
2015-01-16 16:48:41 +01:00 |
|
|
daid
|
53f971095d
|
Revert "Reduce PROGMEM warnings"
|
2015-01-16 16:48:22 +01:00 |
|
|
daid
|
a5c059dcf5
|
Merge branch 'revert-1154-sd_sorting' into Marlin_v1
|
2014-12-18 23:14:15 +01:00 |
|
|
daid
|
17de96ace7
|
Merge branch 'Marlin_v1' into revert-1154-sd_sorting
Conflicts:
Marlin/cardreader.cpp
Marlin/cardreader.h
|
2014-12-18 23:13:50 +01:00 |
|
|
daid
|
c13a831ea1
|
Merge pull request #1017 from foosel/fix/checksum_truncation_bug
Fix for a wrong checksum truncation for certain commands
|
2014-07-24 19:41:34 +02:00 |
|
|
daid
|
aacff0d361
|
Merge pull request #948 from Dim3nsioneer/Marlin_v1
Implementation of FW extruder change retract
|
2014-07-18 16:10:15 +02:00 |
|
|
daid
|
4c823224b0
|
Merge pull request #965 from bq/forced_heating_stop
Fixed stop print LCD function on M104
|
2014-06-30 18:50:26 +02:00 |
|
|
daid
|
2acd3792fc
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2014-05-01 12:03:47 +02:00 |
|
|
daid
|
8b4c4aa5c3
|
Add feature to check&retry CRC read errors on SD.
|
2014-05-01 12:03:41 +02:00 |
|
|
daid
|
46bae30573
|
Merge pull request #776 from whosawhatsis/fwretract
Fwretract fixes, cleanup
|
2014-02-18 10:39:28 +01:00 |
|
|
daid
|
c31bb2b7ad
|
Only show the ZProbe offset when auto-bed-leveling is enabled.
|
2014-02-13 11:48:55 +01:00 |
|
|
daid
|
46f5bea19f
|
Add configurable beep for UltiPanel.
|
2014-02-13 11:17:33 +01:00 |
|
|
daid
|
d16a770855
|
Ultimainboard 2.x does not has a PS_ON pin.
|
2014-02-13 10:57:03 +01:00 |
|
|
daid
|
71bb3a8133
|
Add comments for Ultimainboard 2.0 configuration.
|
2014-02-13 10:53:46 +01:00 |
|
|
daid
|
9b7d87e885
|
Remove duplicate contrast define.
|
2014-02-13 10:50:17 +01:00 |
|
|
daid
|
816f0a678a
|
Merge pull request #768 from whosawhatsis/Marlin_v1
multiple FWretract fixes
|
2014-02-13 09:14:57 +01:00 |
|
|
daid
|
df194f75e1
|
Added PT100 support for Ultiboard2
|
2014-01-06 11:20:03 +01:00 |
|
|
daid
|
380144c20f
|
Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original.
|
2014-01-06 11:05:02 +01:00 |
|
|
daid
|
a504c88346
|
Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.
|
2013-08-01 14:12:30 +02:00 |
|
|
daid
|
acb3271c9a
|
Merge pull request #534 from xifle/Marlin_v1
Fixes compiler warning for feedrate deadzone
|
2013-07-01 23:41:51 -07:00 |
|
|
daid
|
d77f5ee722
|
Merge pull request #532 from codexmas/ServoEndstops
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
|
2013-06-28 08:04:55 -07:00 |
|
|
daid
|
e3bc420daa
|
Merge pull request #464 from arnoudja/Marlin_v1
Solved minor bug in controllerFan()
|
2013-05-03 12:38:23 -07:00 |
|
|
daid
|
727aa2a051
|
Merge pull request #459 from martinxyz/fix-rounding-error
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
|
2013-05-02 08:34:03 -07:00 |
|
|
daid
|
4b2ece159b
|
Merge pull request #453 from brackendawson/Marlin_v1
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
|
2013-04-16 10:12:25 -07:00 |
|
|
daid303
|
34bca48b98
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2013-04-15 15:11:38 +02:00 |
|
|
daid303
|
ac52dcc174
|
Updated the card menu and watch messages to make it more informative.
|
2013-04-15 15:11:22 +02:00 |
|
|
daid
|
84920e9c58
|
Merge pull request #449 from Stefanowicz/Marlin_v1
Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined
|
2013-04-12 13:45:15 -07:00 |
|
|
daid303
|
c80a78bb70
|
Lower the default max E feedrate a bit. With the stepper fix this is much to high.
|
2013-04-12 13:54:38 +02:00 |
|
 daidandDirk Eichel
|
af78d0cbfa
|
Merge pull request #1 from illuminarti/Fix_E_Speed
Fix step rate bug (especially for retraction)
|
2013-03-18 23:36:11 +01:00 |
|
|
daid
|
d6ce63c49c
|
Merge pull request #411 from STB3/Marlin_w_STB_Board_support
Add STB board support to Marlin (next step towards graphic LCD implementation)
|
2013-03-18 07:57:39 -07:00 |
|
|
daid
|
92782f9252
|
Merge pull request #1 from illuminarti/Fix_E_Speed
Fix step rate bug (especially for retraction)
|
2013-03-15 09:07:34 +01:00 |
|
|
daid
|
b3ebb71704
|
Merge pull request #408 from STB3/Marlin_with_ATmega1284p_Sanguino_on_023_support
Marlin with ATmega1284p sanguino support under Arduino 023
|
2013-03-01 06:08:18 -08:00 |
|
|
daid303
|
4eb81a69e6
|
Only compile the new extruder offset code if you have multiple extruders.
|
2013-02-27 12:32:07 +01:00 |
|
|
daid
|
3e9cd334a4
|
Merge pull request #383 from dob71/jeff
Hotend offset handling for multi-extruder machines
|
2013-02-27 03:10:18 -08:00 |
|
|
daid303
|
de3dec7215
|
Also show the tune menu when USB printing.
|
2013-02-20 00:54:44 +01:00 |
|
|
daid
|
63da4dc59a
|
Merge pull request #398 from DanieleSdei/Marlin_v1
Marlin v1, alignment of the Italian language
|
2013-02-16 15:41:43 -08:00 |
|
|
daid
|
7eb9811958
|
Merge pull request #397 from codenamepawel/patch-1
Update Marlin/language.h
|
2013-02-16 15:41:07 -08:00 |
|
|
daid303
|
2f60e324dc
|
Fixed #394
|
2013-02-14 14:04:26 +01:00 |
|
|
daid
|
5e2abfcdcd
|
Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu
Add SD-Card change and SD-Card init. for electronics equipped with LCD Display
|
2013-02-13 08:56:00 -08:00 |
|
|
daid
|
fa5c45f515
|
Merge pull request #392 from mfeherpataky/Marlin_v1
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
|
2013-02-13 08:54:58 -08:00 |
|
|
daid
|
be91fb9b47
|
Merge pull request #389 from mfeherpataky/Marlin_v1
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
|
2013-02-12 07:56:15 -08:00 |
|
|
daid
|
18fcc367d2
|
Merge pull request #371 from Banjer/Melzi_LED_PIN
Chenged LED_PIN for Melzi boards, added comment about broken versions of...
|
2013-02-02 03:23:43 -08:00 |
|
|
daid
|
6b78edf7c5
|
Merge pull request #374 from kintel/quickstop
compile fix: quickStop() needs stepper.h
|
2013-02-01 13:54:12 -08:00 |
|
|
daid303
|
408b349a84
|
Fixed #368. Commented out the wrong pin definition, but explained why it is there.
|
2013-01-21 15:46:17 +01:00 |
|
|
daid
|
236bb2c110
|
Merge pull request #365 from DanieleSdei/Marlin_v1
Marlin v1, italian MSG_RESUMING and RepRapPro thermistor tables.
|
2013-01-14 08:29:55 -08:00 |
|
|
daid
|
c1730e2b08
|
Merge pull request #363 from yuroller/sanguino_panelolu
Panelolu pin assignment for sanguinololu
|
2013-01-10 07:19:37 -08:00 |
|
|
daid303
|
0f3f5d083d
|
Minor cleanup of the new FAN_KICKSTART code. #334
|
2013-01-10 11:08:45 +01:00 |
|
|
daid
|
6ec56fa923
|
Merge pull request #334 from KevinOConnor/FanKick
Add feature to briefly run the cooling fan at full speed when it first starts.
|
2013-01-09 02:47:59 -08:00 |
|
|
daid
|
965baf2683
|
Merge pull request #362 from daid/Marlin_v1
Finnish language
|
2013-01-09 02:42:09 -08:00 |
|
|
daid
|
4fde836d83
|
Merge pull request #8 from randomev/Marlin_v1
+ Finnish translation
|
2013-01-09 02:39:43 -08:00 |
|
|
daid303
|
14e1d495ef
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2013-01-08 17:10:30 +01:00 |
|
|
daid303
|
bbe7d3d0fe
|
Fixed #312
|
2013-01-08 17:09:57 +01:00 |
|
|
daid
|
7ce509b9a7
|
Merge pull request #361 from yuroller/MakefileSanguino
Makefile sanguino
|
2013-01-08 06:22:27 -08:00 |
|
|
daid303
|
442ade15a6
|
Move Gen6 stuff into a proper location.
|
2013-01-08 12:31:28 +01:00 |
|
|
daid
|
5fd4582cc8
|
Merge pull request #242 from Drakelive/Marlin_v1
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
|
2013-01-08 03:29:20 -08:00 |
|
|
daid303
|
8b88e3b386
|
Fixed #345, Fixed #267.
|
2013-01-08 12:14:55 +01:00 |
|
|
daid
|
27843388c6
|
Merge pull request #360 from njprossi/Marlin_v1
Power signal control definitions for other power supplies
|
2013-01-08 02:58:02 -08:00 |
|
|
daid303
|
bfa5bb86e4
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2013-01-08 11:54:13 +01:00 |
|
|
daid303
|
921273baa0
|
Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit.
|
2013-01-08 11:53:18 +01:00 |
|
|
daid
|
3a1cd30ce1
|
Merge pull request #358 from yuroller/sanguino_spi
Definitions for Sanguino SPI
|
2013-01-04 11:53:10 -08:00 |
|
|
daid303
|
5e3873c8db
|
Add german MSG_RESUMING.
|
2012-12-25 20:53:11 +01:00 |
|
|
daid303
|
01aac2a142
|
Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
|
2012-12-21 16:14:47 +01:00 |
|
|
daid303
|
b69cb9fbd9
|
Change the end of SD cart print message from minutes/seconds to hours/minutes.
|
2012-12-19 12:26:40 +01:00 |
|
|
daid
|
30254e3388
|
Merge pull request #350 from jcrocholl/Marlin_v1
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
|
2012-12-17 02:16:31 -08:00 |
|
|
daid303
|
38ee395ac7
|
Replace the 1ms delay for 2 nops to get a 100ns delay. #259
|
2012-12-17 11:12:11 +01:00 |
|
|
daid303
|
5df5e4c4a2
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2012-12-17 11:09:18 +01:00 |
|
|
daid303
|
a95dcd74e7
|
Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
|
2012-12-17 11:09:09 +01:00 |
|
|
daid
|
ab318beaaf
|
Merge pull request #348 from oni303/Marlin_v1
fixed (#328) pwm generation at pin D12 and D13
|
2012-12-17 02:08:28 -08:00 |
|
|
daid
|
83ea7dc5b9
|
Merge pull request #342 from setar/Marlin_v1
Fix the russian translation.
|
2012-12-14 05:04:41 -08:00 |
|
|
daid303
|
6123a00e64
|
Fix the german translation.
|
2012-12-14 11:11:02 +01:00 |
|
|
daid303
|
7c21716886
|
Fixed #341
|
2012-12-14 10:53:11 +01:00 |
|
|
daid303
|
ae1bc83350
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2012-12-13 13:25:22 +01:00 |
|
|
daid303
|
596a7e1904
|
Fix compiling for Arduin < 1.0.0
|
2012-12-13 13:24:55 +01:00 |
|
|
Daid
|
b264317fa0
|
Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues.
|
2012-12-13 12:19:12 +01:00 |
|
|
Daid
|
673577a31b
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2012-12-13 11:41:34 +01:00 |
|
|
Daid
|
23022f1a82
|
Updates to Makefile to compile for Teensy.
|
2012-12-13 11:41:27 +01:00 |
|
|
daid
|
96e9db8919
|
Merge pull request #339 from KevinOConnor/CompilerFlags
Add additional optimization flags to Makefile
|
2012-12-13 01:30:17 -08:00 |
|
|
daid303
|
08356361ac
|
Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING
|
2012-12-13 10:25:29 +01:00 |
|
|
daid303
|
047d037f8c
|
#ifdef fix for #326
|
2012-12-13 09:04:41 +01:00 |
|
|
daid303
|
f30b46b2a8
|
One more fix for #338, I really should get a heated bed to test with.
|
2012-12-12 23:06:17 +01:00 |
|
|
daid303
|
65c3f1ffcd
|
Most likely fixing #338
|
2012-12-12 21:56:17 +01:00 |
|
|
daid303
|
7577717b59
|
Fixed #336
|
2012-12-12 13:08:26 +01:00 |
|
|
daid303
|
1a8f54cea1
|
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
|
2012-12-12 11:47:03 +01:00 |
|
|
daid303
|
6731c094ee
|
Fix compiling with just an 16x2 LCD and no buttons.
|
2012-12-12 11:32:33 +01:00 |
|
|
daid303
|
b99a928a80
|
Fix the M117 (display message on LCD) when used over USB with checksums.
|
2012-12-12 09:35:32 +01:00 |
|
|
daid303
|
55ba90ac19
|
Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target.
|
2012-12-12 09:08:37 +01:00 |
|
|
daid303
|
5ff5cee8ce
|
Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition)
|
2012-12-11 14:53:53 +01:00 |
|
|
daid303
|
8b58edc70e
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2012-12-11 13:38:34 +01:00 |
|
|
daid
|
d0319d45af
|
Merge pull request #335 from jcrocholl/Marlin_v1
Fix endstop pins for Printrboard
|
2012-12-11 02:59:58 -08:00 |
|
|
daid303
|
46ec4b648c
|
Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.
|
2012-12-11 10:21:44 +01:00 |
|
|
Daid
|
724f5aa36b
|
Update on makefile for moved Arduino addons.
|
2012-12-10 12:06:30 +01:00 |
|
|
daid303
|
6d9dfa96c3
|
Move the Arduino related stuff out of the Marlin tree, as they are not directly related to Marlin functionality but addons for the Arduino IDE. Also split up the addons for pre 1.0.0 Arduino and post 1.0.0 Arduino.
|
2012-12-10 12:02:29 +01:00 |
|
|
daid303
|
3fb07d9b8d
|
Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.
|
2012-12-10 10:48:46 +01:00 |
|
|
daid303
|
82c8724b33
|
Fix compile with PID_DEBUG
|
2012-12-09 23:50:12 +01:00 |
|
|
daid303
|
9b160972a1
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2012-12-09 23:46:42 +01:00 |
|
|
daid303
|
e036750bdf
|
Use the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4)
|
2012-12-09 23:46:25 +01:00 |
|
|
Daid
|
fcd9de72ef
|
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
|
2012-12-09 23:31:07 +01:00 |
|
|
Daid
|
32d4373e0f
|
Add printrboard and brainwave to Makefile.
|
2012-12-09 23:30:55 +01:00 |
|
|
daid
|
b3ddbcee2a
|
Merge pull request #329 from jcrocholl/Marlin_v1
Add Printrboard and Brainwave to pins.h and fastio.h
|
2012-12-09 14:29:26 -08:00 |
|
|
Daid
|
29435dfb4b
|
Proper avr for Sanguino in Makefile.
|
2012-12-09 23:02:03 +01:00 |
|