b5c6f11e41
Merge pull request #1297 from monkeydave/Readd-Travis-CI
...
Readd .travis.yml
10 years ago
206b7f4e92
Update .gitignore
10 years ago
9d9a2d75ef
Merge pull request #1295 from monkeydave/Re-add_gitignore
...
Added .gitignore back into repo
10 years ago
21cc188272
Updated .travis.yml for ErikZalm branch pull request
10 years ago
86cc22d639
Readd .travis.yml, change build enviroment to use ino instead of gcc
10 years ago
3f9707aa33
Added .gitignore back into repo
10 years ago
912ed155c5
Merge pull request #1292 from thinkyhead/docs_and_scripts
...
Move scripts and documentation to subfolders
10 years ago
b5e50cdd4e
Move scripts and documentation to subfolders
10 years ago
63da6900b0
Merge pull request #1282 from vandarin/Development
...
Due to the fix for #1248 , X and Y probe offsets must not be floats.
10 years ago
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
975810fb4a
Merge pull request #1286 from alhirzel/Development
...
Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
ae12ad0d6c
Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
80b17ab573
Merge pull request #1285 from drf5n/PID_CI_v2
...
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
625860f086
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
6583bb781d
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
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.
10 years ago
217186d7bc
Merge pull request #1281 from Grogyan/patch-2
...
MAX6675 Slave Select pin
10 years ago
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.
10 years ago
692a01b1c7
Merge pull request #1277 from thinkyhead/fix_regressions
...
Fix regressions affecting compilation
10 years ago
878b5557a1
Merge pull request #1276 from thinkyhead/lcd_z_reformat
...
Format Z like XY on LCD
10 years ago
2ec2bf1564
Fix regressions affecting compilation
...
This fixes two regressions, caused by #1167 and #1191 .
10 years ago
6c591a97a1
Merge branch 'lcd_z_reformat' of https://github.com/thinkyhead/Marlin into lcd_z_reformat
10 years ago
e7db8ee9e5
ftostr32np > ftostr32sp
...
sp=space-padded, similar to: ns=no-sign
10 years ago
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.
10 years ago
d1f21d1189
As it should be
10 years ago
449dad71f2
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.
10 years ago
a2109cb492
Patch to make Z look more like X and Y on UltraLCD
10 years ago
3d1da45f3e
Update Marlin.h
10 years ago
d02daec08f
fixed compilation
10 years ago
0268c03a75
Merge pull request #1271 from RobotCaleb/DeltaCalMenu
...
Move delta calibration menu to sample delta configuration.
10 years ago
991a74b75b
Move delta calibration menu to sample delta configuration.
...
Turn off by default.
10 years ago
2bf6d804c4
Merge pull request #1269 from Wurstnase/Development
...
Logic error correction
10 years ago
9453bb13c2
Logic error correction
10 years ago
67fd8f0727
Merge pull request #1267 from RobotCaleb/LanguageFix
...
Language Fix - Using the new language implementation wasn't behaving as expected.
10 years ago
2309c9f43a
Merge branch 'LanguageFix' of github.com:RobotCaleb/Marlin-Kossel_Clear into LanguageFix
...
Conflicts:
Marlin/language.h
10 years ago
236db44669
Fix spacing
10 years ago
e6774fb7d2
Using the new language implementation wasn't behaving as expected.
...
No matter what LANGUAGE_CHOICE was set to it would always take the en branch.
I revamped it a bit to use a macro to create the language include file name. This required a slight tweak to the RU declaration since it's special-cased in a couple places in code.
This is an attempt to pull my changes from #1222 over.
10 years ago
f4ce235589
Merge pull request #1266 from RobotCaleb/DeltaCalMenu
...
Delta manual calibration menu
10 years ago
cb047e9070
Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently)
10 years ago
5b336a4cdb
Delta calibration menu based on http://minow.blogspot.com/index.html#4918805519571907051
...
To test/enable, uncomment the #define DELTA_CALIBRATION_MENU in Configuration.h
10 years ago
10ad9f1062
Addes servo0 pin ultimaker
10 years ago
f24c5d82e3
Update Marlin_main.cpp
...
fixed minor typo
10 years ago
053b541de8
Merge pull request #1265 from Wurstnase/Development
...
Expand manage_inactivity #1264
10 years ago
8a6f098cc6
Expand manage_inactivity #1264
...
void manage_inactivity(bool ignore_stepper_queue=false)
standard is false so it is not necessary to change additional code. this
change should be better, hopefully nophead like this :)
10 years ago
78167ce439
Merge pull request #1264 from Wurstnase/Development
...
change filament issue
10 years ago
d1995aec7a
Rename ignore_blocks_queued
...
more speaking name
10 years ago
4122de9d17
change filament issue
...
make a more general solution
10 years ago
d60efc3b5d
Fix syntax error caused by previous changes.
10 years ago
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
c1df713e4d
Merge pull request #1258 from fmalpartida/Development
...
Merge branch 'SAV-MkI_merge' into Development
10 years ago
Bo Herrmannsen