CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,938 Commits 1 Branch 0 Tags 107 MiB
8982756b40
Commit Graph

14938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AnHardt
6f4873329e Replace U8GLI v1.11 with v1.17 
In Travis we already test against 1.17.
 2015-05-31 20:25:36 +02:00
AnHardt
764e61708b Merge pull request #2208 from alexxy/ru_translations 
Update ru translation
 2015-05-31 19:46:59 +02:00
Alexey Shvetsov
a8670b66a7 Update ru translation 
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2015-05-31 20:09:10 +03:00
fmalpartida
93da52d011 Added support for OLED SSD1306 I2C based LCDs. 2015-05-31 18:53:29 +02:00
Wurstnase
9c09967803 Merge pull request #2149 from Wurstnase/enstop_bits 
faster compare
 2015-05-31 16:02:55 +03:00
wurstnase
0f3f7d6835 clean up double endstops 2015-05-31 14:06:13 +02:00
AnHardt
9d2a980bcf Merge pull request #2170 from thinkyhead/beep_M600_elsewise 
Slight size reduction by adding idle()
 2015-05-30 12:42:32 +02:00
AnHardt
2728dc0606 Merge pull request #2194 from thinkyhead/reduce_strings 
Redo "invalid extruder" to save 304 bytes
 2015-05-30 11:05:08 +02:00
Scott Lahteine
be5236e839 Reduce setTargetedHotend by removing the switch 2015-05-29 18:03:58 -07:00
Scott Lahteine
06f401e7e5 Redo "invalid extruder" to save 264 bytes 
- Use `setTargetedHotend` in `M200`, as with other commands that use
`T` for the extruder
- Synthesize the "invalid extruder" message, obviating several long
strings
 2015-05-28 22:25:28 -07:00
Scott Lahteine
1a882bcc2e Merge pull request #2193 from thinkyhead/ignore_unrecognized_commands 
Ignore unknown commands if they start with G, M, or T
 2015-05-28 22:03:48 -07:00
Scott Lahteine
a672872717 Merge pull request #2187 from AnHardt/MAX6675M105 
Print active extruder with M105 for MAX6675
 2015-05-28 18:12:48 -07:00
Scott Lahteine
9beed830eb Drop commented code_is_good lines 2015-05-28 17:53:47 -07:00
Scott Lahteine
068d4a1eb2 Ignore unknown commands if they start with G, M, or T 2015-05-28 17:44:09 -07:00