Scott Lahteine
2ec2bf1564
Fix regressions affecting compilation
This fixes two regressions, caused by #1167 and #1191 .
9年前
Bernhard Kubicek
3d1da45f3e
Update Marlin.h
9年前
bkubicek
d02daec08f
fixed compilation
9年前
alexborro
0268c03a75
Merge pull request #1271 from RobotCaleb/DeltaCalMenu
Move delta calibration menu to sample delta configuration.
9年前
Caleb Anderson
991a74b75b
Move delta calibration menu to sample delta configuration.
Turn off by default.
9年前
Bo Herrmannsen
2bf6d804c4
Merge pull request #1269 from Wurstnase/Development
Logic error correction
9年前
Wurstnase
9453bb13c2
Logic error correction
9年前
Bo Herrmannsen
67fd8f0727
Merge pull request #1267 from RobotCaleb/LanguageFix
Language Fix - Using the new language implementation wasn't behaving as expected.
9年前
Caleb Anderson
2309c9f43a
Merge branch 'LanguageFix' of github.com:RobotCaleb/Marlin-Kossel_Clear into LanguageFix
Conflicts:
Marlin/language.h
9年前
Caleb Anderson
236db44669
Fix spacing
9年前
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年前
Bo Herrmannsen
f4ce235589
Merge pull request #1266 from RobotCaleb/DeltaCalMenu
Delta manual calibration menu
9年前
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年前
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年前
Bernhard Kubicek
10ad9f1062
Addes servo0 pin ultimaker
9年前
Bernhard Kubicek
f24c5d82e3
Update Marlin_main.cpp
fixed minor typo
9年前
Bernhard Kubicek
053b541de8
Merge pull request #1265 from Wurstnase/Development
Expand manage_inactivity #1264
9年前
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年前
Bernhard Kubicek
78167ce439
Merge pull request #1264 from Wurstnase/Development
change filament issue
9年前
Wurstnase
d1995aec7a
Rename ignore_blocks_queued
more speaking name
9年前
Wurstnase
4122de9d17
change filament issue
make a more general solution
9年前
Bo Herrmannsen
c1df713e4d
Merge pull request #1258 from fmalpartida/Development
Merge branch 'SAV-MkI_merge' into Development
9年前
fmalpartida
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
Tested for SAV MKI and SAV 3D LCD on lewihe.
9年前
Bo Herrmannsen
a5ed3e96f2
Update README.md
9年前
Bo Herrmannsen
60959f196f
Delete .gitignore
9年前
Bo Herrmannsen
95429a4108
Delete .travis.yml
9年前
Bo Herrmannsen
a0959366af
Update README.md
9年前
Bo Herrmannsen
b2000b7055
Merge pull request #1255 from mattsch/503_fwretract_dev_branch
503 fwretract dev branch
9年前
Matthew Schick
0468f81950
Update for pull request #837
10年前
Matthew Schick
6e42c9e305
Add fwretract settings to M503 output
10年前
Bo Herrmannsen
0504c02153
Update README.md
9年前
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年前
Bo Herrmannsen
73b7b08f2c
Merge pull request #1253 from lobermann/Development_AutoLevelOffset
Consider negative Z Offsets when auto bed leveling is active
9年前
Lukas Obermann
9eb6df17a7
Consider negative Z Offsets when auto bed leveling is active
10年前
Bo Herrmannsen
c9f60183a9
Merge pull request #1233 from NarimaanV/Development
Fixed BABYSTEPPING feature
9年前
Bo Herrmannsen
0d957872a0
Merge pull request #1234 from gregrebholz/issue_1069
Fixes #1069 . Added "auto fan" checks to PID_autotune.
9年前
Bo Herrmannsen
9c07d28bd6
Merge pull request #1249 from drf5n/PID_CI_v2
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
9年前
Bo Herrmannsen
23e768dffa
Merge pull request #1250 from chertykov/Development
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
9年前
Bo Herrmannsen
f7ffd53bac
Merge pull request #1251 from thinkyhead/progress_bar
LCD Progress Bar
9年前
Scott Lahteine
2f467e2797
LCD Progress Bar
9年前
Denis Chertykov
050ca9ca13
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
9年前
David Forrest
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.
10年前
David Forrest
984177c40c
temperature.cpp:Add PID Conditional integration on heated bed.
10年前
David Forrest
c9b8435749
heater.c: Limit PID I term with conditional integration.
10年前
Bo Herrmannsen
f00a202246
Update README.md
9年前
Bo Herrmannsen
6efc4f3abf
Merge pull request #1239 from ErikZalm/Marlin_v1
getting even with v1
9年前
Bo Herrmannsen
45336bb6c0
Update README.md
9年前
Bo Herrmannsen
5f555140be
Update README.md
9年前
Greg Rebholz
7ecb7cbd46
Added "auto fan" checks to PID_autotune
9年前
NarimaanV
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.
9年前