Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #1

Open
wants to merge 34 commits into
base: Stable
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
cb12161
Add Filament menu and add Filament/Retract settings to config store.
wgm4321 Dec 29, 2014
d60efc3
Fix syntax error caused by previous changes.
wgm4321 Dec 29, 2014
2701dd8
Due to the fix for #1248, X and Y probe offsets must not be floats.
vandarin Dec 31, 2014
a18b625
Merge pull request #1261 from wgm4321/Development
boelle Jan 2, 2015
63da690
Merge pull request #1282 from vandarin/Development
boelle Jan 2, 2015
1d5d853
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
drf5n Jan 2, 2015
f3e503e
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
drf5n Jan 2, 2015
ecda6cd
Fix typo, PID_BED_POWER -> MAX_BED_POWER
alhirzel Jan 2, 2015
edac64e
Add Filament menu and add Filament/Retract settings to config store.
wgm4321 Dec 29, 2014
b32be2d
Fix syntax error caused by previous changes.
wgm4321 Dec 29, 2014
1f520a5
Due to the fix for #1248, X and Y probe offsets must not be floats.
vandarin Dec 31, 2014
f3209bb
Merge branch 'Development' of https://github.com/alhirzel/Marlin into…
alhirzel Jan 2, 2015
eed451e
rework analogInputToDigitalPin definition
alhirzel Jan 2, 2015
b5e50cd
Move scripts and documentation to subfolders
thinkyhead Jan 2, 2015
912ed15
Merge pull request #1292 from thinkyhead/docs_and_scripts
alexborro Jan 2, 2015
f36fd3d
Merge branch 'Development' of https://github.com/ErikZalm/Marlin into…
alhirzel Jan 2, 2015
3f9707a
Added .gitignore back into repo
monkeydave Jan 3, 2015
86cc22d
Readd .travis.yml, change build enviroment to use ino instead of gcc
monkeydave Jan 3, 2015
21cc188
Updated .travis.yml for ErikZalm branch pull request
monkeydave Jan 3, 2015
9d9a2d7
Merge pull request #1295 from monkeydave/Re-add_gitignore
boelle Jan 3, 2015
206b7f4
Update .gitignore
boelle Jan 3, 2015
b5c6f11
Merge pull request #1297 from monkeydave/Readd-Travis-CI
boelle Jan 3, 2015
be81dfa
Updated .travis.yml so others forks will also compile
monkeydave Jan 3, 2015
07b85f8
Added compile checks for lots of defines in Configuration.h
monkeydave Jan 3, 2015
f8aa5ff
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLL…
wgm4321 Jan 3, 2015
04fb34c
Add English defines for filament menu to non-English to prevent compi…
wgm4321 Jan 3, 2015
9d57c37
Commented out configs that are failing with no easy fixes for the moment
monkeydave Jan 3, 2015
3d9f4ac
Merge pull request #1303 from wgm4321/Development
boelle Jan 4, 2015
efca4af
Merge pull request #1304 from monkeydave/Travis-CI
boelle Jan 4, 2015
c5f138e
Merge pull request #1291 from alhirzel/Development
boelle Jan 4, 2015
3024821
temp runaway: proper cast to prevent any overflow.
Jan 3, 2015
d2b6e62
Merge pull request #1309 from philfifi/fix_temp_runaway
alexborro Jan 4, 2015
9472bbe
issue 968 for dev branch
i-make-robots Jan 4, 2015
0978619
issue 1318
i-make-robots Jan 6, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Due to the fix for MarlinFirmware#1248, X and Y probe offsets must no…
…t 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.
vandarin authored and alhirzel committed Jan 2, 2015
commit 1f520a5a8c4f3bfdf373dd4b5e0b6b7a8ae30e9e
1 change: 1 addition & 0 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
@@ -392,6 +392,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of


// these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
// X and Y offsets must be integers
#define X_PROBE_OFFSET_FROM_EXTRUDER -25
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35