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
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
Tested for SAV MKI and SAV 3D LCD on lewihe.
10 years ago
a5ed3e96f2
Update README.md
10 years ago
60959f196f
Delete .gitignore
10 years ago
95429a4108
Delete .travis.yml
10 years ago
a0959366af
Update README.md
10 years ago
b2000b7055
Merge pull request #1255 from mattsch/503_fwretract_dev_branch
503 fwretract dev branch
10 years ago
0468f81950
Update for pull request #837
11 years ago
6e42c9e305
Add fwretract settings to M503 output
11 years ago
0504c02153
Update README.md
10 years ago
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
10 years ago
73b7b08f2c
Merge pull request #1253 from lobermann/Development_AutoLevelOffset
Consider negative Z Offsets when auto bed leveling is active
10 years ago
9eb6df17a7
Consider negative Z Offsets when auto bed leveling is active
10 years ago
c9f60183a9
Merge pull request #1233 from NarimaanV/Development
Fixed BABYSTEPPING feature
10 years ago
0d957872a0
Merge pull request #1234 from gregrebholz/issue_1069
Fixes #1069 . Added "auto fan" checks to PID_autotune.
10 years ago
9c07d28bd6
Merge pull request #1249 from drf5n/PID_CI_v2
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
10 years ago
23e768dffa
Merge pull request #1250 from chertykov/Development
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
f7ffd53bac
Merge pull request #1251 from thinkyhead/progress_bar
LCD Progress Bar
10 years ago
2f467e2797
LCD Progress Bar
10 years ago
050ca9ca13
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
cf52c48d19
Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX.
Current defaults are all 255. If it makes sense to reduce them, they should come down together, and
be in a PID_INTEGRAL_DRIVE_MAX <= PID_MAX <- BANG_MAX relationship.
11 years ago
984177c40c
temperature.cpp:Add PID Conditional integration on heated bed.
11 years ago
c9b8435749
heater.c: Limit PID I term with conditional integration.
11 years ago
f00a202246
Update README.md
10 years ago
6efc4f3abf
Merge pull request #1239 from ErikZalm/Marlin_v1
getting even with v1
10 years ago
45336bb6c0
Update README.md
10 years ago
5f555140be
Update README.md
10 years ago
7ecb7cbd46
Added "auto fan" checks to PID_autotune
10 years ago
7667949aca
Fixed BABYSTEPPING feature
Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.
10 years ago
529c937943
Merge pull request #1230 from thinkyhead/readme_tweak
Clarification and markdown for boelle notes
10 years ago
7250ec4337
Some clarification and markdown for boelle notes
10 years ago
f05225a271
Update README.md
10 years ago
d080027ff4
ftostr32np > ftostr32sp
sp=space-padded, similar to: ns=no-sign
10 years ago
Wurstnase
Bo Herrmannsen
Caleb Anderson
Bernhard Kubicek
wgm4321
fmalpartida
Matthew Schick
alexborro
Lukas Obermann
Scott Lahteine
Denis Chertykov
David Forrest
Greg Rebholz
NarimaanV