wgm4321
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
This reverts commit 2b9722f387 .
9 years ago
wgm4321
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
9 years ago
wgm4321
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
9 years ago
Bo Herrmannsen
00e4bc9f54
Merge pull request #1311 from i-make-robots/Development
issue 968 for dev branch
9 years ago
Dan Royer
9472bbe51d
issue 968 for dev branch
try, try again.
If 'OK' is garbled on sending PC won't receive it. Both machines will
wait on each other forever. This resends OK if nothing is heard from PC
for a while to avoid this bad case.
9 years ago
alexborro
d2b6e62996
Merge pull request #1309 from philfifi/fix_temp_runaway
temp runaway: proper cast to prevent any overflow.
9 years ago
Philippe L
30248214c7
temp runaway: proper cast to prevent any overflow.
9 years ago
Bo Herrmannsen
c5f138ea07
Merge pull request #1291 from alhirzel/Development
Define analogInputToDigitalPin only if needed
9 years ago
Bo Herrmannsen
efca4afab2
Merge pull request #1304 from monkeydave/Travis-CI
Added further tests to Travis CI config
9 years ago
odewdney
652895d656
try different proproc for CI failure
9 years ago
Bo Herrmannsen
3d9f4ac757
Merge pull request #1303 from wgm4321/Development
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
9 years ago
monkeydave
9d57c376db
Commented out configs that are failing with no easy fixes for the moment
9 years ago
wgm4321
04fb34c7ff
Add English defines for filament menu to non-English to prevent compile errors until translated
9 years ago
wgm4321
f8aa5ff771
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined
9 years ago
odewdney
39fae9e3a3
Fix progmem warning
Borrow code from https://github.com/arduino/Arduino/issues/1793
9 years ago
monkeydave
07b85f8b92
Added compile checks for lots of defines in Configuration.h
9 years ago
monkeydave
be81dfa3de
Updated .travis.yml so others forks will also compile
9 years ago
Bo Herrmannsen
b5c6f11e41
Merge pull request #1297 from monkeydave/Readd-Travis-CI
Readd .travis.yml
9 years ago
Bo Herrmannsen
206b7f4e92
Update .gitignore
9 years ago
Bo Herrmannsen
9d9a2d75ef
Merge pull request #1295 from monkeydave/Re-add_gitignore
Added .gitignore back into repo
9 years ago
monkeydave
21cc188272
Updated .travis.yml for ErikZalm branch pull request
9 years ago
monkeydave
86cc22d639
Readd .travis.yml, change build enviroment to use ino instead of gcc
9 years ago
monkeydave
3f9707aa33
Added .gitignore back into repo
9 years ago
Alexander Hirzel
f36fd3ddec
Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development
9 years ago
alexborro
912ed155c5
Merge pull request #1292 from thinkyhead/docs_and_scripts
Move scripts and documentation to subfolders
9 years ago
Scott Lahteine
b5e50cdd4e
Move scripts and documentation to subfolders
9 years ago
Alexander Hirzel
eed451e034
rework analogInputToDigitalPin definition
9 years ago
Alexander Hirzel
f3209bba34
Merge branch 'Development' of https://github.com/alhirzel/Marlin into Development
9 years ago
Lane Roberts
1f520a5a8c
Due to the fix for #1248 , X and Y probe offsets must not be floats.
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
9 years ago
wgm4321
b32be2dc64
Fix syntax error caused by previous changes.
9 years ago
wgm4321
edac64e7d2
Add Filament menu and add Filament/Retract settings to config store.
9 years ago
Alexander Hirzel
ecda6cdc0a
Fix typo, PID_BED_POWER -> MAX_BED_POWER
9 years ago
David Forrest
f3e503e725
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
9 years ago
David Forrest
1d5d853c9a
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
9 years ago
Bo Herrmannsen
63da6900b0
Merge pull request #1282 from vandarin/Development
Due to the fix for #1248 , X and Y probe offsets must not be floats.
9 years ago
Bo Herrmannsen
a18b625534
Merge pull request #1261 from wgm4321/Development
Add Filament menu and add Filament/Retract settings to config store.
9 years ago
alexborro
975810fb4a
Merge pull request #1286 from alhirzel/Development
Fix typo, PID_BED_POWER -> MAX_BED_POWER
9 years ago
Alexander Hirzel
ae12ad0d6c
Fix typo, PID_BED_POWER -> MAX_BED_POWER
9 years ago
alexborro
80b17ab573
Merge pull request #1285 from drf5n/PID_CI_v2
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
9 years ago
David Forrest
625860f086
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
9 years ago
David Forrest
6583bb781d
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
9 years ago
Lane Roberts
2701dd8a17
Due to the fix for #1248 , X and Y probe offsets must not be floats.
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
9 years ago
Bo Herrmannsen
217186d7bc
Merge pull request #1281 from Grogyan/patch-2
MAX6675 Slave Select pin
9 years ago
Grogyan
6b82415c81
Update pins.h
Somehow the pin definitions for the MAX6675 Slave Select/Chip Select got changed back to the hardware SPI SS/CS.
Pin 49 cannot be used as that is used by the SD card socket to detect if an SD card is present.
Pin 53 is the Hardware SPI SS, which is dedicated, nicely, to the SD card SS and therefore cannot be used as the MAX6675 SS
Pin 66 is in Aux2 port adjacent to the Hardware SPI interface port on RAMPS 1.4, and is currently not used for anything.
9 years ago
Bo Herrmannsen
692a01b1c7
Merge pull request #1277 from thinkyhead/fix_regressions
Fix regressions affecting compilation
9 years ago
Bo Herrmannsen
878b5557a1
Merge pull request #1276 from thinkyhead/lcd_z_reformat
Format Z like XY on LCD
9 years ago
Scott Lahteine
2ec2bf1564
Fix regressions affecting compilation
This fixes two regressions, caused by #1167 and #1191 .
9 years ago
Scott Lahteine
6c591a97a1
Merge branch 'lcd_z_reformat' of https://github.com/thinkyhead/Marlin into lcd_z_reformat
9 years ago
Scott Lahteine
e7db8ee9e5
ftostr32np > ftostr32sp
sp=space-padded, similar to: ns=no-sign
9 years ago
Scott Lahteine
10e1b6ef8b
Least stack-usage self-contained ftostr32np()
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
9 years ago