Scott Lahteine
837ceb9abb
Merge pull request #1867 from epatel/Development
...
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
10 years ago
Scott Lahteine
a95544f92a
Spell adjustment
10 years ago
Scott Lahteine
a00ebf03d4
Merge pull request #1868 from AnHardt/LCD_STR
...
Moved the definitions of the LCD_STR_* to Conditionals.h
10 years ago
Scott Lahteine
1269c445ab
Catch dangerous extrude before trying several
10 years ago
Natealus
585eee6549
Z Probe inverting not present in example configs, causes error
...
The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
invert the logic of the endstop is in the main configuration.h but
wasn't present in the example configuration.h's. Causes a compiling
error with Z Probe enabled. Just added it to all the configs. :)
10 years ago
AnHardt
c5961892e3
Bulgarian for all the Configuration.h's
10 years ago
AnHardt
6248c93f37
Introduction of Bulgarian - language_bgr.h
...
Thank you @Nprod!
10 years ago
AnHardt
540dbb35e2
And an other MSG_BED in Marlin_main.cpp
10 years ago
AnHardt
14d4419e16
Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed")
...
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
10 years ago
AnHardt
ea897654a4
Moved the definitions of the LCD_STR_* to Conditionals.h
...
to avoid errors in Marlin_main.cpp. #1860
In the include tree of Marlin_main.cpp the decision between the display types is not made.
To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
A 'dogm_lcd_implementation.h.h' would be a curiosity.
So i moved both of the definition blocks to conditionals.h
On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
10 years ago
Edward Patel
7dc64efe67
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
10 years ago
AnHardt
6a514f3dc9
Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp
...
and cleaned typo.
10 years ago
AnHardt
a76fb42ca6
Merge https://github.com/MarlinFirmware/Marlin into contrast
10 years ago
AnHardt
bcc04192fc
Remove Contrast Menu for U8GLIB_ST7920
...
The other two devices we use in u8glib have more than only dummy code.
Checked this in the library code.
10 years ago
Scott Lahteine
4788b59300
Thermistor values for configurator
10 years ago
Scott Lahteine
bb917ecda8
Merge pull request #1853 from thinkyhead/dev_version
...
Set version to "1.0.3 dev"
10 years ago
Scott Lahteine
caa7734402
Merge pull request #1864 from thinkyhead/is_running
...
IsStopped / IsRunning inline
10 years ago
Scott Lahteine
3162971cd6
current_position not static
10 years ago
Scott Lahteine
27cb90da8b
IsStopped / IsRunning inline
10 years ago
Max
07fc2b5b70
Update language_ru.h
10 years ago
Scott Lahteine
756bb5e268
Cleanup formatting in hitachi & dogm lcd
10 years ago
Scott Lahteine
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
10 years ago
Scott Lahteine
43773ff735
Formatting and lcd contrast masking
10 years ago
Scott Lahteine
eb6e3886f4
Set version to "1.0.3 dev"
10 years ago
Scott Lahteine
cf9b58452c
Minimum delay in menu click feedback
...
Squished #1849
10 years ago
Scott Lahteine
1d291be2ba
Fix de after PREVENT_DANGEROUS_EXTRUDE
...
- Set `de` to 0 when `position[E] = target[E]`
- Address regression mention in #1846
10 years ago
Scott Lahteine
e03da4805b
Merge pull request #1774 from epatel/Development
...
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
10 years ago
Scott Lahteine
f7c4e7e19f
Fix G29 not deploying in some instances
10 years ago
Edward Patel
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
10 years ago
Edward Patel
002340f32c
Merge branch 'Development-Marlin' into Development
10 years ago
Scott Lahteine
c379f17117
Encapsulate setting of homing_bump_feedrate
10 years ago
Scott Lahteine
7d2c2f1790
Updates for the configurator
...
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
10 years ago
Scott Lahteine
967db181d0
Latest upstream commits
10 years ago
Scott Lahteine
e502144eda
Fixup formatting of last commit
10 years ago
Scott Lahteine
d05efa008d
Merge pull request #1825 from shaggythesheep/bugfix_no_heaters
...
Bugfix: Temperature checks when no heaters in use
10 years ago
Scott Lahteine
d20f42c883
Don't stow the probe until the last grid point!
...
- Address Issue #1682 at hash #issuecomment-89756858
10 years ago
Scott Lahteine
5c2bb05af3
Merge pull request #1839 from AnHardt/fix-statusmessage
...
Fix lcd_status_message
10 years ago
Scott Lahteine
d70a4a3847
Merge pull request #1823 from AnHardt/splashscreen
...
Disable splash-screen when done once
10 years ago
Scott Lahteine
56aea5f8e5
Merge pull request #1829 from Natealus/Development
...
Azteeg X3 Pro Pin fix ups
10 years ago
Scott Lahteine
6a860b99dc
Merge pull request #1828 from Wackerbarth/Configurator
...
Update Configurator Files
10 years ago
AnHardt
ac843fbf3b
Fix lcd_status_message
...
Because we now can use utf8 with up to 3 bytes per symbol,
lcd_status_message[] must be 3*LCD_WIDTH wide.
Filling up the message, or cutting to length, are fixed to.
Fix for #1832 about at the end.
10 years ago
Scott Lahteine
6d084c017f
Fix typo in FWRETRACT handler
...
Should be `retracting` and not `retract`
10 years ago
Edward Patel
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
10 years ago
Edward Patel
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
10 years ago
AnHardt
6ae714894e
Now the simplycistic solution.
...
Just and only display splashscreen only once.
10 years ago
AnHardt
d521693641
Revert "Draw content in display loop only when needed"
...
This reverts commit bf04a92cc0
.
10 years ago
Natealus
b6f2bff461
Azteeg X3 Pro Pin fix ups
10 years ago
Scott Lahteine
d867c18535
Fix compile error with Z_DUAL_ENDSTOPS
10 years ago
Richard Wackerbarth
46474cf2f2
Incorporate @section headers from configurator
10 years ago
Richard Wackerbarth
cf66cb8808
Bring configurator up-to-date
10 years ago
Richard Miles
1a5293c2ce
Prevents MINTEMP / MAXTEMP when no heaters present
...
This commit checks whether or not HEATER_0 is in use, and if not, skips
the MIN / MAX temperature checks.
10 years ago
Edward Patel
5360158545
Merge branch 'Development-Marlin' into Development
10 years ago
AnHardt
bf04a92cc0
Draw content in display loop only when needed
...
Example for splash screen.
10 years ago
AnHardt
9865318f1c
Disable splash-screen when done once
...
Splash screen was shown with every display init.
That means every time the menus where entered.
Note the 2 in the initialisation.
The buffer is already written in two steps a 512 byte.
Without the 2 only the upper half is shown.
10 years ago
Scott Lahteine
53eb662908
Have the configurator read from MarlinFirmware repo
10 years ago
Edward Patel
d24ea7c03f
Added Comment in hope of github seeing these updates
10 years ago
Edward Patel
61de6ecd54
Added change to example Configuration.h's
10 years ago
Edward Patel
2f0081bbb5
Compile error fix! Fix for merge artifacts.
10 years ago
Edward Patel
0e6514e7bd
Bug fix! Missed putting z value back in right slot after zigzag mod.
10 years ago
Edward Patel
ea10601406
Merge branch 'Development-Marlin' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine
cb02bc6db4
Merge pull request #1817 from AnHardt/dogm_looptest
...
Execute DOGM display-loop less often
10 years ago
quillford
b02a55e60f
Fixed scara directions
...
Config said for a delta instead of for a scara
10 years ago
Scott Lahteine
6c5f07c5cb
Merge pull request #1813 from thinkyhead/fixup_probing
...
Fix bad thermal runaway trigger
10 years ago
AnHardt
340d165a9c
Reduce display updates for dogm displays
...
In 'if (encoderPastThreshold || LCD_CLICKED)' lcdDrawUpdate was not set.
'lcd_status_update_delay'-loop was not effective in function
lcd_status_screen().
The loop prevented the update of the status screen but not the displays
update.
Shifted the loop into lcd_update().
10 years ago
AnHardt
418d22d7b3
Revert "Testloop cleanup"
...
This reverts commit 6361404b91
.
10 years ago
AnHardt
6361404b91
Testloop cleanup
...
Shifted condition should still be in.
10 years ago
AnHardt
6d4b3f0d6a
Move the condition before the loop
...
Result see: https://youtu.be/AEnBzdu9_tk
Dot is moving not so fast -> less executed loops.
10 years ago
AnHardt
4cb7dfc546
Move the 'alive dot' in every displayloop
...
Result see: https://www.youtube.com/watch?v=tdu7J0i-c4g
Loop is executed several times per display update.
10 years ago
Scott Lahteine
b0f198c153
heater_index above its use
10 years ago
Scott Lahteine
60f8e0386f
More thermal runaway states
10 years ago
Scott Lahteine
f9dbd73652
Fix tr_target_temperature type - float!
10 years ago
Scott Lahteine
c83faa9c5e
Merge pull request #1811 from thinkyhead/fixup_probing
...
Compare indices instead of floats for probe actions
10 years ago
Scott Lahteine
61f8394361
Compare indices instead of floats for probe actions
10 years ago
Scott Lahteine
a98183b463
Merge pull request #1809 from Wackerbarth/LanguageCleanup
...
Deferring default definition made #undef unnecessary
10 years ago
Scott Lahteine
41ded7e996
Merge pull request #1805 from thinkyhead/fixup_probing
...
Optimize coordinate copying, fix EXTRUDER_RUNOUT_PREVENT
10 years ago
Richard Wackerbarth
4119738e69
Deferring default definition made #undef unnecessary
10 years ago
Scott Lahteine
6f06d33be5
Fix missing refresh_cmd_timeout function
10 years ago
Scott Lahteine
2d099a2c70
Fix missing backslash in macro
10 years ago
Scott Lahteine
0f9b29e6c5
Merge pull request #1803 from Natealus/Development
...
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
10 years ago
Scott Lahteine
0935084141
Fix manage_inactivity
...
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
10 years ago
Scott Lahteine
c065da52ec
Spacing and spelling
10 years ago
Scott Lahteine
a3e129e091
Merge pull request #1801 from thinkyhead/fixup_probing
...
Minor optimizations
10 years ago
Natealus
ab11f90da0
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
...
Just a simple #ifdef Z_PROBE_ENDSTOP to define the pin for it. Also has
a couple commented lines for switching Z_MIN_PIN if needed.
10 years ago
Scott Lahteine
8680b515b0
Fix missing tmp_extruder -> target_extruder
10 years ago
Natealus
a6ba40ae48
Compiling error temperature.cpp with multiple extruders defined
...
It wouldn't compile because of this line in temperature.cpp it turns out
it was just a stray ( that didn't line up with the previous lines so I
just made it in line with the rest and it compiled fine.
10 years ago
Scott Lahteine
fc3c76fc16
Fix #1800
10 years ago
Scott Lahteine
c185912c19
Latest upstream commits, mostly
10 years ago
Scott Lahteine
1e5c18bb14
Add code_value_short and SERIAL_CHAR
10 years ago
Scott Lahteine
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
10 years ago
Scott Lahteine
4c7af484f8
Merge pull request #1787 from thinkyhead/fixup_tr
...
Fix: thermal_runaway_protection triggered by target temperature increase
10 years ago
Scott Lahteine
c747becec1
Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom
...
Add PIDTEMPBED to EEPROM
10 years ago
Scott Lahteine
84e4edaea7
Add M48 comment for #1794
10 years ago
Scott Lahteine
9ba55baa5b
Track target temperature separately for each heater
10 years ago
Scott Lahteine
528e32a1d4
Fix timeout in thermal_runaway when temperature is set higher
10 years ago
Scott Lahteine
b98ebd517e
disable / enable_all_steppers functions
10 years ago
Scott Lahteine
713953d8c1
Upstream commits, allow no extruder in M105
10 years ago
Scott Lahteine
8f893eb8df
Merge pull request #1798 from thinkyhead/fixup_probing
...
Fix probe height at G28 start
10 years ago
Scott Lahteine
dde7e11f8e
Merge branch 'Development' into fixup_tr
...
Latest upstream commits
10 years ago
Scott Lahteine
abd7fc36b6
Fix probe height at G28 start
10 years ago
Scott Lahteine
610c8c5471
Merge pull request #1795 from thinkyhead/fixup_probing
...
Finish pin tests
10 years ago
Scott Lahteine
e4934164e4
Merge pull request #1790 from Wurstnase/fix_home_z
...
fix feedrate for homing z
10 years ago
Scott Lahteine
a469d796e1
Add cleanups needed for #1772
10 years ago
Scott Lahteine
c0ca26cd50
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
10 years ago
Scott Lahteine
5c1f08a35f
Merge pull request #1772 from croadfeldt/Merge_cleanup
...
Z_PROBE_ENDSTOP
10 years ago
Scott Lahteine
db7b0ea0cf
Merge pull request #1569 from Wackerbarth/Development
...
Incorporating Build Numbers
10 years ago
Scott Lahteine
92119d0f7d
Static delta[] for SCARA
10 years ago
Scott Lahteine
007a4bd421
Adjust spacing in view function
10 years ago
Scott Lahteine
424d5495e4
Add PIDTEMPBED to EEPROM
10 years ago
Scott Lahteine
6b919e14c1
Group all universal variables
10 years ago
Scott Lahteine
21cd2e4fae
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
10 years ago
Scott Lahteine
0e8182bbf2
Additional pin tests, cleanup
10 years ago
Wurstnase
45565b680d
second wrong feedrate
10 years ago
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.
10 years ago
Edward Patel
48b1c3822f
Merge branch 'Development-Marlin' into Development
10 years ago
Richard Wackerbarth
ccdaea51ba
Add KosselPro
10 years ago
Richard Wackerbarth
f4599143eb
Allow M115 to better reflect the build
10 years ago
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.
10 years ago
Scott Lahteine
c756b4cf07
Comment tweak
10 years ago
AnHardt
23cd54755f
Fix typo in Marlin_main.cpp
...
related to current_position[Z_AXIS] and retract_zlift.
'+ =' -> '+='
Fix for #1786
10 years ago
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
10 years ago
Chris Roadfeldt
0afe6696f0
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
10 years ago
Chris Roadfeldt
59994bd519
Not doing network admin work, pin not ping... :)
10 years ago
Chris Roadfeldt
916f59e35f
Spaces not tabs in language.h.
...
Catch unlikely but possible error and head crash when using
Z_PROBE_REPEATABILITY_TEST
10 years ago
Scott Lahteine
66b3b53e76
Merge pull request #1762 from AnHardt/MiMa
...
Fix MIN&MAX temperatures again
10 years ago
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
10 years ago
Chris Roadfeldt
26dc80bf2d
Typo fixed...
10 years ago
Chris Roadfeldt
2966ae2022
Fix Z_PROBE_PING not declared, allows code to compile if Z_PROBE_ENDSTOP
...
is not used.
10 years ago
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.
10 years ago
Chris Roadfeldt
bb41edc2ef
Fixed extra #endif
10 years ago
Chris Roadfeldt
a57862e29f
Cleaning up code in prep for merge with upstream.
10 years ago
Chris Roadfeldt
745d9fe1a4
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
AnHardt
488666832b
Remove the previously introduced ()
10 years ago
Scott Lahteine
443468df8d
Merge pull request #1771 from AnHardt/iss1770
...
Added new - changed entries from Fix up LCD_PROGRESS_BAR
10 years ago
Scott Lahteine
9593f09b99
Merge pull request #1764 from thinkyhead/probe_leveling
...
Fix homing and leveling
10 years ago
Scott Lahteine
72c7de3570
Cleanup M48
10 years ago
Scott Lahteine
97a258b0b0
Clean up, document home_axis
10 years ago
AnHardt
831016b09f
Added new - changed entries from Fix up LCD_PROGRESS_BAR
...
for when no LCD is defined.
Fix for #1770 .
10 years ago
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.
10 years ago
Chris Roadfeldt
fdb4ddbdea
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
atfield90
d273c90d53
Added support for Atmega 1281 chip
10 years ago
Scott Lahteine
1c7391717e
Include sync_plan_position_delta for SCARA also
10 years ago
Scott Lahteine
8231fb166d
Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM
...
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
10 years ago
Scott Lahteine
0b57a2ab8b
Merge pull request #1757 from bq/Translation-strings
...
Added new trasnslatable labels.
10 years ago
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
10 years ago
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.
10 years ago
AnHardt
85f8a26ba4
Fix MIN&MAX temperatures again
...
replaced GE0 with th matching GEX in the second row.
added some ()
10 years ago
AnHardt
19b11dfdd7
Fix can't enter MENU_MULTIPLIER_ITEM
10 years ago
Chris Roadfeldt
c89b8368ee
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
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.
10 years ago
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.
10 years ago
Scott Lahteine
5f6962dd90
Merge pull request #1755 from thinkyhead/fixup_config
...
Raise when not retracting
10 years ago
Scott Lahteine
ae89ccd2c7
Use Z_RAISE_BETWEEN_PROBINGS
10 years ago
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
10 years ago
Scott Lahteine
6ff1620fcb
Merge pull request #1753 from thinkyhead/fix_extruder_offset
...
Fix EXTRUDER_OFFSET compiler error
10 years ago
Scott Lahteine
cda4bd4ad9
Correct the comment about M206
10 years ago
Scott Lahteine
935592cf6a
offsets off by default
10 years ago
Scott Lahteine
2a45922afe
Restore extruder_offset, init more simply
10 years ago
Scott Lahteine
28792e5731
Fix typo in assignment
10 years ago
Scott Lahteine
bb6174524f
Fix EXTRUDER_OFFSET compiler error
...
- Addressing issue #1741
10 years ago
Scott Lahteine
571652c49b
Fix LCD click
...
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
10 years ago
Chris Roadfeldt
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
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.
10 years ago
Scott Lahteine
21ab44cfa7
Merge pull request #1750 from thinkyhead/fixup_config
...
Bring all configs up to date
10 years ago
Scott Lahteine
50145266cd
Merge pull request #1748 from thinkyhead/raise_before_homing
...
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
Scott Lahteine
a117b6bff6
Merge pull request #1747 from thinkyhead/progress_bar_tweak
...
Fix up LCD_PROGRESS_BAR
10 years ago
Scott Lahteine
3348b3bf0c
Allow SD_FINISHED_RELEASECOMMAND to be undefined
10 years ago
Scott Lahteine
82794fa5f7
Add delta generic not renaming
10 years ago
Scott Lahteine
ba2c7cb467
Update configs with all the latest
10 years ago
Chris Roadfeldt
ec1d9c0b8f
Use Z_PROBE_ENDSTOP_INVERTING when checking pin status.
10 years ago
Chris Roadfeldt
3175c70c79
Manually synching back up with MarlinFirmware/Development.
10 years ago
Chris Roadfeldt
faac2af4af
Merge remote-tracking branch 'origin/Development' into Development
10 years ago
Chris Roadfeldt
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
10 years ago
Chris Roadfeldt
e08f8eed05
Revert 06f767d..cba5692
...
This rolls back to commit 06f767d608
.
10 years ago
Scott Lahteine
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
10 years ago
Chris Roadfeldt
992b07ca57
Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled.
10 years ago
Chris Roadfeldt
cba5692673
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
10 years ago
Scott Lahteine
8500c80b33
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
Scott Lahteine
92b54aa27e
#define HAS_POWER_SWITCH
10 years ago
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.
10 years ago
Scott Lahteine
6864280803
Use elif and parentheses in conditionals
10 years ago
Scott Lahteine
8c136a5ab5
Conditionals and comments for PS = 0
10 years ago
Scott Lahteine
2faed961ce
Allow POWER_SUPPLY 0 for no power switch
10 years ago
Scott Lahteine
baa6787393
Merge pull request #1740 from thinkyhead/fixup_homing
...
Apply leveling for DELTA
10 years ago
AnHardt
9ac7dc675e
Make filament display on dogm_... same as hitachi...
...
Thanks @MagoKimbra.
10 years ago
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.
10 years ago
Scott Lahteine
e63076504d
Merge pull request #1733 from AnHardt/c20
...
Get back folder symbols on Hitachi displays
10 years ago
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.
10 years ago
croadfeldt
06f767d608
Merge remote-tracking branch 'upstream/development' into development
10 years ago
Scott Lahteine
b47fa8c064
Merge pull request #1735 from AnHardt/compilerCandy
...
Remove some further warnings
10 years ago
Scott Lahteine
e96db1cd6c
Make G29 shared function inline
10 years ago
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
10 years ago
Scott Lahteine
85b67e5223
Merge pull request #1738 from thinkyhead/fixup_homing
...
Fix G29 E and M48 n
10 years ago
Scott Lahteine
ce44bee28b
Small code reduction
10 years ago
Scott Lahteine
0213f7f016
Cleanup case for M666
10 years ago
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
10 years ago
Scott Lahteine
1e9999711c
Merge pull request #1736 from thinkyhead/fixup_homing
...
Fix G28 homing Y with X
10 years ago
Scott Lahteine
d738b7acdd
Merge pull request #1724 from Natealus/Development
...
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
10 years ago
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
10 years ago
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.
10 years ago
AnHardt
507efa771b
Remove unused variable fan_rot
...
and satisfy the compiler about the implicit compare.
10 years ago
AnHardt
2b959a7752
Some additional {} to make the compiler happy.
10 years ago
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.
10 years ago
AnHardt
81bab8739d
Get back folder symbols on Hitachi displays
...
and make use of column 20.
10 years ago
Chris Roadfeldt
a9802c95b3
Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is.
10 years ago
Chris Roadfeldt
62834a1c43
Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,
...
unless Z_SAFE_HOMING is.
10 years ago
Chris Roadfeldt
666fad3494
Typo fixed in sanity check.
10 years ago
Chris Roadfeldt
08a7aa16c5
Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined.
10 years ago
Chris Roadfeldt
80285251cc
More config cleanup work for Z_PROBE_AND_ENDSTOP.
10 years ago
Chris Roadfeldt
fe4549cd83
Config file Z_PROBE_AND_ENDSTOP description clean up.
10 years ago
Chris Roadfeldt
82d2f11129
More additional sanity checks for Z_PROBE_AND_ENDSTOP
10 years ago
Chris Roadfeldt
05134f0807
Additional Sanity Checks for Z_PROBE_AND_ENDSTOP
10 years ago
Chris Roadfeldt
c75a5e8c55
Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h.
...
Confirmed Sanity checks are working.....
10 years ago
Chris Roadfeldt
a98ac4033b
Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support.
10 years ago
Chris Roadfeldt
6125124d6c
Config file cleanup for Z_PROBE_AND_ENDSTOP support.
10 years ago
Chris Roadfeldt
324c14943b
Bug fixes for Z_PROBE_AND_ENDSTOP.
...
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
10 years ago
Natealus
ca5821aa57
Made #ifdef DELTA branch instead
...
Another fellow here gave me the idea to do it this way
10 years ago
Natealus
04fda6b3e9
Undesired behavior with endstops swapped
...
Made my swap commented out so its the option not the default.
10 years ago
Natealus
ca1477d830
Revert "Undesired behavior with endstops swapped"
...
This reverts commit 15028e9b08
.
10 years ago
Natealus
15028e9b08
Undesired behavior with endstops swapped
...
I made my changes to swap MIN and MAX endstops on the Azteeg X3 Pro the
option rather than the default to fix unexpected reversal.
10 years ago
Nate Stokes
18245c6cd2
Update pins_RAMBO.h
...
Updated for the changes that Thinkyhead made before I submitted mine.
10 years ago
Natealus
234a9d0b12
Viki 2 Pins from Manual
...
I added in the pins into the new board files for the Azteeg X3, X3 Pro,
Printrboard, and Rambo. I'm sure it can be added for others too but
these are the manual specified pins. Just like many things here though,
I can't test for the boards other than the Azteeg X3 Pro. Hopefully it
works smoothly for everyone who happens on this nifty display. :)
10 years ago
Scott Lahteine
a22efc5f11
Merge pull request #1597 from Wurstnase/g29_auto_script
...
G29 auto script
10 years ago
Scott Lahteine
62a3da9618
Merge pull request #1723 from thinkyhead/tweak_g92
...
Tweak G92
10 years ago
Scott Lahteine
afff968e88
ARRAY_BY_EXTRUDERS, shorthand to sync planner
...
- Add some documentation to planner and stepper headers
- Patch up RAMBO pins with undefs
- Add `sync_plan_position` inline to set current XYZE
- Swap indices in `extruder_offset` to fix initialization values
10 years ago
Scott Lahteine
2b0c25a091
Tweak G92 to call plan_set_position only once, yes?
10 years ago
Natealus
22bea37393
Azteeg X3 Pro Pin Revisions
...
I added the fan pins in here and left them at -1 in configuration_adv.h
and it works fine. Pinned for a 4 extruder from 1-4 and HE5 being the
controller fan, HE6 being the Extruder Auto Fan/Water pump in the Kraken
case, and HE7 being for part cooling fan. Added in descriptions for the
MIN MAX pin swap and for servo motor additions.
10 years ago
Scott Lahteine
93dc0d0518
Merge pull request #1718 from AnHardt/blink
...
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
10 years ago
Scott Lahteine
edb67ea165
Patch generic delta config
...
- Addressing issue mentioned at #1699
10 years ago
AnHardt
c481c3b180
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
...
to avoid warnings about unused blink.
Concentrate definitions of variables in dogm_lcd_implementation.h to one place.
Make only local used variable currentfont static.
10 years ago
Chris Roadfeldt
059052889f
Further Sanity Checks for Z_PROBE_AND_ENDSTOP.
10 years ago
Chris Roadfeldt
8b81f20c61
Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to
...
be.
Added Sanity Check for it.
Added hook so it's enabled.
10 years ago
Chris Roadfeldt
fd823449ad
Added serial message for Z Probe trigger.
10 years ago
Chris Roadfeldt
92eb8109ab
Fix declaration of old_z_probe_endstop.
10 years ago
Chris Roadfeldt
44b88b41a2
Added credit for code.
10 years ago
Chris Roadfeldt
2979b40a7a
Fixed typo in Z Probe and Endstop section.
10 years ago
Chris Roadfeldt
9f3ff14008
Enabled separate Z Probe and Z Axis endstop use at same time.
...
Typo fixes in comments in existing code.
10 years ago
Scott Lahteine
b14be7235e
Merge pull request #1585 from galexander1/strtod_e_fix
...
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
10 years ago
Scott Lahteine
ba871e46bf
Fix compiler warnings
...
- Patched up for most included configurations
10 years ago
Scott Lahteine
ffe0df4b36
Latest upstream commits
10 years ago
Scott Lahteine
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
10 years ago
Scott Lahteine
abfcbd793f
Merge pull request #1693 from chris-bo/rework_lcd_beeper
...
use only one implementation for beeper feedback
10 years ago
Scott Lahteine
55739a4efe
Fix Z_APPLY_STEP
10 years ago
Scott Lahteine
df02b992b0
Fix redundant_temperatrure_raw setting
10 years ago
Scott Lahteine
fe29bdd72b
Also fix temperature externs
10 years ago
Scott Lahteine
578f93bc26
Fixup temp arrays and leveling equation, prepare for merge
10 years ago
Scott Lahteine
7d472367e2
Merge pull request #1713 from epatel/Development
...
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
10 years ago
Scott Lahteine
ce485175eb
Give all temp arrays 4 indices
10 years ago
Edward Patel
782464ea4d
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
10 years ago
Scott Lahteine
460f73056b
Fix ECHOPAIR ambiguity
...
- Also patch up some warnings
10 years ago
Scott Lahteine
19d418cd6a
Fix up the code to eliminate warnings
10 years ago
Scott Lahteine
b2496533c6
Put " M" into pmem
10 years ago
Scott Lahteine
267d6bef15
Eliminate most warnings
...
- Fix a bug reading `code_value` for `M503 Sn`
- Hide and remove unused variables
10 years ago
Scott Lahteine
3fd7790a15
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
Scott Lahteine
b76a352d41
Fix the planeNormal calculation
10 years ago
Scott Lahteine
410f64782a
Always 4 temp sensors
10 years ago
Scott Lahteine
0b32431551
Remove abs() from planeNormal.z
10 years ago
Scott Lahteine
53169d96e8
Set temp_meas_ready in set_current_temp_raw
10 years ago
Scott Lahteine
06eb7f5b3c
Latest upstream commits
10 years ago
Scott Lahteine
04328d7537
Add zprobe_zoffset in set_bed_level_equation_*
...
- Also a small tweak to SanityCheck.h
10 years ago
Scott Lahteine
d2e73545ba
Merge pull request #1705 from AnHardt/ddt
...
Avoid warnings in SanitiCheck.h
10 years ago
Scott Lahteine
78090275a9
Fix probe range editing
...
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
10 years ago
AnHardt
1ff6df8f9e
Avoid warnings in SanitiCheck.h
...
/SanityCheck.h:107:53: warning: missing terminating ' character
...
10 years ago
AnHardt
ebe5b87c2c
< like in the oher compareble loops
...
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
10 years ago
AnHardt
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
10 years ago
Christian Bohn
eab5fad539
code formatting
10 years ago
Scott Lahteine
abadeac08d
Group zprobe_zoffset with bed leveling
10 years ago
Scott Lahteine
9e8427f253
Merge pull request #1698 from zeuseye/Development
...
Clean "fromsd" array if not SDSUPPORT
10 years ago
Scott Lahteine
32331faee4
Prettify Bed Level Correction Matrix
...
- Put + in front of positive values in the output
10 years ago
Scott Lahteine
f5f4c2b366
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
Scott Lahteine
7667023817
Merge pull request #1694 from Wurstnase/fix_z_config
...
comment #define Z_DUAL_STEPPER_DRIVERS
10 years ago
Scott Lahteine
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
Scott Lahteine
ad05a726c1
Merge pull request #1691 from AnHardt/PID_dt
...
Move definition of PIDdT back to temperature.h
10 years ago
Scott Lahteine
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
10 years ago
Scott Lahteine
fbf9b21e0c
Merge plus fixup zprobe_zoffset
...
- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`
10 years ago
Scott Lahteine
96b5da7198
Fix up bed leveling code
...
- Init `zprobe_zoffset`
- Remove `current_position[Z_AXIS] = zprobe_zoffset` lines from the
`set_bed_level_equation_*` functions
- Apply standards to `mesh_bed_leveling` files
- Document `MESH_BED_LEVELING`
10 years ago
Scott Lahteine
02b4f5f9cd
Merge pull request #1689 from AnHardt/MAXand161
...
Fix MAX6675 again and introduce set_current_temp_raw()
10 years ago
AnHardt
f680e509c4
Enclosed error-messages for TEMP_SENSOR_1_AS_REDUNDANT in PSTR()
10 years ago
Victor Torre
d43d47da14
Clean "fromsd" array is not SDSUPPORT
...
if not have SDSUPPORT the fromsd array is not necessary
10 years ago
AnHardt
ac81b4084f
Make variables and function static.
10 years ago
alexborro
55025558dc
Implement Dry-Run mode in G29
...
It just probe all the bed without appliying the matrix.
Useful after a first G29 to check the topology.
10 years ago
wurstnase
a4ad9117dd
comment #define Z_DUAL_STEPPER_DRIVERS
10 years ago
chris-bo
2dfd0e5ce7
Update Configuration.h
...
documentation how to disable buzzer feedback
10 years ago
Christian Bohn
4c3cbc0961
use only one implementation for beeper feedback
10 years ago
AnHardt
01cc97a3c3
Corected condition for PIDdT
10 years ago
AnHardt
94330705c7
Move definition of PIDdT back to temperature.h
...
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
10 years ago
AnHardt
dd0067afa6
Fix MAX6675 again and introduce set_current_temp_raw()
...
to make the temperature-code work again with Arduino 1.0.6.
Sorry could not make an extra block on base level.
10 years ago
AnHardt
8848b7e9ef
Add the missed {} to END_MENU in ultralcd.cpp
...
what caused an extra update of encoderLine most of the time.
10 years ago
AnHardt
4beffbca69
Make SMALL_INFOFONT configurable.
...
Tweak the documentation
10 years ago
CONSULitAS
045ea42cc8
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
alexborro
c2ba5d0c09
Fix ZigZag and Topograph table
...
ZigZag: Inverted Behavior.. If T supplied, it does not zigzag.
Topograph table: The table was rotated 90º clockwise.
10 years ago
alexborro
0ce3576685
New Feature: Z_DUAL_ENDSTOPS
...
Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z
steppers - Let's call them Z stepper and Z2 stepper.
That way the machine is capable to align the bed during home, since both
Z steppers are homed.
There is also an implementation of M666 (software endstops adjustment)
to this feature.
After Z homing, this adjustment is applied to just one of the steppers
in order to align the bed.
One just need to home the Z axis and measure the distance difference
between both Z axis and apply the math: Z adjust = Z - Z2.
If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it
is.. think about it) and the Z adjust would be positive.
Play a little bit with small adjustments (0.5mm) and check the
behaviour.
The M119 (endstops report) will start reporting the Z2 Endstop as well.
10 years ago
AnHardt
c686069ccd
Revert "Remove 6x9 font"
...
This reverts commit e6cb8ee188
.
Conflicts:
Marlin/dogm_lcd_implementation.h
Confilkt solved
Needs rework.
10 years ago
AnHardt
b00a531df8
Revert "Removed now unneded FONT_STATUSMENU"
...
This reverts commit 8c5bb38748
.
10 years ago
AnHardt
9d589cbb2a
Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji
...
Conflicts:
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/language.h
Conflicts solved
10 years ago
Scott Lahteine
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
Scott Lahteine
0d81abe1c9
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
Scott Lahteine
01740fd9c6
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
Scott Lahteine
fc53e43de6
Don't test raw temp for MAX6675
...
- Remove test of raw temp for thermistor 0 when using MAX6675
- Longer `raw_temp_value` array for `TEMP_SENSOR_1_AS_REDUNDANT`
10 years ago
Scott Lahteine
03fa9fae9f
Merge branch 'Development' into fix_temperature_minmax
...
Latest upstream commits
10 years ago
Scott Lahteine
1fac388664
Revert measurement loop
10 years ago