217186d7bc
Merge pull request #1281 from Grogyan/patch-2
...
MAX6675 Slave Select pin
2014-12-31 11:58:43 +01:00
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.
2014-12-31 13:04:16 +13:00
692a01b1c7
Merge pull request #1277 from thinkyhead/fix_regressions
...
Fix regressions affecting compilation
2014-12-30 16:49:08 +01:00
878b5557a1
Merge pull request #1276 from thinkyhead/lcd_z_reformat
...
Format Z like XY on LCD
2014-12-30 16:48:29 +01:00
2ec2bf1564
Fix regressions affecting compilation
...
This fixes two regressions, caused by #1167 and #1191 .
2014-12-30 07:36:18 -08:00
6c591a97a1
Merge branch 'lcd_z_reformat' of https://github.com/thinkyhead/Marlin into lcd_z_reformat
2014-12-30 07:26:58 -08:00
e7db8ee9e5
ftostr32np > ftostr32sp
...
sp=space-padded, similar to: ns=no-sign
2014-12-30 07:26:25 -08:00
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.
2014-12-30 07:26:25 -08:00
d1f21d1189
As it should be
2014-12-30 07:26:25 -08:00
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.
2014-12-30 07:26:24 -08:00
a2109cb492
Patch to make Z look more like X and Y on UltraLCD
2014-12-30 07:26:24 -08:00
3d1da45f3e
Update Marlin.h
2014-12-30 08:30:37 +01:00
d02daec08f
fixed compilation
2014-12-30 08:04:06 +01:00
0268c03a75
Merge pull request #1271 from RobotCaleb/DeltaCalMenu
...
Move delta calibration menu to sample delta configuration.
2014-12-29 23:10:20 -02:00
991a74b75b
Move delta calibration menu to sample delta configuration.
...
Turn off by default.
2014-12-29 18:03:56 -07:00
2bf6d804c4
Merge pull request #1269 from Wurstnase/Development
...
Logic error correction
2014-12-29 23:20:05 +01:00
9453bb13c2
Logic error correction
2014-12-29 23:17:42 +01:00
67fd8f0727
Merge pull request #1267 from RobotCaleb/LanguageFix
...
Language Fix - Using the new language implementation wasn't behaving as expected.
2014-12-29 19:49:11 +01:00
2309c9f43a
Merge branch 'LanguageFix' of github.com:RobotCaleb/Marlin-Kossel_Clear into LanguageFix
...
Conflicts:
Marlin/language.h
2014-12-29 10:48:56 -07:00
236db44669
Fix spacing
2014-12-29 10:44:55 -07:00
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.
2014-12-29 10:43:19 -07:00
f4ce235589
Merge pull request #1266 from RobotCaleb/DeltaCalMenu
...
Delta manual calibration menu
2014-12-29 18:42:40 +01:00
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)
2014-12-29 10:19:25 -07:00
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
2014-12-29 10:13:00 -07:00
10ad9f1062
Addes servo0 pin ultimaker
2014-12-29 17:27:14 +01:00
f24c5d82e3
Update Marlin_main.cpp
...
fixed minor typo
2014-12-29 17:17:30 +01:00
053b541de8
Merge pull request #1265 from Wurstnase/Development
...
Expand manage_inactivity #1264
2014-12-29 17:14:35 +01:00
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 :)
2014-12-29 17:07:22 +01:00
78167ce439
Merge pull request #1264 from Wurstnase/Development
...
change filament issue
2014-12-29 16:48:18 +01:00
d1995aec7a
Rename ignore_blocks_queued
...
more speaking name
2014-12-29 16:47:08 +01:00
4122de9d17
change filament issue
...
make a more general solution
2014-12-29 16:31:00 +01:00
d60efc3b5d
Fix syntax error caused by previous changes.
2014-12-28 20:47:59 -05:00
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
2014-12-28 20:43:14 -05:00
c1df713e4d
Merge pull request #1258 from fmalpartida/Development
...
Merge branch 'SAV-MkI_merge' into Development
2014-12-28 19:56:32 +01:00
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
...
Tested for SAV MKI and SAV 3D LCD on lewihe.
2014-12-28 19:54:06 +01:00
a5ed3e96f2
Update README.md
2014-12-28 18:26:16 +01:00
60959f196f
Delete .gitignore
2014-12-28 18:25:33 +01:00
95429a4108
Delete .travis.yml
2014-12-28 18:25:27 +01:00
a0959366af
Update README.md
2014-12-28 17:59:18 +01:00
b2000b7055
Merge pull request #1255 from mattsch/503_fwretract_dev_branch
...
503 fwretract dev branch
2014-12-28 17:52:18 +01:00
0468f81950
Update for pull request #837
2014-12-28 11:22:44 -05:00
6e42c9e305
Add fwretract settings to M503 output
2014-12-28 11:22:44 -05:00
0504c02153
Update README.md
2014-12-28 16:34:38 +01:00
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
2014-12-28 13:27:39 -02:00
73b7b08f2c
Merge pull request #1253 from lobermann/Development_AutoLevelOffset
...
Consider negative Z Offsets when auto bed leveling is active
2014-12-28 12:52:16 +01:00
9eb6df17a7
Consider negative Z Offsets when auto bed leveling is active
2014-12-28 12:46:35 +01:00
c9f60183a9
Merge pull request #1233 from NarimaanV/Development
...
Fixed BABYSTEPPING feature
2014-12-28 10:13:21 +01:00
0d957872a0
Merge pull request #1234 from gregrebholz/issue_1069
...
Fixes #1069 . Added "auto fan" checks to PID_autotune.
2014-12-28 10:12:08 +01:00
9c07d28bd6
Merge pull request #1249 from drf5n/PID_CI_v2
...
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
2014-12-28 10:09:25 +01:00
23e768dffa
Merge pull request #1250 from chertykov/Development
...
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
2014-12-28 10:09:08 +01:00
