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
Scott Lahteine
d1f21d1189
As it should be
9 years ago
Scott Lahteine
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.
9 years ago
Scott Lahteine
a2109cb492
Patch to make Z look more like X and Y on UltraLCD
9 years ago
Bernhard Kubicek
3d1da45f3e
Update Marlin.h
9 years ago
bkubicek
d02daec08f
fixed compilation
9 years ago
alexborro
0268c03a75
Merge pull request #1271 from RobotCaleb/DeltaCalMenu
Move delta calibration menu to sample delta configuration.
9 years ago
Caleb Anderson
991a74b75b
Move delta calibration menu to sample delta configuration.
Turn off by default.
9 years ago
Bo Herrmannsen
2bf6d804c4
Merge pull request #1269 from Wurstnase/Development
Logic error correction
9 years ago
Wurstnase
9453bb13c2
Logic error correction
9 years ago
Bo Herrmannsen
67fd8f0727
Merge pull request #1267 from RobotCaleb/LanguageFix
Language Fix - Using the new language implementation wasn't behaving as expected.
9 years ago
Caleb Anderson
2309c9f43a
Merge branch 'LanguageFix' of github.com:RobotCaleb/Marlin-Kossel_Clear into LanguageFix
Conflicts:
Marlin/language.h
9 years ago
Caleb Anderson
236db44669
Fix spacing
9 years ago
Caleb Anderson
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.
9 years ago
Bo Herrmannsen
f4ce235589
Merge pull request #1266 from RobotCaleb/DeltaCalMenu
Delta manual calibration menu
9 years ago
Caleb Anderson
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)
9 years ago
Caleb Anderson
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
9 years ago
Bernhard Kubicek
10ad9f1062
Addes servo0 pin ultimaker
9 years ago
Bernhard Kubicek
f24c5d82e3
Update Marlin_main.cpp
fixed minor typo
9 years ago
Bernhard Kubicek
053b541de8
Merge pull request #1265 from Wurstnase/Development
Expand manage_inactivity #1264
9 years ago
Wurstnase
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 :)
9 years ago
Bernhard Kubicek
78167ce439
Merge pull request #1264 from Wurstnase/Development
change filament issue
9 years ago
Wurstnase
d1995aec7a
Rename ignore_blocks_queued
more speaking name
9 years ago
Wurstnase
4122de9d17
change filament issue
make a more general solution
9 years ago
wgm4321
d60efc3b5d
Fix syntax error caused by previous changes.
9 years ago
wgm4321
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
9 years ago
Bo Herrmannsen
c1df713e4d
Merge pull request #1258 from fmalpartida/Development
Merge branch 'SAV-MkI_merge' into Development
9 years ago
fmalpartida
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
Tested for SAV MKI and SAV 3D LCD on lewihe.
9 years ago
Bo Herrmannsen
a5ed3e96f2
Update README.md
9 years ago
Bo Herrmannsen
60959f196f
Delete .gitignore
9 years ago
Bo Herrmannsen
95429a4108
Delete .travis.yml
9 years ago
Bo Herrmannsen
a0959366af
Update README.md
9 years ago
Bo Herrmannsen
b2000b7055
Merge pull request #1255 from mattsch/503_fwretract_dev_branch
503 fwretract dev branch
9 years ago
Matthew Schick
0468f81950
Update for pull request #837
10 years ago
Matthew Schick
6e42c9e305
Add fwretract settings to M503 output
10 years ago
Bo Herrmannsen
0504c02153
Update README.md
9 years ago
alexborro
3afe66bb0c
Fix issues #1248 , #1240
- Fixed issue when BAL area probing is shorter than it should be for
grid probing
- Warning when BAL activated with Delta Kinematics
- Fix XY_TRAVEL_SPEED when homing Z axis
9 years ago
Bo Herrmannsen
73b7b08f2c
Merge pull request #1253 from lobermann/Development_AutoLevelOffset
Consider negative Z Offsets when auto bed leveling is active
9 years ago
Lukas Obermann
9eb6df17a7
Consider negative Z Offsets when auto bed leveling is active
10 years ago
Bo Herrmannsen
c9f60183a9
Merge pull request #1233 from NarimaanV/Development
Fixed BABYSTEPPING feature
9 years ago
Bo Herrmannsen
0d957872a0
Merge pull request #1234 from gregrebholz/issue_1069
Fixes #1069 . Added "auto fan" checks to PID_autotune.
9 years ago
Bo Herrmannsen
9c07d28bd6
Merge pull request #1249 from drf5n/PID_CI_v2
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
9 years ago
Bo Herrmannsen
23e768dffa
Merge pull request #1250 from chertykov/Development
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
9 years ago
Bo Herrmannsen
f7ffd53bac
Merge pull request #1251 from thinkyhead/progress_bar
LCD Progress Bar
9 years ago
Scott Lahteine
2f467e2797
LCD Progress Bar
9 years ago