Steffen Vogel
df17a6a1b4
fix #1305 by proposed workaround (thanks gaby64)
2015-01-06 10:29:26 +01:00
Steffen Vogel
f7e65935fb
make use of power operator
2015-01-06 10:28:43 +01:00
Steffen Vogel
4e02aff9b5
automatically determine min/max temp for terminator
2015-01-06 10:28:19 +01:00
Steffen Vogel
81363bc441
more cleanups
2015-01-06 10:27:40 +01:00
Steffen Vogel
95f4a55820
refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients
2015-01-06 08:24:59 +01:00
Steffen Vogel
21205cc3d8
more cleanups in the termistorTable generation script
2015-01-06 08:23:51 +01:00
Steffen Vogel
fb0996b5db
improved output aligment and precision
2015-01-06 08:20:52 +01:00
Steffen Vogel
538231edfd
cosmetic whitespace cleanup and comments added/updated
2015-01-06 08:20:20 +01:00
wgm4321
067b509479
Re-enable filament menu with recalc fix when enabling/disabling mm3
2015-01-05 22:29:29 -05:00
wgm4321
a19f2f8ae7
Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled
2015-01-04 22:15:16 -05:00
wgm4321
f24dda9700
Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3"
...
This reverts commit dd7e4ee97f
2015-01-04 22:08:41 -05:00
wgm4321
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
...
This reverts commit 2b9722f387
2015-01-04 21:53:37 -05:00
wgm4321
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
2015-01-04 21:44:55 -05:00
wgm4321
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
2015-01-04 21:42:16 -05:00
Bo Herrmannsen
00e4bc9f54
Merge pull request #1311 from i-make-robots/Development
...
issue 968 for dev branch
2015-01-04 21:29:29 +01:00
Dan Royer
9472bbe51d
issue 968 for dev branch
...
try, try again.
If 'OK' is garbled on sending PC won't receive it. Both machines will
wait on each other forever. This resends OK if nothing is heard from PC
for a while to avoid this bad case.
2015-01-04 12:17:46 -08:00
alexborro
d2b6e62996
Merge pull request #1309 from philfifi/fix_temp_runaway
...
temp runaway: proper cast to prevent any overflow.
2015-01-04 12:55:58 -02:00
Philippe L
30248214c7
temp runaway: proper cast to prevent any overflow.
2015-01-04 14:23:31 +01:00
Bo Herrmannsen
c5f138ea07
Merge pull request #1291 from alhirzel/Development
...
Define analogInputToDigitalPin only if needed
2015-01-04 12:53:41 +01:00
Bo Herrmannsen
efca4afab2
Merge pull request #1304 from monkeydave/Travis-CI
...
Added further tests to Travis CI config
2015-01-04 12:52:38 +01:00
Bo Herrmannsen
3d9f4ac757
Merge pull request #1303 from wgm4321/Development
...
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
2015-01-04 01:29:26 +01:00
monkeydave
9d57c376db
Commented out configs that are failing with no easy fixes for the moment
2015-01-03 22:46:15 +00:00
wgm4321
04fb34c7ff
Add English defines for filament menu to non-English to prevent compile errors until translated
2015-01-03 17:28:05 -05:00
wgm4321
f8aa5ff771
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined
2015-01-03 17:10:13 -05:00
monkeydave
07b85f8b92
Added compile checks for lots of defines in Configuration.h
2015-01-03 19:29:04 +00:00
monkeydave
be81dfa3de
Updated .travis.yml so others forks will also compile
2015-01-03 16:50:05 +00:00
Bo Herrmannsen
b5c6f11e41
Merge pull request #1297 from monkeydave/Readd-Travis-CI
...
Readd .travis.yml
2015-01-03 14:22:07 +01:00
Bo Herrmannsen
206b7f4e92
Update .gitignore
2015-01-03 13:52:52 +01:00
Bo Herrmannsen
9d9a2d75ef
Merge pull request #1295 from monkeydave/Re-add_gitignore
...
Added .gitignore back into repo
2015-01-03 13:51:31 +01:00
monkeydave
21cc188272
Updated .travis.yml for ErikZalm branch pull request
2015-01-03 12:09:12 +00:00
monkeydave
86cc22d639
Readd .travis.yml, change build enviroment to use ino instead of gcc
2015-01-03 11:43:40 +00:00
monkeydave
3f9707aa33
Added .gitignore back into repo
2015-01-03 10:56:10 +00:00
Alexander Hirzel
f36fd3ddec
Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development
2015-01-02 12:39:39 -05:00
alexborro
912ed155c5
Merge pull request #1292 from thinkyhead/docs_and_scripts
...
Move scripts and documentation to subfolders
2015-01-02 14:56:39 -02:00
Scott Lahteine
b5e50cdd4e
Move scripts and documentation to subfolders
2015-01-02 08:53:09 -08:00
Alexander Hirzel
eed451e034
rework analogInputToDigitalPin definition
2015-01-02 11:14:20 -05:00
Alexander Hirzel
f3209bba34
Merge branch 'Development' of https://github.com/alhirzel/Marlin into Development
2015-01-02 11:13:38 -05:00
Lane Roberts
1f520a5a8c
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.
2015-01-02 11:12:16 -05:00
wgm4321
b32be2dc64
Fix syntax error caused by previous changes.
2015-01-02 11:12:16 -05:00
wgm4321
edac64e7d2
Add Filament menu and add Filament/Retract settings to config store.
2015-01-02 11:12:15 -05:00
Alexander Hirzel
ecda6cdc0a
Fix typo, PID_BED_POWER -> MAX_BED_POWER
2015-01-02 11:12:15 -05:00
David Forrest
f3e503e725
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
2015-01-02 11:12:15 -05:00
David Forrest
1d5d853c9a
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
2015-01-02 11:12:15 -05:00
Bo Herrmannsen
63da6900b0
Merge pull request #1282 from vandarin/Development
...
Due to the fix for #1248 , X and Y probe offsets must not be floats.
2015-01-02 15:35:40 +01:00
Bo Herrmannsen
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
2015-01-02 15:35:29 +01:00
alexborro
975810fb4a
Merge pull request #1286 from alhirzel/Development
...
Fix typo, PID_BED_POWER -> MAX_BED_POWER
2015-01-02 09:48:20 -02:00
Alexander Hirzel
ae12ad0d6c
Fix typo, PID_BED_POWER -> MAX_BED_POWER
2015-01-02 01:38:03 -05:00
alexborro
80b17ab573
Merge pull request #1285 from drf5n/PID_CI_v2
...
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
2015-01-01 22:56:21 -02:00
David Forrest
625860f086
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
2015-01-01 19:24:42 -05:00
David Forrest
6583bb781d
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
2015-01-01 19:11:42 -05:00
