melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,302 Commits 2 Branches 0 Tags 2 GiB
641b30217e
Commit Graph

4302 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fmalpartida
f92907183c Updated SAV MkI pin header. 2015-06-08 05:07:11 -05:00
Richard Wackerbarth
58941e543e ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED removed 
#defining something just to define something else doesn’t
make sense

If you want SDCARDDETECTINVERTED, just define it yourself.

If the previous code was intended to define, undefined and then again define the term, that code is improper.
 2015-06-06 21:44:59 -05:00
Richard Wackerbarth
cf5d64d940 Merge PR #2118 2015-06-06 20:14:50 -05:00
CONSULitAS
788eb6e647 planner.cpp: remove tab 
planner.cpp: single evil and hidden tab removed ♻️ 😏
 2015-06-06 20:13:56 -05:00
CONSULitAS
3a5963c0e7 Configuration_adv.h: Add FAN_MIN_PWM for slow fan stopping issue … 
* all Configuration_adv.h: Add #define FAN_MIN_PWM for slow fan stopping
issue
* for K8200: uncommented with tested (and working) values
 2015-06-06 20:13:56 -05:00
CONSULitAS
e55e65d1e4 planner.cpp: Add FAN_MIN_PWM for slow fan stopping issue … 
@CONSULitAS

planner.cpp: Add FAN_MIN_PWM for slow fan stopping issue (V2.1 with
macro and linear scaling)

@thinkyhead thanks for idea on linear scaling
 2015-06-06 20:13:56 -05:00
Richard Wackerbarth
5239a4e839 Merge bPR #1882 2015-06-06 19:47:07 -05:00
paclema
8d295547be * Auto filament change on CHANGEFILAMENT feature. Now you can activate this option that extrude filament until you press the button. 2015-06-06 19:45:45 -05:00
Richard Wackerbarth
3eea5222cf Merge PR #1767 2015-06-06 19:00:27 -05:00
atfield90
6d0e91328d Renamed Board_megatronics_1 to Board_minitronics 2015-06-06 18:59:04 -05:00
atfield90
c4a2e5ac23 Renamed Pins_megatronics_1 to Pins_minitronics 2015-06-06 18:59:04 -05:00
atfield90
2076906aaa Renamed Pins_megatronics_1 to Pins_minitronics 2015-06-06 18:59:04 -05:00
tonokip
10733a2bb0 added minirambo pin definitions. V2 2015-06-06 18:37:58 -05:00
Richard Wackerbarth
0c7bdf569c Merge branch 'ProbeDeployment' into Development 2015-06-06 17:49:20 -05:00
Richard Wackerbarth
303d47228e Define Probe Path in new format 2015-06-06 17:48:27 -05:00
Richard Wackerbarth
ad09d6a60f 3 Step Allen Key Probe 2015-06-06 17:48:27 -05:00
Richard Wackerbarth
8359cdf01d Check compatibility for Teensy-based processor 
The instruction say to set a #define in fastio.h
However, that value is not included before this test.
 2015-06-06 17:24:34 -05:00
Richard Wackerbarth
6b095af9b1 Merge branch 'GenerateVersionHeader' into Development 2015-06-06 17:21:35 -05:00
Richard Wackerbarth
b3a3080b4b Suppress error when on detached head 2015-06-06 17:20:01 -05:00
Daniel Friesen
54375cc7a4 Quote paths so build scripts work when directories have space in their name. 
Currently if you clone Marlin to a directory with a space in the name, Arduino will generate an error.
Because when executed the path ends up split into two separate arguments.
 2015-06-06 17:20:01 -05:00
Richard Wackerbarth
bdf778bec2 Merge SDCARDDETECTINVERTED (#2144) 2015-06-06 16:44:13 -05:00
Ed Boston
08968c29bb Adding ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED to Examples 2015-06-06 16:40:32 -05:00
Ed Boston
fed18bcc20 Removed SDSLOW for ELB_FULL_GRAPHIC_CONTROLLER 
Hardware changes has removed the need for this option.
 2015-06-06 16:40:32 -05:00
Ed Boston
b94a0e1501 Added ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED 
The new define allows the sd card detect to be inverted or not from
Configuration.h
 2015-06-06 16:40:31 -05:00
Ed Boston
bc205c76a3 SDCARDDETECTINVERTED problems 
Fixed an error where SDCARDDETECTINVERTED was being defined/undefined
improperly
 2015-06-06 16:40:31 -05:00
AnHardt
2bf482ce65 Merge pull request #2238 from AnHardt/TRP-Travis-again 
Remove the 'Thermal Runaway Protection' section from .travis.yml
 2015-06-03 12:48:13 +02:00
AnHardt
e400fce271 Merge pull request #2221 from MagoKimbra/Dryrun 
Insert Debug DRYRUN Repetier Host compatible
 2015-06-03 12:30:48 +02:00
AnHardt
5ed0c1a2bd Remove the 'Thermal Runaway Protection' section from .travis.yml 
because its activated by default now.

Closes #2234.
 2015-06-03 12:25:57 +02:00
AnHardt
95f1feab1a Merge pull request #2232 from Wackerbarth/AutoVersioning 
Automatic versioning for Travis builds
 2015-06-03 12:22:01 +02:00
AnHardt
163a9ff58e Merge pull request #2230 from AnHardt/psm 
Fix thermal protection state machine target temp. V2
 2015-06-03 09:46:53 +02:00
AnHardt
c3fe6e61ae Merge pull request #2229 from AnHardt/position-out-of-range 
Fix out_of_range_error()
 2015-06-03 09:46:22 +02:00
MagoKimbra
4db8d2def4 Moved MSG_DEBUG in language.h 2015-06-03 08:18:27 +02:00
AnHardt
38c21ff34d Merge pull request #2236 from AnHardt/backto103def 
Back to 1.0.3 dev - for now
 2015-06-03 01:08:05 +02:00
AnHardt
b7e9ba7591 Back to 1.0.3 dev - for now 2015-06-03 00:47:11 +02:00
AnHardt
d1f4471000 Merge pull request #2146 from Wackerbarth/Versioning 
Versioning
 2015-06-02 18:31:21 +02:00
Richard Wackerbarth
ac382cbdaf Automatic versioning for Travis builds 2015-06-02 08:13:43 -05:00
AnHardt
b1404a0743 fix thermal protection state machine target temp. V2 
If the target temperature is changed then it would always stay in the reset state.
Thanks to @tonokip.

Replaces #2119
 2015-06-02 12:26:21 +02:00
AnHardt
17b0ec84ed Fix out_of_range_error() 
For sprintf_P() the first parameter has to be a `char*` not `const char*`.
 2015-06-02 11:50:32 +02:00
AnHardt
35af5ef23e Merge pull request #2225 from Wurstnase/naming 
consistency name for multiplier
 2015-06-02 10:18:22 +02:00
wurstnase
e7e964432b consistency name for multiplier 
replace extruder_multiply with extruder_multiplier
like feedrate_multiplier or volumetric_multiplier
 2015-06-01 22:33:22 +02:00
AnHardt
d4c6fc5d0a Merge pull request #2223 from AnHardt/dualz-semicolon 
Add a semicolon to make Z_DUAL_STEPPER_DRIVERS compile again.
 2015-06-01 20:15:55 +02:00
AnHardt
0d9d21d15f Add a semicolon to make Z_DUAL_STEPPER_DRIVERS compile again. 2015-06-01 19:51:43 +02:00
MagoKimbra
76306f9073 Insert Debug DRYRUN Repetier Host compatible 2015-06-01 18:34:45 +02:00
AnHardt
ca2dcff9d4 Merge pull request #2219 from MagoKimbra/Cura_bug 
Fix problem Width Cura
 2015-06-01 17:54:10 +02:00
MagoKimbra
881146bc22 Fix problem Width Cura 2015-06-01 17:25:32 +02:00
Bo Herrmannsen
c33fffd6a7 Merge pull request #2209 from AnHardt/u8glib 
Replace U8GLI v1.11 with v1.17
 2015-06-01 07:01:59 +02:00
Bo Herrmannsen
01a7b5cc97 Merge pull request #2210 from fmalpartida/bugFixing 
Addes support for SDD1306 I2C OLED LCD
 2015-06-01 07:01:35 +02:00
Bo Herrmannsen
cc5d006087 Revert "updated addons for IDE 1.6.4" 
This reverts commit 2724baae8b.
 2015-06-01 07:00:30 +02:00
Bo Herrmannsen
2724baae8b updated addons for IDE 1.6.4 2015-05-31 23:52:39 +02:00
fmalpartida
11e3f3375d Merge commit '764e61708b8e73410c7819d59c4970d7089ca6f5' into bugFixing 
Updated LCD wiki location.
 2015-05-31 21:20:26 +02:00