Scott Lahteine
424d5495e4
Add PIDTEMPBED to EEPROM
2015-04-03 16:38:05 -07:00
Scott Lahteine
6b919e14c1
Group all universal variables
2015-04-03 15:45:41 -07:00
Scott Lahteine
21cd2e4fae
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
2015-04-03 15:32:15 -07:00
Scott Lahteine
0e8182bbf2
Additional pin tests, cleanup
2015-04-03 15:31:35 -07:00
Wurstnase
45565b680d
second wrong feedrate
2015-04-03 18:01:28 +02:00
Wurstnase
581b2aae04
fix feedrate for homing z
...
max_feedrate is in mm/s. line_to_destination needs a feedrate in mm/min because there is feedrate/60.
2015-04-03 16:11:32 +02:00
Edward Patel
48b1c3822f
Merge branch 'Development-Marlin' into Development
2015-04-03 00:46:30 +02:00
Richard Wackerbarth
ccdaea51ba
Add KosselPro
2015-04-02 09:20:24 -05:00
Richard Wackerbarth
f4599143eb
Allow M115 to better reflect the build
2015-04-02 09:20:24 -05:00
Richard Wackerbarth
34c7d45879
Hook for Auto-generated Build Version
...
The automatic versioning system extracts a
build version number from the SCM system
That versioning information is written to the file
_Version.h, a file that is NOT preserved in the SCM.
If such a file will be present,
we include it here to utilize the parameters
that are defined therein.
2015-04-02 09:20:24 -05:00
Scott Lahteine
c756b4cf07
Comment tweak
2015-04-02 06:11:03 -07:00
AnHardt
23cd54755f
Fix typo in Marlin_main.cpp
...
related to current_position[Z_AXIS] and retract_zlift.
'+ =' -> '+='
Fix for #1786
2015-04-02 14:50:31 +02:00
Scott Lahteine
e96df67630
Clarify thermal_runaway_protection
...
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
2015-04-02 05:10:14 -07:00
Chris Roadfeldt
0afe6696f0
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
2015-04-01 19:31:20 -05:00
Chris Roadfeldt
59994bd519
Not doing network admin work, pin not ping... :)
2015-04-01 19:24:42 -05:00
Chris Roadfeldt
916f59e35f
Spaces not tabs in language.h.
...
Catch unlikely but possible error and head crash when using
Z_PROBE_REPEATABILITY_TEST
2015-04-01 19:22:05 -05:00
Scott Lahteine
66b3b53e76
Merge pull request #1762 from AnHardt/MiMa
...
Fix MIN&MAX temperatures again
2015-04-01 16:52:07 -07:00
Edward Patel
6b91b7b411
Mesh bed leveling: Added G29 S3 + finer steps in manual probing.
...
* Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually
* Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h
2015-04-01 21:18:51 +02:00
Chris Roadfeldt
26dc80bf2d
Typo fixed...
2015-04-01 13:47:17 -05:00
Chris Roadfeldt
2966ae2022
Fix Z_PROBE_PING not declared, allows code to compile if Z_PROBE_ENDSTOP
...
is not used.
2015-04-01 13:32:25 -05:00
Wurstnase
67d5e7973e
old bump_divisor for cartesian/corexy-printer
...
some people are starting to ask why homing is so slow. this is the old standard hard-coded value.
2015-04-01 20:17:49 +02:00
Chris Roadfeldt
bb41edc2ef
Fixed extra #endif
2015-04-01 12:13:25 -05:00
Chris Roadfeldt
a57862e29f
Cleaning up code in prep for merge with upstream.
2015-04-01 11:40:24 -05:00
Chris Roadfeldt
745d9fe1a4
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
...
Conflicts:
Marlin/Marlin_main.cpp
2015-04-01 10:31:02 -05:00
AnHardt
488666832b
Remove the previously introduced ()
2015-04-01 13:40:05 +02:00
Scott Lahteine
443468df8d
Merge pull request #1771 from AnHardt/iss1770
...
Added new - changed entries from Fix up LCD_PROGRESS_BAR
2015-04-01 02:13:30 -07:00
Scott Lahteine
9593f09b99
Merge pull request #1764 from thinkyhead/probe_leveling
...
Fix homing and leveling
2015-04-01 02:00:39 -07:00
Scott Lahteine
72c7de3570
Cleanup M48
2015-04-01 01:48:45 -07:00
Scott Lahteine
97a258b0b0
Clean up, document home_axis
2015-04-01 01:44:13 -07:00
AnHardt
831016b09f
Added new - changed entries from Fix up LCD_PROGRESS_BAR
...
for when no LCD is defined.
Fix for #1770 .
2015-04-01 10:17:17 +02:00
Chris Roadfeldt
a508d835db
Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP.
...
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
2015-04-01 02:14:55 -05:00
Chris Roadfeldt
fdb4ddbdea
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
2015-04-01 00:52:08 -05:00
atfield90
d273c90d53
Added support for Atmega 1281 chip
2015-04-01 05:15:27 +02:00
Scott Lahteine
1c7391717e
Include sync_plan_position_delta for SCARA also
2015-03-31 19:58:03 -07:00
Scott Lahteine
8231fb166d
Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM
...
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
2015-03-31 19:29:48 -07:00
Scott Lahteine
0b57a2ab8b
Merge pull request #1757 from bq/Translation-strings
...
Added new trasnslatable labels.
2015-03-31 18:56:25 -07:00
Scott Lahteine
18bb6be80e
Fix homing and leveling
...
- Include the current Z when raising the axis after and between probing
- Add `sync_plan_position_delta` for parity with `sync_plan_position`
- Clean up and clarify `M48`, `dock_sled`, and others
2015-03-31 18:52:19 -07:00
AnHardt
3f2e863206
Improve conditions for HAS_TEMP
...
and use them in temperuture.h
Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.
2015-04-01 02:56:14 +02:00
AnHardt
85f8a26ba4
Fix MIN&MAX temperatures again
...
replaced GE0 with th matching GEX in the second row.
added some ()
2015-04-01 00:48:04 +02:00
AnHardt
19b11dfdd7
Fix can't enter MENU_MULTIPLIER_ITEM
2015-03-31 18:29:16 +02:00
Chris Roadfeldt
c89b8368ee
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
2015-03-31 11:08:36 -05:00
Ivan Galvez Junquera
d08782386b
Added new trasnslatable labels.
...
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
EN, FR, DE, ES, IT, PT, PT-BR.
2015-03-31 16:59:43 +02:00
Scott Lahteine
97a69d9b1c
Correct XYZ after obtaining plan_bed_level_matrix
...
The current position needs to be updated by using the inverse
`plan_bed_level_matrix` on X, Y, and Z. All moves in the planner are
transformed by the `plan_bed_level_matrix` from this point forward.
2015-03-31 04:24:13 -07:00
Scott Lahteine
5f6962dd90
Merge pull request #1755 from thinkyhead/fixup_config
...
Raise when not retracting
2015-03-31 03:47:01 -07:00
Scott Lahteine
ae89ccd2c7
Use Z_RAISE_BETWEEN_PROBINGS
2015-03-31 03:45:21 -07:00
Scott Lahteine
9a5a7a3f68
Raise when not retracting
...
Code to raise the probe before retraction is good, but the code should
always raise the probe, not just when retracting
2015-03-31 03:38:03 -07:00
Scott Lahteine
6ff1620fcb
Merge pull request #1753 from thinkyhead/fix_extruder_offset
...
Fix EXTRUDER_OFFSET compiler error
2015-03-31 03:21:45 -07:00
Scott Lahteine
cda4bd4ad9
Correct the comment about M206
2015-03-31 03:20:15 -07:00
Scott Lahteine
935592cf6a
offsets off by default
2015-03-31 02:50:52 -07:00
Scott Lahteine
2a45922afe
Restore extruder_offset, init more simply
2015-03-31 02:49:47 -07:00
Scott Lahteine
28792e5731
Fix typo in assignment
2015-03-31 02:10:49 -07:00
Scott Lahteine
bb6174524f
Fix EXTRUDER_OFFSET compiler error
...
- Addressing issue #1741
2015-03-31 02:08:57 -07:00
Scott Lahteine
571652c49b
Fix LCD click
...
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
2015-03-31 01:41:24 -07:00
Chris Roadfeldt
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
2015-03-31 03:07:57 -05:00
Chris Roadfeldt
17707e7479
Fixed Z_PROBE_PIN pullup bug.
...
Documented some additional areas that should be addressed if Z_PROBE is
fully separated from Z_MIN or Z_MAX.
Fixed a documentation error in sanity checks. Servos start at 0 not 1.
2015-03-31 02:56:41 -05:00
Scott Lahteine
21ab44cfa7
Merge pull request #1750 from thinkyhead/fixup_config
...
Bring all configs up to date
2015-03-30 23:49:04 -07:00
Scott Lahteine
50145266cd
Merge pull request #1748 from thinkyhead/raise_before_homing
...
Apply Z_RAISE_BEFORE_HOMING before homing XY
2015-03-30 23:37:41 -07:00
Scott Lahteine
a117b6bff6
Merge pull request #1747 from thinkyhead/progress_bar_tweak
...
Fix up LCD_PROGRESS_BAR
2015-03-30 23:37:28 -07:00
Scott Lahteine
3348b3bf0c
Allow SD_FINISHED_RELEASECOMMAND to be undefined
2015-03-30 23:31:48 -07:00
Scott Lahteine
82794fa5f7
Add delta generic not renaming
2015-03-30 23:25:04 -07:00
Scott Lahteine
ba2c7cb467
Update configs with all the latest
2015-03-30 23:24:33 -07:00
Chris Roadfeldt
ec1d9c0b8f
Use Z_PROBE_ENDSTOP_INVERTING when checking pin status.
2015-03-31 01:06:01 -05:00
Chris Roadfeldt
3175c70c79
Manually synching back up with MarlinFirmware/Development.
2015-03-31 00:11:11 -05:00
Chris Roadfeldt
faac2af4af
Merge remote-tracking branch 'origin/Development' into Development
2015-03-31 00:03:07 -05:00
Chris Roadfeldt
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
2015-03-30 23:59:01 -05:00
Chris Roadfeldt
e08f8eed05
Revert 06f767d..cba5692
...
This rolls back to commit 06f767d608
.
2015-03-30 23:51:36 -05:00
Scott Lahteine
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
2015-03-30 21:15:16 -07:00
Chris Roadfeldt
992b07ca57
Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled.
2015-03-30 22:58:10 -05:00
Chris Roadfeldt
cba5692673
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
2015-03-30 22:33:05 -05:00
Scott Lahteine
8500c80b33
Apply Z_RAISE_BEFORE_HOMING before homing XY
2015-03-30 20:22:21 -07:00
Scott Lahteine
92b54aa27e
#define HAS_POWER_SWITCH
2015-03-30 19:44:53 -07:00
Scott Lahteine
5519882eea
Fix up LCD_PROGRESS_BAR
...
- Some messages should not expire with `PROGRESS_MSG_EXPIRE`.
- Simplify conditional for progress bar with sanity checks.
- Rename `messageTick` to `expireStatusMillis` and make it the expire
time.
2015-03-30 18:00:54 -07:00
Scott Lahteine
6864280803
Use elif and parentheses in conditionals
2015-03-30 16:52:27 -07:00
Scott Lahteine
8c136a5ab5
Conditionals and comments for PS = 0
2015-03-30 16:50:05 -07:00
Scott Lahteine
2faed961ce
Allow POWER_SUPPLY 0 for no power switch
2015-03-30 16:39:47 -07:00
Scott Lahteine
baa6787393
Merge pull request #1740 from thinkyhead/fixup_homing
...
Apply leveling for DELTA
2015-03-30 15:45:33 -07:00
AnHardt
9ac7dc675e
Make filament display on dogm_... same as hitachi...
...
Thanks @MagoKimbra.
2015-03-30 16:56:21 +02:00
AnHardt
50a732360a
Replace extrudemultiply by extruder_multiply[active_extruder]
...
Fix for #1460 .
Seems to work with only one extruder. Can't test this myself with more.
2015-03-30 13:35:03 +02:00
Scott Lahteine
e63076504d
Merge pull request #1733 from AnHardt/c20
...
Get back folder symbols on Hitachi displays
2015-03-30 01:57:00 -07:00
Scott Lahteine
41d258697a
Pass the z for after probing to retract_z_probe
...
A `z_before` value is passed to probe_pt, but the `retract_z_probe`
function assumes that Z is 0, doesn’t add `current_position[Z_AXIS]` as
other cases do. This may be superfluous, so this is a test, and will be
reverted if it has no effect.
2015-03-30 00:45:02 -07:00
croadfeldt
06f767d608
Merge remote-tracking branch 'upstream/development' into development
2015-03-30 02:10:49 -05:00
Scott Lahteine
b47fa8c064
Merge pull request #1735 from AnHardt/compilerCandy
...
Remove some further warnings
2015-03-29 23:55:19 -07:00
Scott Lahteine
e96db1cd6c
Make G29 shared function inline
2015-03-29 23:21:39 -07:00
Scott Lahteine
d73b169de3
Apply leveling for DELTA,
...
- Fix `prepare_move` function not calling `adjust_delta`
- Add more shorthand for plan_buffer_line.
- Fix wrong `federate` usage, assuming they are all mm/m
- Minor `stepper.cpp` cleanup
2015-03-29 23:16:12 -07:00
Scott Lahteine
85b67e5223
Merge pull request #1738 from thinkyhead/fixup_homing
...
Fix G29 E and M48 n
2015-03-29 20:08:19 -07:00
Scott Lahteine
ce44bee28b
Small code reduction
2015-03-29 19:45:14 -07:00
Scott Lahteine
0213f7f016
Cleanup case for M666
2015-03-29 19:39:43 -07:00
Scott Lahteine
803425e12c
Fix G29 E and M48 n
...
- Users prefer `G29 E` to work like `M48 E` so fixed that
- `M48 n` replaced with `M48 P` (or `p`). `n` legacy support
- Shorten some strings to save precious bytes
- Smaller code for 3-point probing
2015-03-29 18:56:09 -07:00
Scott Lahteine
1e9999711c
Merge pull request #1736 from thinkyhead/fixup_homing
...
Fix G28 homing Y with X
2015-03-29 18:27:17 -07:00
Scott Lahteine
d738b7acdd
Merge pull request #1724 from Natealus/Development
...
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
2015-03-29 18:26:32 -07:00
Scott Lahteine
e8ae51bfe3
Fix G28 homing Y with X
...
- Fixed a typo causing G28 to home incorrectly
- Added documentation to G28
- Added homeXYZ bools to neaten the code
- Added a note about home_offsets being questionable
2015-03-29 18:06:59 -07:00
AnHardt
7b2550a604
Times can't be negative.
...
cardreader.cpp needs temperature.h for autotempShutdown() when
AUTOTEMP is defined but warns about unused variables.
Unpublished variables by putting them in to temperature.cpp.
2015-03-30 01:58:46 +02:00
AnHardt
507efa771b
Remove unused variable fan_rot
...
and satisfy the compiler about the implicit compare.
2015-03-30 01:46:38 +02:00
AnHardt
2b959a7752
Some additional {} to make the compiler happy.
2015-03-30 01:42:35 +02:00
AnHardt
0f1bd6e4a7
In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned
...
therefor in macro ST7920_WRITE_BYTE(a) cast a to uint8_t
to make the compiler happy.
2015-03-30 01:40:58 +02:00
AnHardt
81bab8739d
Get back folder symbols on Hitachi displays
...
and make use of column 20.
2015-03-29 17:29:48 +02:00
Chris Roadfeldt
a9802c95b3
Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is.
2015-03-29 04:18:37 -05:00
Chris Roadfeldt
62834a1c43
Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,
...
unless Z_SAFE_HOMING is.
2015-03-29 03:55:41 -05:00
Chris Roadfeldt
666fad3494
Typo fixed in sanity check.
2015-03-29 03:25:03 -05:00
Chris Roadfeldt
08a7aa16c5
Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined.
2015-03-29 03:21:48 -05:00