Richard Wackerbarth
6b095af9b1
Merge branch 'GenerateVersionHeader' into Development
10 years ago
Richard Wackerbarth
b3a3080b4b
Suppress error when on detached head
10 years ago
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.
10 years ago
Richard Wackerbarth
bdf778bec2
Merge SDCARDDETECTINVERTED ( #2144 )
10 years ago
Ed Boston
08968c29bb
Adding ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED to Examples
10 years ago
Ed Boston
fed18bcc20
Removed SDSLOW for ELB_FULL_GRAPHIC_CONTROLLER
Hardware changes has removed the need for this option.
10 years ago
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
10 years ago
Ed Boston
bc205c76a3
SDCARDDETECTINVERTED problems
Fixed an error where SDCARDDETECTINVERTED was being defined/undefined
improperly
10 years ago
AnHardt
2bf482ce65
Merge pull request #2238 from AnHardt/TRP-Travis-again
Remove the 'Thermal Runaway Protection' section from .travis.yml
10 years ago
AnHardt
e400fce271
Merge pull request #2221 from MagoKimbra/Dryrun
Insert Debug DRYRUN Repetier Host compatible
10 years ago
AnHardt
5ed0c1a2bd
Remove the 'Thermal Runaway Protection' section from .travis.yml
because its activated by default now.
Closes #2234 .
10 years ago
AnHardt
95f1feab1a
Merge pull request #2232 from Wackerbarth/AutoVersioning
Automatic versioning for Travis builds
10 years ago
AnHardt
163a9ff58e
Merge pull request #2230 from AnHardt/psm
Fix thermal protection state machine target temp. V2
10 years ago
AnHardt
c3fe6e61ae
Merge pull request #2229 from AnHardt/position-out-of-range
Fix out_of_range_error()
10 years ago
MagoKimbra
4db8d2def4
Moved MSG_DEBUG in language.h
10 years ago
AnHardt
38c21ff34d
Merge pull request #2236 from AnHardt/backto103def
Back to 1.0.3 dev - for now
10 years ago
AnHardt
b7e9ba7591
Back to 1.0.3 dev - for now
10 years ago
AnHardt
d1f4471000
Merge pull request #2146 from Wackerbarth/Versioning
Versioning
10 years ago
Richard Wackerbarth
ac382cbdaf
Automatic versioning for Travis builds
10 years ago
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
10 years ago
AnHardt
17b0ec84ed
Fix out_of_range_error()
For sprintf_P() the first parameter has to be a `char*` not `const char*`.
10 years ago
AnHardt
35af5ef23e
Merge pull request #2225 from Wurstnase/naming
consistency name for multiplier
10 years ago
wurstnase
e7e964432b
consistency name for multiplier
replace extruder_multiply with extruder_multiplier
like feedrate_multiplier or volumetric_multiplier
10 years ago
AnHardt
d4c6fc5d0a
Merge pull request #2223 from AnHardt/dualz-semicolon
Add a semicolon to make Z_DUAL_STEPPER_DRIVERS compile again.
10 years ago
AnHardt
0d9d21d15f
Add a semicolon to make Z_DUAL_STEPPER_DRIVERS compile again.
10 years ago
MagoKimbra
76306f9073
Insert Debug DRYRUN Repetier Host compatible
10 years ago
AnHardt
ca2dcff9d4
Merge pull request #2219 from MagoKimbra/Cura_bug
Fix problem Width Cura
10 years ago
MagoKimbra
881146bc22
Fix problem Width Cura
10 years ago
Bo Herrmannsen
c33fffd6a7
Merge pull request #2209 from AnHardt/u8glib
Replace U8GLI v1.11 with v1.17
10 years ago
Bo Herrmannsen
01a7b5cc97
Merge pull request #2210 from fmalpartida/bugFixing
Addes support for SDD1306 I2C OLED LCD
10 years ago
Bo Herrmannsen
cc5d006087
Revert "updated addons for IDE 1.6.4"
This reverts commit 2724baae8b
.
10 years ago
Bo Herrmannsen
2724baae8b
updated addons for IDE 1.6.4
10 years ago
fmalpartida
11e3f3375d
Merge commit '764e61708b8e73410c7819d59c4970d7089ca6f5' into bugFixing
Updated LCD wiki location.
10 years ago
AnHardt
6f4873329e
Replace U8GLI v1.11 with v1.17
In Travis we already test against 1.17.
10 years ago
AnHardt
764e61708b
Merge pull request #2208 from alexxy/ru_translations
Update ru translation
10 years ago
Alexey Shvetsov
a8670b66a7
Update ru translation
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
10 years ago
fmalpartida
93da52d011
Added support for OLED SSD1306 I2C based LCDs.
10 years ago
Wurstnase
9c09967803
Merge pull request #2149 from Wurstnase/enstop_bits
faster compare
10 years ago
wurstnase
0f3f7d6835
clean up double endstops
10 years ago
AnHardt
9d2a980bcf
Merge pull request #2170 from thinkyhead/beep_M600_elsewise
Slight size reduction by adding idle()
10 years ago
AnHardt
2728dc0606
Merge pull request #2194 from thinkyhead/reduce_strings
Redo "invalid extruder" to save 304 bytes
10 years ago
Scott Lahteine
be5236e839
Reduce setTargetedHotend by removing the switch
10 years ago
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
10 years ago
Scott Lahteine
1a882bcc2e
Merge pull request #2193 from thinkyhead/ignore_unrecognized_commands
Ignore unknown commands if they start with G, M, or T
10 years ago
Scott Lahteine
a672872717
Merge pull request #2187 from AnHardt/MAX6675M105
Print active extruder with M105 for MAX6675
10 years ago
Scott Lahteine
9beed830eb
Drop commented code_is_good lines
10 years ago
Scott Lahteine
068d4a1eb2
Ignore unknown commands if they start with G, M, or T
10 years ago
Scott Lahteine
5824f613ff
Merge pull request #2185 from jothan/bed_integral
Separate the maximum integral power for the bed from PID_INTEGRAL_DRI…
10 years ago
Scott Lahteine
c5c9d12630
Merge pull request #2183 from AnHardt/displayinit
Initialize the display earlier
10 years ago
Scott Lahteine
ef4becc413
Merge pull request #2188 from AnHardt/FtoN
Replace MSG_F? with MSG_N?
10 years ago