Scott Lahteine
d05efa008d
Merge pull request #1825 from shaggythesheep/bugfix_no_heaters
...
Bugfix: Temperature checks when no heaters in use
2015-04-06 21:25:22 -07:00
Scott Lahteine
d20f42c883
Don't stow the probe until the last grid point!
...
- Address Issue #1682 at hash #issuecomment-89756858
2015-04-06 20:58:09 -07:00
Scott Lahteine
5c2bb05af3
Merge pull request #1839 from AnHardt/fix-statusmessage
...
Fix lcd_status_message
2015-04-06 19:08:25 -07:00
Scott Lahteine
d70a4a3847
Merge pull request #1823 from AnHardt/splashscreen
...
Disable splash-screen when done once
2015-04-06 18:48:48 -07:00
Scott Lahteine
56aea5f8e5
Merge pull request #1829 from Natealus/Development
...
Azteeg X3 Pro Pin fix ups
2015-04-06 18:19:33 -07:00
Scott Lahteine
6a860b99dc
Merge pull request #1828 from Wackerbarth/Configurator
...
Update Configurator Files
2015-04-06 18:09:26 -07:00
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.
2015-04-07 02:33:34 +02:00
Scott Lahteine
6d084c017f
Fix typo in FWRETRACT handler
...
Should be `retracting` and not `retract`
2015-04-06 17:04:22 -07:00
Edward Patel
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
2015-04-06 23:03:06 +02:00
Edward Patel
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
2015-04-06 19:38:59 +02:00
AnHardt
6ae714894e
Now the simplycistic solution.
...
Just and only display splashscreen only once.
2015-04-06 12:43:38 +02:00
AnHardt
d521693641
Revert "Draw content in display loop only when needed"
...
This reverts commit bf04a92cc0
.
2015-04-06 12:31:31 +02:00
Natealus
b6f2bff461
Azteeg X3 Pro Pin fix ups
2015-04-05 23:34:56 -06:00
Scott Lahteine
d867c18535
Fix compile error with Z_DUAL_ENDSTOPS
2015-04-05 20:48:08 -07:00
Richard Wackerbarth
46474cf2f2
Incorporate @section headers from configurator
2015-04-05 22:39:40 -05:00
Richard Wackerbarth
cf66cb8808
Bring configurator up-to-date
2015-04-05 22:38:15 -05:00
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.
2015-04-05 22:27:14 +01:00
Edward Patel
5360158545
Merge branch 'Development-Marlin' into Development
2015-04-05 20:28:44 +02:00
AnHardt
bf04a92cc0
Draw content in display loop only when needed
...
Example for splash screen.
2015-04-05 12:53:20 +02:00
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.
2015-04-05 12:24:01 +02:00
Scott Lahteine
53eb662908
Have the configurator read from MarlinFirmware repo
2015-04-04 20:19:17 -07:00
Edward Patel
d24ea7c03f
Added Comment in hope of github seeing these updates
2015-04-05 05:14:06 +02:00
Edward Patel
61de6ecd54
Added change to example Configuration.h's
2015-04-05 04:26:35 +02:00
Edward Patel
2f0081bbb5
Compile error fix! Fix for merge artifacts.
2015-04-05 04:16:16 +02:00
Edward Patel
0e6514e7bd
Bug fix! Missed putting z value back in right slot after zigzag mod.
2015-04-05 04:13:34 +02:00
Edward Patel
ea10601406
Merge branch 'Development-Marlin' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
2015-04-05 04:06:02 +02:00
Scott Lahteine
cb02bc6db4
Merge pull request #1817 from AnHardt/dogm_looptest
...
Execute DOGM display-loop less often
2015-04-04 17:29:56 -07:00
quillford
b02a55e60f
Fixed scara directions
...
Config said for a delta instead of for a scara
2015-04-04 15:26:35 -07:00
Scott Lahteine
6c5f07c5cb
Merge pull request #1813 from thinkyhead/fixup_probing
...
Fix bad thermal runaway trigger
2015-04-04 14:41:43 -07:00
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().
2015-04-04 22:02:24 +02:00
AnHardt
418d22d7b3
Revert "Testloop cleanup"
...
This reverts commit 6361404b91
.
2015-04-04 18:33:36 +02:00
AnHardt
6361404b91
Testloop cleanup
...
Shifted condition should still be in.
2015-04-04 17:56:13 +02:00
AnHardt
6d4b3f0d6a
Move the condition before the loop
...
Result see: https://youtu.be/AEnBzdu9_tk
Dot is moving not so fast -> less executed loops.
2015-04-04 17:49:39 +02:00
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.
2015-04-04 17:34:28 +02:00
Scott Lahteine
b0f198c153
heater_index above its use
2015-04-04 06:18:08 -07:00
Scott Lahteine
60f8e0386f
More thermal runaway states
2015-04-04 05:45:36 -07:00
Scott Lahteine
f9dbd73652
Fix tr_target_temperature type - float!
2015-04-04 05:25:53 -07:00
Scott Lahteine
c83faa9c5e
Merge pull request #1811 from thinkyhead/fixup_probing
...
Compare indices instead of floats for probe actions
2015-04-04 05:14:59 -07:00
Scott Lahteine
61f8394361
Compare indices instead of floats for probe actions
2015-04-04 05:01:16 -07:00
Scott Lahteine
a98183b463
Merge pull request #1809 from Wackerbarth/LanguageCleanup
...
Deferring default definition made #undef unnecessary
2015-04-04 04:37:20 -07:00
Scott Lahteine
41ded7e996
Merge pull request #1805 from thinkyhead/fixup_probing
...
Optimize coordinate copying, fix EXTRUDER_RUNOUT_PREVENT
2015-04-04 03:49:54 -07:00
Richard Wackerbarth
4119738e69
Deferring default definition made #undef unnecessary
2015-04-04 05:48:07 -05:00
Scott Lahteine
6f06d33be5
Fix missing refresh_cmd_timeout function
2015-04-04 03:47:25 -07:00
Scott Lahteine
2d099a2c70
Fix missing backslash in macro
2015-04-04 03:35:16 -07:00
Scott Lahteine
0f9b29e6c5
Merge pull request #1803 from Natealus/Development
...
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
2015-04-03 23:45:05 -07:00
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
2015-04-03 23:42:50 -07:00
Scott Lahteine
c065da52ec
Spacing and spelling
2015-04-03 22:54:48 -07:00
Scott Lahteine
a3e129e091
Merge pull request #1801 from thinkyhead/fixup_probing
...
Minor optimizations
2015-04-03 22:30:01 -07:00
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.
2015-04-03 23:14:03 -06:00
Scott Lahteine
8680b515b0
Fix missing tmp_extruder -> target_extruder
2015-04-03 22:12:49 -07:00
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.
2015-04-03 23:09:31 -06:00
Scott Lahteine
fc3c76fc16
Fix #1800
2015-04-03 22:04:42 -07:00
Scott Lahteine
c185912c19
Latest upstream commits, mostly
2015-04-03 21:58:48 -07:00
Scott Lahteine
1e5c18bb14
Add code_value_short and SERIAL_CHAR
2015-04-03 21:43:30 -07:00
Scott Lahteine
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
2015-04-03 20:45:24 -07:00
Scott Lahteine
4c7af484f8
Merge pull request #1787 from thinkyhead/fixup_tr
...
Fix: thermal_runaway_protection triggered by target temperature increase
2015-04-03 20:06:56 -07:00
Scott Lahteine
c747becec1
Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom
...
Add PIDTEMPBED to EEPROM
2015-04-03 20:03:38 -07:00
Scott Lahteine
84e4edaea7
Add M48 comment for #1794
2015-04-03 19:52:00 -07:00
Scott Lahteine
9ba55baa5b
Track target temperature separately for each heater
2015-04-03 19:42:40 -07:00
Scott Lahteine
528e32a1d4
Fix timeout in thermal_runaway when temperature is set higher
2015-04-03 19:34:55 -07:00
Scott Lahteine
b98ebd517e
disable / enable_all_steppers functions
2015-04-03 19:25:22 -07:00
Scott Lahteine
713953d8c1
Upstream commits, allow no extruder in M105
2015-04-03 19:16:38 -07:00
Scott Lahteine
8f893eb8df
Merge pull request #1798 from thinkyhead/fixup_probing
...
Fix probe height at G28 start
2015-04-03 19:03:00 -07:00
Scott Lahteine
dde7e11f8e
Merge branch 'Development' into fixup_tr
...
Latest upstream commits
2015-04-03 18:56:52 -07:00
Scott Lahteine
abd7fc36b6
Fix probe height at G28 start
2015-04-03 18:54:55 -07:00
Scott Lahteine
610c8c5471
Merge pull request #1795 from thinkyhead/fixup_probing
...
Finish pin tests
2015-04-03 18:44:44 -07:00
Scott Lahteine
e4934164e4
Merge pull request #1790 from Wurstnase/fix_home_z
...
fix feedrate for homing z
2015-04-03 18:35:09 -07:00
Scott Lahteine
a469d796e1
Add cleanups needed for #1772
2015-04-03 18:14:57 -07:00
Scott Lahteine
c0ca26cd50
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
2015-04-03 18:05:17 -07:00
Scott Lahteine
5c1f08a35f
Merge pull request #1772 from croadfeldt/Merge_cleanup
...
Z_PROBE_ENDSTOP
2015-04-03 18:04:31 -07:00
Scott Lahteine
db7b0ea0cf
Merge pull request #1569 from Wackerbarth/Development
...
Incorporating Build Numbers
2015-04-03 16:56:31 -07:00
Scott Lahteine
92119d0f7d
Static delta[] for SCARA
2015-04-03 16:46:56 -07:00
Scott Lahteine
007a4bd421
Adjust spacing in view function
2015-04-03 16:41:58 -07:00
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
Chris Roadfeldt
80285251cc
More config cleanup work for Z_PROBE_AND_ENDSTOP.
2015-03-29 03:06:20 -05:00
Chris Roadfeldt
fe4549cd83
Config file Z_PROBE_AND_ENDSTOP description clean up.
2015-03-29 03:04:59 -05:00
Chris Roadfeldt
82d2f11129
More additional sanity checks for Z_PROBE_AND_ENDSTOP
2015-03-29 02:53:55 -05:00
Chris Roadfeldt
05134f0807
Additional Sanity Checks for Z_PROBE_AND_ENDSTOP
2015-03-29 02:51:51 -05:00
Chris Roadfeldt
c75a5e8c55
Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h.
...
Confirmed Sanity checks are working.....
2015-03-29 02:38:08 -05:00
Chris Roadfeldt
a98ac4033b
Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support.
2015-03-29 02:36:26 -05:00
Chris Roadfeldt
6125124d6c
Config file cleanup for Z_PROBE_AND_ENDSTOP support.
2015-03-29 02:29:16 -05:00
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
2015-03-29 02:16:09 -05:00
Natealus
ca5821aa57
Made #ifdef DELTA branch instead
...
Another fellow here gave me the idea to do it this way
2015-03-29 01:08:00 -06:00
Natealus
04fda6b3e9
Undesired behavior with endstops swapped
...
Made my swap commented out so its the option not the default.
2015-03-29 00:55:47 -06:00
Natealus
ca1477d830
Revert "Undesired behavior with endstops swapped"
...
This reverts commit 15028e9b08
.
2015-03-29 00:52:53 -06:00
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.
2015-03-29 00:42:40 -06:00
Nate Stokes
18245c6cd2
Update pins_RAMBO.h
...
Updated for the changes that Thinkyhead made before I submitted mine.
2015-03-28 22:29:54 -06:00
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. :)
2015-03-28 22:11:12 -06:00
Scott Lahteine
a22efc5f11
Merge pull request #1597 from Wurstnase/g29_auto_script
...
G29 auto script
2015-03-28 20:54:17 -07:00
Scott Lahteine
62a3da9618
Merge pull request #1723 from thinkyhead/tweak_g92
...
Tweak G92
2015-03-28 20:53:37 -07:00
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
2015-03-28 20:33:21 -07:00
Scott Lahteine
2b0c25a091
Tweak G92 to call plan_set_position only once, yes?
2015-03-28 19:18:24 -07:00
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.
2015-03-28 20:14:42 -06:00
Scott Lahteine
93dc0d0518
Merge pull request #1718 from AnHardt/blink
...
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
2015-03-28 16:20:33 -07:00
Scott Lahteine
edb67ea165
Patch generic delta config
...
- Addressing issue mentioned at #1699
2015-03-28 14:13:25 -07:00
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.
2015-03-28 13:14:38 +01:00
Chris Roadfeldt
059052889f
Further Sanity Checks for Z_PROBE_AND_ENDSTOP.
2015-03-28 06:08:04 -05:00
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.
2015-03-28 05:55:42 -05:00
Chris Roadfeldt
fd823449ad
Added serial message for Z Probe trigger.
2015-03-28 05:42:38 -05:00
Chris Roadfeldt
92eb8109ab
Fix declaration of old_z_probe_endstop.
2015-03-28 05:09:48 -05:00
Chris Roadfeldt
44b88b41a2
Added credit for code.
2015-03-28 05:01:04 -05:00
Chris Roadfeldt
2979b40a7a
Fixed typo in Z Probe and Endstop section.
2015-03-28 04:41:03 -05:00
Chris Roadfeldt
9f3ff14008
Enabled separate Z Probe and Z Axis endstop use at same time.
...
Typo fixes in comments in existing code.
2015-03-28 04:31:51 -05:00
Scott Lahteine
b14be7235e
Merge pull request #1585 from galexander1/strtod_e_fix
...
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
2015-03-27 20:49:03 -07:00
Scott Lahteine
ba871e46bf
Fix compiler warnings
...
- Patched up for most included configurations
2015-03-27 20:29:05 -07:00
Scott Lahteine
ffe0df4b36
Latest upstream commits
2015-03-27 18:30:56 -07:00
Scott Lahteine
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
2015-03-27 18:24:19 -07:00
Scott Lahteine
abfcbd793f
Merge pull request #1693 from chris-bo/rework_lcd_beeper
...
use only one implementation for beeper feedback
2015-03-27 17:03:38 -07:00
Scott Lahteine
55739a4efe
Fix Z_APPLY_STEP
2015-03-27 17:02:11 -07:00
Scott Lahteine
df02b992b0
Fix redundant_temperatrure_raw setting
2015-03-27 16:37:22 -07:00
Scott Lahteine
fe29bdd72b
Also fix temperature externs
2015-03-27 16:26:07 -07:00
Scott Lahteine
578f93bc26
Fixup temp arrays and leveling equation, prepare for merge
2015-03-27 16:20:23 -07:00
Scott Lahteine
7d472367e2
Merge pull request #1713 from epatel/Development
...
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
2015-03-27 16:14:55 -07:00
Scott Lahteine
ce485175eb
Give all temp arrays 4 indices
2015-03-27 16:11:28 -07:00
Edward Patel
782464ea4d
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
2015-03-27 20:22:59 +01:00
Scott Lahteine
460f73056b
Fix ECHOPAIR ambiguity
...
- Also patch up some warnings
2015-03-27 00:46:39 -07:00
Scott Lahteine
19d418cd6a
Fix up the code to eliminate warnings
2015-03-27 00:32:58 -07:00
Scott Lahteine
b2496533c6
Put " M" into pmem
2015-03-26 20:30:14 -07:00
Scott Lahteine
267d6bef15
Eliminate most warnings
...
- Fix a bug reading `code_value` for `M503 Sn`
- Hide and remove unused variables
2015-03-26 20:07:17 -07:00
Scott Lahteine
3fd7790a15
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
2015-03-26 19:56:58 -07:00
Scott Lahteine
b76a352d41
Fix the planeNormal calculation
2015-03-26 17:14:07 -07:00
Scott Lahteine
410f64782a
Always 4 temp sensors
2015-03-26 16:22:21 -07:00
Scott Lahteine
0b32431551
Remove abs() from planeNormal.z
2015-03-26 16:20:23 -07:00
Scott Lahteine
53169d96e8
Set temp_meas_ready in set_current_temp_raw
2015-03-26 16:02:15 -07:00
Scott Lahteine
06eb7f5b3c
Latest upstream commits
2015-03-26 15:30:51 -07:00
Scott Lahteine
04328d7537
Add zprobe_zoffset in set_bed_level_equation_*
...
- Also a small tweak to SanityCheck.h
2015-03-26 15:29:16 -07:00
Scott Lahteine
d2e73545ba
Merge pull request #1705 from AnHardt/ddt
...
Avoid warnings in SanitiCheck.h
2015-03-26 15:16:37 -07:00
Scott Lahteine
78090275a9
Fix probe range editing
...
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
2015-03-26 13:52:48 -07:00
AnHardt
1ff6df8f9e
Avoid warnings in SanitiCheck.h
...
/SanityCheck.h:107:53: warning: missing terminating ' character
...
2015-03-26 21:30:53 +01:00
AnHardt
ebe5b87c2c
< like in the oher compareble loops
...
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
2015-03-26 21:18:19 +01:00
AnHardt
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
2015-03-26 10:05:00 +01:00
Christian Bohn
eab5fad539
code formatting
2015-03-26 09:00:34 +01:00
Scott Lahteine
abadeac08d
Group zprobe_zoffset with bed leveling
2015-03-25 23:06:33 -07:00
Scott Lahteine
9e8427f253
Merge pull request #1698 from zeuseye/Development
...
Clean "fromsd" array if not SDSUPPORT
2015-03-25 22:21:57 -07:00
Scott Lahteine
32331faee4
Prettify Bed Level Correction Matrix
...
- Put + in front of positive values in the output
2015-03-25 22:13:59 -07:00
Scott Lahteine
f5f4c2b366
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
2015-03-25 21:30:49 -07:00
Scott Lahteine
7667023817
Merge pull request #1694 from Wurstnase/fix_z_config
...
comment #define Z_DUAL_STEPPER_DRIVERS
2015-03-25 21:28:17 -07:00
Scott Lahteine
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
2015-03-25 21:24:38 -07:00
Scott Lahteine
ad05a726c1
Merge pull request #1691 from AnHardt/PID_dt
...
Move definition of PIDdT back to temperature.h
2015-03-25 21:22:39 -07:00
Scott Lahteine
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
2015-03-25 21:20:50 -07:00
Scott Lahteine
fbf9b21e0c
Merge plus fixup zprobe_zoffset
...
- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`
2015-03-25 21:14:00 -07:00
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`
2015-03-25 20:36:24 -07:00
Scott Lahteine
02b4f5f9cd
Merge pull request #1689 from AnHardt/MAXand161
...
Fix MAX6675 again and introduce set_current_temp_raw()
2015-03-25 20:23:51 -07:00
AnHardt
f680e509c4
Enclosed error-messages for TEMP_SENSOR_1_AS_REDUNDANT in PSTR()
2015-03-25 23:26:06 +01:00
Victor Torre
d43d47da14
Clean "fromsd" array is not SDSUPPORT
...
if not have SDSUPPORT the fromsd array is not necessary
2015-03-25 22:05:18 +01:00
AnHardt
ac81b4084f
Make variables and function static.
2015-03-25 21:37:15 +01:00
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.
2015-03-25 11:12:30 -03:00
wurstnase
a4ad9117dd
comment #define Z_DUAL_STEPPER_DRIVERS
2015-03-25 13:46:29 +01:00
chris-bo
2dfd0e5ce7
Update Configuration.h
...
documentation how to disable buzzer feedback
2015-03-25 12:44:29 +01:00
Christian Bohn
4c3cbc0961
use only one implementation for beeper feedback
2015-03-25 12:23:50 +01:00
AnHardt
01cc97a3c3
Corected condition for PIDdT
2015-03-25 12:08:23 +01:00
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'
2015-03-25 11:51:41 +01:00
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.
2015-03-25 11:08:24 +01:00
AnHardt
8848b7e9ef
Add the missed {} to END_MENU in ultralcd.cpp
...
what caused an extra update of encoderLine most of the time.
2015-03-25 09:48:21 +01:00
AnHardt
4beffbca69
Make SMALL_INFOFONT configurable.
...
Tweak the documentation
2015-03-24 23:40:04 +01:00
CONSULitAS
045ea42cc8
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-24 22:52:02 +01:00
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.
2015-03-24 15:50:31 -03:00
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.
2015-03-24 14:06:44 -03:00
AnHardt
c686069ccd
Revert "Remove 6x9 font"
...
This reverts commit e6cb8ee188
.
Conflicts:
Marlin/dogm_lcd_implementation.h
Confilkt solved
Needs rework.
2015-03-24 17:13:05 +01:00
AnHardt
b00a531df8
Revert "Removed now unneded FONT_STATUSMENU"
...
This reverts commit 8c5bb38748
.
2015-03-24 17:01:56 +01:00
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
2015-03-24 16:59:15 +01:00
Scott Lahteine
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-23 22:08:50 -07:00
Scott Lahteine
0d81abe1c9
Merge branch 'Development' into config_testing
...
Latest upstream commits
2015-03-23 21:13:04 -07:00
Scott Lahteine
01740fd9c6
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-23 21:12:36 -07:00
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`
2015-03-23 20:55:48 -07:00
Scott Lahteine
03fa9fae9f
Merge branch 'Development' into fix_temperature_minmax
...
Latest upstream commits
2015-03-23 20:42:48 -07:00
Scott Lahteine
1fac388664
Revert measurement loop
2015-03-23 15:18:22 -07:00
CONSULitAS
703f3b38c4
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-23 17:40:49 +01:00
nicolas-rambaud
37cde8a191
Report changes from previous PR from old code base including :
...
I've updated the minimum values from the LCD.
It has been a while that i want to at least fix this.
I have an inductive probe and often i need to set my zOffset to something lower than 0.5.
With the current implementation, the default LCD value is set to 0.5 for some reason.
On my case i need to be able to set it down to 0.0 as my inductive probe can be lower than 0.5.
Before with the LCD we couldn't change this value below 0.5. We had to flash the firmware every time which was painful.
Now we are able to change this value down to 0.0 if needed.
I've also changed the minimum value for Z min acceleration.
In the default configuration it's set to 25 but on the LCD the minimum was 100 which is not coherent.
I've changes the minimum to 10. On this axis, depending on the mechanics/motor drivers we might require very low acceleration, so i guess 10 is somehow realistic.
2015-03-23 12:29:12 +01:00
Scott Lahteine
b26a3ea02c
Merge pull request #1662 from josla972/refactor_scara
...
Refactor SCARA calibration. Save some lines of code and possibly ROM.
2015-03-23 00:51:18 -07:00
wurstnase
e6f6c6e3a1
fix bad insertion config again
2015-03-23 08:32:48 +01:00
Scott Lahteine
6bdee87be3
Cleanup temperature code
...
- Get rid of unused temp states in the ISR, resulting in more frequent
temperature reading with fewer sensors
- Shrink code slightly in min/max testing
2015-03-23 00:27:29 -07:00
Scott Lahteine
34a41648ab
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
2015-03-22 23:40:29 -07:00
Scott Lahteine
4fbb80567e
Get upstream commits
2015-03-22 23:07:22 -07:00
Scott Lahteine
7717e1ce33
Fix bad insert in configuration
2015-03-22 21:48:46 -07:00
Scott Lahteine
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
2015-03-22 21:45:20 -07:00
maverikou
15345cc249
Corrected Z_PROBE_ALLEN_KEY behaviour.
2015-03-22 13:54:51 +02:00
maverikou
0f034dd97e
Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED.
2015-03-22 13:54:45 +02:00
maverikou
6c96f32069
Blind fix for #1507
2015-03-22 13:54:21 +02:00
Josef Larsson
379348487e
Removed malplaced comment.
2015-03-22 12:21:31 +01:00
Scott Lahteine
8bd6e37b21
Merge pull request #1661 from thinkyhead/G92_no_offset
...
Don't add home offsets in G29
2015-03-21 16:49:06 -07:00
Scott Lahteine
582cd780cd
Fix compile error with *_DUAL_STEPPER_DRIVERS
...
- Patch up macros in stepper.cpp
2015-03-21 16:43:47 -07:00
Josef Larsson
9b3462f73f
Refactor SCARA calibration. Save some lines of code and possibly ROM.
2015-03-22 00:37:24 +01:00
Scott Lahteine
691e753cc3
Don't add home offsets in G29
...
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
2015-03-21 16:30:02 -07:00
Scott Lahteine
88e81a4804
Latest upstream commits, plus fixes
...
- Also add Manual Bed Leveling to the rest of the configs
2015-03-21 16:12:57 -07:00
Scott Lahteine
15eb5d35a2
Merge branch 'Development' into config_testing
...
Latest upstream commits
2015-03-21 15:42:45 -07:00
Scott Lahteine
19df90622b
Include Conditionals.h file in update
2015-03-21 15:40:20 -07:00
Scott Lahteine
9b639b4135
Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level
...
Manual bed leveling + mesh bed leveling
2015-03-21 15:39:42 -07:00
Scott Lahteine
2c9bd15625
Move LCD items to Conditionals.h
...
- `Conditionals.h` is included twice, setting LCD values the first time
2015-03-21 15:24:57 -07:00
Scott Lahteine
63abeaff38
Merge branch 'Development' into config_testing
...
Latest upstream commits
2015-03-21 15:03:06 -07:00
Scott Lahteine
3703694e30
Fix temperature min/max test
...
- Base tests on all thermistors/thermocouples, not just heater 0
2015-03-21 14:23:43 -07:00
Edward Patel
3d0a060a7a
Added G29 command
2015-03-21 14:50:47 +01:00
Edward Patel
c516747847
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-21 14:49:52 +01:00
Scott Lahteine
af14c684b5
Minor optimizations to planner code
...
- Prefetch values used more than once
2015-03-20 20:57:06 -07:00
Scott Lahteine
13fbf42d95
Cleanup of planner code
...
- Use named axis indexes, `X_AXIS` etc.
- Replace `block.steps_A` with block.steps[A]`
- Replace `A_segment_time` with `segment_time[A]`
- Add `A_AXIS`, `B_AXIS` for `COREXY` axes
- Conditional compile based on `EXTRUDERS`
- Add BLOCK_MOD macro for planner block indexes
- Apply coding standards to `planner.h` and `planner.cpp`
- Small optimizations of planner code
- Update `stepper.cpp` for new `block` struct
- Replace `memcpy` with loops, let the compiler unroll them
- Make `movesplanned` into an inline function
2015-03-20 20:42:49 -07:00
AnHardt
64e3d33893
Fix shrinked menucode
...
by updating 'encoderPosition' in END_MENU() line 1.
2015-03-20 23:36:14 +01:00
Edward Patel
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-20 15:46:01 +01:00
AnHardt
8c5bb38748
Removed now unneded FONT_STATUSMENU
2015-03-20 14:12:12 +01:00
Scott Lahteine
2176a22d42
Fix count_direction initializer
...
- Addressing #1625
2015-03-20 05:45:05 -07:00
AnHardt
e72cb3e45d
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix merge conflicts 2
2015-03-20 13:35:47 +01:00
Scott Lahteine
cb6942d4a7
Merge branch 'Development' into config_testing
...
Get upstream commits
2015-03-20 05:30:36 -07:00
AnHardt
6bfccaf99e
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fixed conflicts 1
2015-03-20 13:08:18 +01:00
Scott Lahteine
5644ad6809
Fix hiliting of edit items
2015-03-20 04:29:35 -07:00
Scott Lahteine
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
2015-03-20 04:15:18 -07:00
Scott Lahteine
526a755a66
Merge pull request #1652 from AnHardt/PIDdebug
...
PID debug
2015-03-20 04:14:08 -07:00
Scott Lahteine
a1c240b0a4
Delta supports some auto bed leveling options
2015-03-20 04:04:45 -07:00
Edward Patel
5112cf8422
Added comment for the EEPROM storage
2015-03-20 11:46:47 +01:00
Edward Patel
4619d80524
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-20 11:45:06 +01:00
Scott Lahteine
199151a4ed
Merge pull request #1650 from AnHardt/beautify
...
Beautivy statusscreen
2015-03-20 03:38:02 -07:00
Scott Lahteine
2424713a8f
Merge pull request #1640 from AnHardt/warning6
...
codepos not used in gcode_M28()
2015-03-20 02:58:00 -07:00
Scott Lahteine
b6d381f863
Divide up Conditionals to get LCD items early
2015-03-20 02:50:28 -07:00
AnHardt
e85061d20d
Added changes to the 'new' Configuration.h s
2015-03-20 10:36:29 +01:00
Scott Lahteine
33c7c6e11d
Conditionals.h requires Arduino.h
2015-03-20 01:27:14 -07:00
Scott Lahteine
8ade04b78e
Felix and Hephestos configs
...
- Not sure why these are showing as all new
2015-03-19 22:25:05 -07:00
Scott Lahteine
670006b919
Remove invariant code from Configurations
...
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
2015-03-19 22:22:23 -07:00
Edward Patel
a61f679568
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-20 02:28:35 +01:00
Edward Patel
c87faa69ed
Shortened mesh_plan_buffer_line()
2015-03-20 02:18:49 +01:00
AnHardt
47c1ea72af
Merge https://github.com/kieranc/Marlin into PIDdebug
...
Conflicts:
Marlin/temperature.cpp
Cleaned merge conflict.
Codeposition had changed.
Variable pid_input had vanished.
Signed-off-by: AnHardt <github@kitelab.de>
2015-03-20 00:07:36 +01:00
AnHardt
f1d3d1524d
Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify
...
Conflicts:
Marlin/dogm_lcd_implementation.h
solved merge conflict.
2015-03-19 22:51:22 +01:00
AnHardt
fa889cd6e1
Beautivy statusscreen
...
by shifting things some pixels around
2015-03-19 22:13:37 +01:00
Scott Lahteine
7279e4f82f
Small code tweaks re lcd.print
2015-03-19 14:01:33 -07:00
Scott Lahteine
90ba61b9b8
Include indicator for new drawmenu_generic
...
In the new method we pass the character that should be used for
selected state, not the character to print always.
2015-03-19 13:49:06 -07:00
Scott Lahteine
15d29efad5
Pass sel to lcd_implementation_mark_as_selected
...
- Pass selected state directly to lcd_implementation_mark_as_selected
- Rename sel function parameter
- Include a minor fix for SdBaseFile.h
2015-03-19 13:40:36 -07:00
Scott Lahteine
a547dc2148
Merge branch 'Development' into optimize_menu_code
...
Get upstream changes
2015-03-19 13:31:37 -07:00
CONSULitAS
9c1f6e7ac7
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-19 18:49:34 +01:00
alexborro
e650d4044e
Fix "Stop Print" function in the LCD menu
...
When one hit "Stop Print" option in LCD menu, the command buffer was not
cleared. The printer keep moving until the buffer has been emptied.
Actually I could not clear the command buffer as well.. I don't know
why, it doesnt work as expected.
I need to implement a routine inside Stepper ISR to handle such
situation.
2015-03-19 14:16:18 -03:00
AnHardt
e917477fec
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/fonts/make_fonts.bat
Claerd conflicts with my own #1621 . (His was easy. :-) )
corrected typo in fonts/README.fonts
Applied changes to the new delta-configurations
and deletet there some extra whitespace at the line-endings.
2015-03-19 12:35:43 +01:00
AnHardt
ae01a6b5f2
Make use of codepos.
...
Saves one addition.
Needs one pointer on the stack.
Don't know if this is a go trade.
2015-03-19 09:45:16 +01:00
Scott Lahteine
a534ac197a
Merge pull request #1621 from AnHardt/remove--6x9-font
...
Remove 6x9 font
2015-03-18 23:10:42 -07:00
Scott Lahteine
80e0ee10ca
Merge pull request #1631 from AnHardt/iss1593
...
Decrease KILL_DELAY
2015-03-18 19:10:38 -07:00
Scott Lahteine
4ce79920e5
Merge pull request #1635 from AnHardt/warnings1
...
Negative times are unlikly
2015-03-18 19:10:12 -07:00
Scott Lahteine
76127b8a55
Merge pull request #1630 from Wurstnase/fix_g29
...
optional parameters must be named when ignoring order
2015-03-18 19:09:40 -07:00
Scott Lahteine
be3f2dc1d9
Merge pull request #1636 from AnHardt/warning2
...
lcd_control_retract_menu() is conditional.
2015-03-18 19:09:05 -07:00
Scott Lahteine
8d396584bf
Merge pull request #1637 from AnHardt/warning3
...
lcd_autostart_sd() has two conditions.
2015-03-18 19:08:33 -07:00
Scott Lahteine
8664c6d465
Merge pull request #1638 from AnHardt/warning4
...
delta[3] not used when DELTA not defined.
2015-03-18 19:07:55 -07:00
Scott Lahteine
10711ccc6a
Merge pull request #1639 from AnHardt/warning5
...
G4 could wait for an undefined time
2015-03-18 19:07:14 -07:00
Edward Patel
28c91deb5c
EEPROM saving of z_values.
...
Tried to make it a little intelligent.
2015-03-18 21:07:07 +01:00
Edward Patel
240b5cfe04
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
2015-03-18 19:19:46 +01:00
alexborro
4521f6655b
Restore "S" parameter of M204 for retrocompatibility.
2015-03-18 12:19:30 -03:00
alexborro
5ddb8d94e2
Update Documentation related to M204
2015-03-18 11:09:10 -03:00
AnHardt
f8c4d43886
delta[3] is used with SCARA
...
Shoot in the dark.
2015-03-18 12:14:49 +01:00
AnHardt
72a9fed4fb
codepos not used in gcode_M28()
...
Got:
Marlin_main.cpp:2567: warning: unused variable 'codepos'
Needs revision.
Don't now how this should look like.
2015-03-18 11:41:14 +01:00
AnHardt
b94dd33641
G4 could wait for an undefined time
...
Got:
Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function
And indeed codenum is undefined when no parameter is given.
2015-03-18 11:23:41 +01:00
AnHardt
e90985a4e8
delta[3] not used when DELTA not defined.
...
got:
Marlin_main.cpp:387: warning: 'delta' defined but not used
Compiles cleaner when definition is removed.
2015-03-18 11:11:49 +01:00
AnHardt
5099b86ad4
lcd_autostart_sd() has two conditions.
...
got:
ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used
2015-03-18 10:51:13 +01:00
AnHardt
5d81c779cc
lcd_control_retract_menu() is conditional.
...
Got:
ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined
2015-03-18 10:39:59 +01:00
AnHardt
450b89e63c
Negative times are unlikly
...
While bunting an other bug I stumbled across:
ultralcd.cpp:1250: warning: comparison between signed and unsigned
integer expressions
Changed to the type of lcd_next_update_millis.
2015-03-18 10:31:34 +01:00
AnHardt
d1658eebfc
Decrease KILL_DELAY
...
Users hat to press kill-button for unexpexted lon times.
See #1593
2015-03-18 01:45:42 +01:00
Wurstnase
00adb2a6c1
optional parameters must be named when ignoring order
2015-03-18 01:02:29 +01:00
Edward Patel
0d43898a22
Remove of mesh_plan_buffer_line parameter reference (e)
2015-03-17 22:55:29 +01:00
Edward Patel
8067a985ce
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
...
Fixed conflicts:
Marlin/planner.h
2015-03-17 22:48:08 +01:00
wurstnase
05333f61b7
fix macro
2015-03-17 12:50:44 +01:00
AnHardt
1883e1bb60
Applied thinkyheads corrections from 2015-03-17
2015-03-17 11:23:44 +01:00
AnHardt
be79235ef2
Add new (cleaner) Marlin font
...
with sources in /fonts
2015-03-17 10:33:02 +01:00
Scott Lahteine
89fe77468d
Merge pull request #1586 from maverikou/delta_auto_bed_level
...
Delta auto bed level (Updated PR)
2015-03-16 18:17:11 -07:00
CONSULitAS
2b1ddc0413
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-16 22:12:17 +01:00
alexborro
cb676cdf39
Fix CoreXY homing bug introduced by PR #1606
...
The Check Endstop logic must be:
if (current_block->steps_x != current_block->steps_y || (TEST(out_bits,
X_AXIS) == TEST(out_bits, Y_AXIS)))
if (TEST(out_bits, X_HEAD))
not
if (TEST(out_bits, X_HEAD) && (current_block->steps_x !=
current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits,
Y_AXIS))))
Same applies for Y axis.
2015-03-16 16:31:25 -03:00
AnHardt
8a29dd4839
Cleaned typo in dogm_lcd_implementation.h
2015-03-16 20:18:48 +01:00
AnHardt
7e69f72db6
Moved font directory. Updated README.fonts
2015-03-16 17:27:27 +01:00
AnHardt
00b162a993
Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
...
Conflicts:
Marlin/language.h
Conflict cleaned
2015-03-16 17:13:49 +01:00
AnHardt
e38dd5f030
Merge remote-tracking branch 'origin/utf' into utf-kanji
2015-03-16 17:00:54 +01:00
AnHardt
08e4651ece
Corrected cyrillic font again
...
Thank you @Nprod.
2015-03-16 16:59:14 +01:00
Wurstnase
752c804677
remove offset, add minimum scan area
2015-03-16 15:13:16 +01:00
Wurstnase
14f0250853
allow negative values
...
and some more comments
2015-03-16 14:26:59 +01:00
AnHardt
e6cb8ee188
Remove 6x9 font
...
in dogm_lcd_implementation.h
by using standard font and
shifting down temperature displays by one pixel
Saves 2300 bytes.
2015-03-16 11:18:27 +01:00
maverikou
e93eb3e8d3
Update test
2015-03-16 09:16:00 +02:00
maverikou
b8ae3feb9e
Update test
2015-03-16 09:03:15 +02:00
maverikou
3570447ded
Fix Z_RAISE_AFTER_PROBING
2015-03-16 08:35:49 +02:00
maverikou
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
2015-03-16 08:24:26 +02:00
Scott Lahteine
7629c4f05c
Cleanup for menu optimization
...
- Compare pr_char to space
- Fewer calls to lcd_strlen
2015-03-15 22:54:54 -07:00
Scott Lahteine
3405f85a6a
Reduce size of menu code
...
- Get rid of _selected functions, passing selected state instead
2015-03-15 22:02:33 -07:00
Edward Patel
e983a5ab92
Disable option. Enable for use/test.
2015-03-16 02:50:11 +01:00
Edward Patel
f34b9c83d1
Added comment about MESH_NUM axis points.
2015-03-16 01:48:46 +01:00
Scott Lahteine
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
...
- Addressing issue #1608
2015-03-15 15:49:36 -07:00
Edward Patel
8005d22c81
Added menu option for bed leveling.
2015-03-15 23:24:32 +01:00
Edward Patel
0e51e53813
WIP. Adding bed leveling code.
2015-03-15 23:24:32 +01:00
Scott Lahteine
d0d12962e0
Merge pull request #1615 from AnHardt/fix-1611
...
Fix #1611
2015-03-15 15:19:02 -07:00
AnHardt
f0dcea7e14
Fix #1611
...
Warning: suggest parentheses around comparison in operand of &
pretty much helped.
2015-03-15 22:52:50 +01:00
AnHardt
28b1c37dea
Fix for #1612
2015-03-15 21:35:33 +01:00
CONSULitAS
a8c1bdabd2
Update: readme.md for K8200 example
...
* readme.md: updated typo and URLs
2015-03-15 17:25:31 +01:00
AnHardt
2f374f1465
Removed Kanji.
2015-03-15 16:44:37 +01:00
Scott Lahteine
5efc798642
Merge pull request #1546 from apollo-ng/pr-felix
...
Added support for Felix 2.0/3.0 printers
2015-03-15 07:52:22 -07:00
Scott Lahteine
b83e52e50f
Merge pull request #1467 from thinkyhead/marlin_configurator
...
Configurator utility
2015-03-15 07:49:19 -07:00
Scott Lahteine
7bc77dc134
Merge pull request #1583 from galexander1/m404fix
...
M404 should not use 'N' address as parameter because 'N' is reserved
2015-03-15 07:47:30 -07:00
Scott Lahteine
b80ed51fcc
Fix controllerFan() code
...
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
2015-03-15 06:55:31 -07:00
Scott Lahteine
4b50205f11
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-15 06:37:32 -07:00
Scott Lahteine
bb4cb1b15a
Merge pull request #1606 from thinkyhead/cleanup_stepper
...
Cleanup of stepper.cpp
2015-03-15 06:05:08 -07:00
Scott Lahteine
63f41f56f8
Merge pull request #1607 from chris-bo/Development
...
Update ultralcd_st7920_u8glib_rrd.h
2015-03-15 01:04:40 -07:00
Scott Lahteine
4eabd80025
Fix babystep for extruder_duplication
2015-03-14 18:31:25 -07:00
alexborro
d3259d0dba
Merge pull request #1581 from msutas/Development
...
Filament Runout Sensor Feature
2015-03-14 18:35:20 -03:00
AnHardt
25c4f17e5d
Corrected Cyrillic fonts. Round II.
2015-03-14 15:10:45 +01:00
chris-bo
b73ba26b23
Update ultralcd_st7920_u8glib_rrd.h
2015-03-14 14:31:00 +01:00
Scott Lahteine
c37f7d15c9
- Rename WRITE_E_STEP for consistency
...
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
2015-03-14 04:28:22 -07:00
AnHardt
44a205d9d9
Corrected Cyrillic fonts.
...
Cleaned typo in language_test.h Cyrillic part.
2015-03-14 12:27:47 +01:00
chrono
4d878b9bac
Fixed path typos in README
2015-03-14 10:18:12 +00:00
chrono
12ec557a75
Added DEFAULT_TRAVEL_ACCELERATION
2015-03-14 10:14:13 +00:00
chrono
1d25d510bc
Upstream Merge Fixes
2015-03-14 09:48:30 +00:00
chrono
a89d690b77
Merge remote-tracking branch 'upstream/Development' into pr-felix
2015-03-14 09:25:43 +00:00
Scott Lahteine
cb57fc727d
Declare pid_output for PIDBEDTEMP
2015-03-13 20:19:51 -07:00
Scott Lahteine
3d6deb9bdf
Simplify manage_heater
...
- Make separate get_pid_output(e) and get_pid_output_bed() function
- Reduce size of manage_heater function
- Hopefully work around linker errors
2015-03-13 19:49:41 -07:00
AnHardt
730497aaa1
Make use of ligatures in language_kana_utf8.h
2015-03-13 19:47:40 +01:00
AnHardt
3240d89f7d
Logic cleanup in utf_mapper.
2015-03-13 19:45:10 +01:00
alexborro
2f3c77b751
Fix decimal places in G29 Bed Equation Coeficients
2015-03-13 14:39:41 -03:00
AnHardt
96f8d20f2f
Change selection logic another time
...
Automatic selection was to unflexible.
Updated documentation
Updated language files to new logic and documentation.
Updated bdf2u8g.exe
2015-03-13 14:26:58 +01:00
Wurstnase
76da32b567
add hash-bang for python3
2015-03-13 07:44:20 +01:00
Wurstnase
2e7ba44633
some renaming for readability
2015-03-13 07:31:27 +01:00
Scott Lahteine
352aa3f4c5
Merge branch 'Development' into marlin_configurator
...
Latest upstream
2015-03-12 17:12:51 -07:00
Scott Lahteine
e3ca9137b5
Fix missing temp_error declarations
...
- Fix for #1591 replacing #1595
2015-03-11 16:38:42 -07:00
Wurstnase
0620267ebb
g29 auto-mode for the new G29 LRFB
...
short:
this script scans the first few lines from a gcode. If the line between 2 different z are greater than min_g1 this is our first layer. On this layer we search the min and max values of X and Y. With an offset we write that in a new file.
2015-03-11 23:53:28 +01:00
Scott Lahteine
08694339eb
Merge branch 'Development' into marlin_configurator
...
Conflicts:
Marlin/Configuration.h
2015-03-11 15:47:32 -07:00
Scott Lahteine
e4d77a6313
Merge pull request #1554 from 2PrintBeta/Development
...
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
2015-03-11 15:31:57 -07:00
Mehmet Sutas
b373826428
Merge pull request #2 from MarlinFirmware/Development
...
update
2015-03-12 00:07:39 +02:00
AnHardt
5bafb1fe1f
Add user test to language_test.h and make it default.
...
Improve description in Configuration.h
2015-03-11 20:46:52 +01:00
alexborro
c0b6075f77
Fix max acceleration limits in planner
...
The max acceleration limiting was in wrong place.
2015-03-11 15:08:11 -03:00
alexborro
9157cbd8f3
Add Travel Acceleration and change the M204 options
...
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).
It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves
I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
2015-03-11 13:19:02 -03:00
alexborro
888cf161bd
fix travel speed option for G29
...
I forgot to enclousure the variable with #ifdef
2015-03-11 10:03:32 -03:00
alexborro
af63b54562
Add travel speed option to G29 command line
2015-03-11 09:51:56 -03:00
AnHardt
817751d4b9
Added new languages, the Cyrillic display and a test language to find out your hardware.
2015-03-11 11:10:35 +01:00
AnHardt
c4b0087f7a
Insert utf_mapper.h
...
Top -> down
- Decide what output function is to use.
- Precautions. If non of the DISPLAY_CHARSET_HD44780's is selected fall back to Japanese.
- When we are not on the dogms setup a mapping table depending on display type and mapper.
- If we are on dogm we use ONE To ONE mapping - except kanji.
- select and define one of the mapping functions.
2015-03-11 10:55:16 +01:00
AnHardt
b60761bcff
Removed some messages that shouldn't be translated in the Japanese files.
...
And made falback to kana work.
2015-03-11 10:30:38 +01:00
AnHardt
97ae3c5c6a
Corected some errors inrtoduced by a faild global replacement.
2015-03-11 10:26:36 +01:00
AnHardt
ae76b1e8a8
Changes in dogm_lcd_implementation.h in detail.
...
Top -> down
- We don't need the old Marlion_font package any more - we made new.
- But we need information about configured fonts and the mappers.
- We support Cyrillic now.
- LCD_CLASS is not used in this file. LiquidCrystalRus.h is deleted anyway.
- define some fonts
- BIG_EDIT_FONT works only together with western languages.
- Select a matching FONT for the MENUE depending on the defined language.
- Number the different font-types. Wanted to avoid to store complete font-structures when changing fonts back and forth.
- Marlin special symbols are now at the lower end - like in 'ultralcd_implementation_hitachi_HD44780.h'
- insert the new remembering setFont function.
- insert the new counting lcd_print functions.
- make use of the new setFont and lcd_print functions.
- On some places redefined one character long strings with chars to avoid overhead and reduce warnings.
2015-03-10 22:34:56 +01:00
alexborro
5bf42066fa
Fix typo in configuration.h
2015-03-10 15:06:34 -03:00
alexborro
8a4b62d081
Set more regular setup in configuration.h
2015-03-10 14:41:21 -03:00
AnHardt
255ca68123
Changes in ultralcd_implementation_hitachi_HD44780.h in detail
...
Top -> down:
We don't need LiquidCrystalRus.cpp and LiquidCrystalRus.h any more. Functionality is now in utf_mapper.h
Comment on LCD_STR_BEDTEMP about behaviour in strings.
Change LCD_STR_ARROW_RIGHT from "\x7E" to ">" because "\x7E" is only ARROW_RIGHT on displays with DISPLAY_CHARSET_HD44780_JAPAN.
Introduce the counting UTF8 enabled lcd_print functions.
Replace the old lcd.print functions and make use of them.
A bit of reformatting around the changes.
2015-03-10 18:30:09 +01:00
alexborro
60ceca1bc1
Add speed configuration for home-bumping movement
2015-03-10 14:08:32 -03:00
AnHardt
6fc2ccd568
Make use of new remenbering fontswitch.
2015-03-10 18:04:03 +01:00
AnHardt
0f26f3abf2
Add a test_language.
...
Will show the compleet utf8 or ASCII charset
To se the second half of ASCII click on "01234..."
2015-03-10 17:59:28 +01:00
AnHardt
901cf203fe
Add legal stuff to marlin_kanji.h
2015-03-10 17:49:16 +01:00
AnHardt
2d5134b0ed
Introduce - clean - prepae language files
2015-03-10 17:46:25 +01:00
domonoky
d813090d90
Merge remote-tracking branch 'remotes/upstream/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
2015-03-10 10:46:37 +01:00
Scott Lahteine
c321c97f35
Merge pull request #1584 from galexander1/stringcleanup
...
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
2015-03-10 01:48:30 -07:00
maverikou
53abc5e2f1
Merge branch 'Development' into delta_auto_bed_level
2015-03-09 22:28:57 +02:00
Mehmet Sutas
956fb2d278
Merge pull request #1 from MarlinFirmware/Development
...
update
2015-03-09 11:05:49 +02:00
Scott Lahteine
978dadf806
Base64 decode AJAX-fetched text properly
2015-03-08 21:54:17 -07:00
Scott Lahteine
0eae9c24bc
Merge pull request #1582 from galexander1/deltaconftypo
...
fix typo in delta example config introduced in commit 697ee2d
2015-03-08 21:13:14 -07:00
Scott Lahteine
624f23f550
Merge pull request #1575 from Wurstnase/fix-controllerFan
...
Fix controller fan
2015-03-08 20:36:38 -07:00
maverikou
424c747fb3
Enable M401 and M402 for deltas with allen key z-probes.
2015-03-08 09:57:38 +02:00
maverikou
0d593ab7c1
Fix debug message
2015-03-08 09:41:31 +02:00
Greg Alexander
3e8c5678f5
fix bug where, i.e., "G1X1E1" would be interpretted as "G1 X10 E1",
...
because strtod() will read the E address value as if it was a base 10
exponent.
2015-03-07 21:14:34 -05:00
Greg Alexander
ed7874b4e0
M404 should not use 'N' address as parameter because 'N' is reserved for the line number
2015-03-07 17:35:06 -05:00
Greg Alexander
b9dfa5cad4
use code_value_long() instead of (int)code_value()
2015-03-07 17:33:15 -05:00
Greg Alexander
901b03d020
use strtol() instead of strtod() when an integer value is desired
2015-03-07 17:24:26 -05:00
Greg Alexander
4fba7b084f
fix typo in delta example config introduced in
...
commit 697ee2dc50
2015-03-07 16:43:41 -05:00
Mehmet Sutas
cfc6a3a87a
Filament Runout Sensor Feature
...
With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.
This feature was requested several times (issue #679 ), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.
The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350 ) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.
2015-03-07 22:43:15 +02:00
maverikou
e6862700af
Add Z_RAISE_AFTER_PROBING to all config files
2015-03-07 20:55:30 +02:00
maverikou
39d255608d
Test an extra delta configuration with auto bed leveling code paths
2015-03-07 20:53:23 +02:00
maverikou
7c24b97958
Ported over Johann Rocholl's improvements for delta printers:
...
- Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path.
- Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.
2015-03-07 20:36:21 +02:00
Wurstnase
a5342c942e
Update Marlin_main.cpp
2015-03-07 16:47:53 +01:00
Scott Lahteine
0f3b7d5575
Update annotated configurations
...
- Also update base configs
2015-03-07 01:07:40 -08:00
Scott Lahteine
c5aa56bc4d
Merge branch 'Development' into marlin_configurator
...
Latest upstream commits
2015-03-06 23:00:03 -08:00
Scott Lahteine
d085725c86
More sanity-checking for ABL
...
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
2015-03-06 22:14:34 -08:00
Scott Lahteine
8b6766b37b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-06 16:32:57 -08:00
Scott Lahteine
9eed8c8cf0
Make sure a ROM is selected for ULTRA_LCD
2015-03-06 15:37:54 -08:00
AnHardt
7136268273
Added 'dogm_font_data_6x10_marlin_Kanji.h'
...
This is copied from http://www.thingiverse.com/thing:664397
// Japanese Original font
// Version 0.1 by ichibey
//
// 営利目的で利用する際は、かならず許可を得てください。非営利の場合は、CCライセンスに従い使用ください。
// http://creativecommons.org/licenses/by-nc/2.1/jp/legalcode
This font is very special. It uses a mixture of katakana an kanji symbols, uses multi character symbols and is only addressable by '\xxx' sequences.
2015-03-07 00:26:28 +01:00
AnHardt
16e173e167
Added 5 new font.h files to main directory.
...
The former place of 'dogm_font_data_6x9_marlin.h' was in 'dogm_font_data_m0arlin.h'.
Deleted 'dogm_font_data_marlin.h'.
2015-03-07 00:09:49 +01:00
Scott Lahteine
254970c92a
Merge pull request #1570 from C-o-r-E/escape_fix
...
Fixes gCode handling of comments and escaped characters
2015-03-06 15:09:35 -08:00
Scott Lahteine
25dc79f124
Remove M48 credits also
2015-03-06 14:54:30 -08:00
Scott Lahteine
34e51f576f
Fix compile error in gcode_G29
...
- A redo of #1576 , which missed topo_flag
- Always set verbose_level
2015-03-06 14:52:05 -08:00
AnHardt
b14270b029
Added font tools
2015-03-06 23:48:55 +01:00
AnHardt
fe2bd237d5
Add font sources.
...
Fonts have been created with fony.exe (http://hukka.ncn.fi/?fony )
The HD44760_? fonts simulate the fonts of the character based displays.
The ISO10646 fonts provide the right size of the standard fonts.
Marlin_symbols contains only the the special symbols of the original marlin font.
2015-03-06 23:36:56 +01:00
Scott Lahteine
344a12bd10
Merge pull request #1571 from AnHardt/Undubble
...
Undubble MSG_MIN & MSG MAX
2015-03-06 10:08:19 -08:00
Scott Lahteine
1149c24b86
More grouping, cleanup, start on overrides
2015-03-06 08:48:53 -08:00
Wurstnase
62bd734612
fix controllerFan() for inverted enable pins
...
add ```^ !(n_ENABLE_ON)``` for each stepper
2015-03-06 12:01:17 +01:00
AnHardt
3024f6c706
Undubble MSG_MIN &MSG MAX
2015-03-06 00:25:44 +01:00
Gina Häußge
63b62d8d4e
Fixed in-line comments and escaping
...
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
* "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.
Tested with the following commands:
* M117 Hello ; test => displays "Hello" on display, ignores "test"
* G1 X1 ; foo => moves 1mm in X, ignores "foo"
* ; test => completely ignored, not even acknowledged
* M117 Hello \;) => displays "Hello ;)" on display
* M117 Hello \\;) => displays "Hello \" on display, ignores ")"
2015-03-05 23:30:34 +01:00
C-o-r-E
99fb1bc3e8
Attempt to resolve #1568 and add basic escape character support
2015-03-05 15:22:37 -05:00
Scott Lahteine
fad14ae7eb
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-05 05:32:31 -08:00
Scott Lahteine
cdc38aa783
Move gcode handlers into inline functions
2015-03-05 04:27:24 -08:00
Scott Lahteine
6d9e9a6bef
Merge branch 'Development' into enhanced_g29
...
Latest upstream changes
2015-03-05 02:49:18 -08:00
Scott Lahteine
4db2179f5c
Include 4th extruder support
2015-03-05 02:37:36 -08:00
OhmEye
f90a947e65
Fix autoretract
...
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
2015-03-04 20:28:08 -10:00
Scott Lahteine
2ef6b3d57a
Fix wrong defines, broken syntax
2015-03-04 22:24:44 -08:00
Scott Lahteine
08b722b635
Merge pull request #1555 from C-o-r-E/solenoids
...
Add support for solenoid articulated extruders
2015-03-04 21:36:29 -08:00
Scott Lahteine
32744d41a9
Do sanity checking on LRFB values
...
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
2015-03-04 21:32:11 -08:00
chrono
0a7d85c20e
Minor fixes
2015-03-04 12:35:32 +00:00
chrono
48e3a97a18
Removed extra encoder definitions from pins_FELIX2.h
2015-03-04 12:21:18 +00:00
Scott Lahteine
d052a3c6aa
Merge pull request #1551 from thinkyhead/redundant_encrot
...
Cleanup rotary encoder encrot* defines
2015-03-04 03:22:24 -08:00
chrono
d8eeddfb93
Updated DUAL Extruder config, added README and enabled NEWPANEL by default
2015-03-04 09:59:58 +00:00
chrono
b423b90c77
Added Configuration_adv.h to examples for LCD/SD Support
2015-03-03 19:09:25 +01:00
domonoky
075507fb9a
missed one X_ENABLE_PIN
2015-03-03 11:09:56 +01:00
Scott Lahteine
dfb38874f8
Some suggested changes for #1555
2015-03-03 00:48:20 -08:00
Scott Lahteine
7f8ea7105f
Arrange ProbeAction values bitwise
2015-03-02 20:14:37 -08:00
Scott Lahteine
7684721977
Enhanced G29
...
- Adapted “Enhanced G29” code referred to in #1499 and posted at
[3dprintboard.com](http://3dprintboard.com/showthread.php?3105-Auto_Bed_
Leveling-Enhanced-G29-command)
- Compatible with current G29 while adding some new arguments
- `V` sets the verbose level for serial out
- `T` (or `V` > 2) send a Topology report to serial out
- `E` works the same way as before
- `P` works as before (source used `n` or `U`/`u`)
- `L`, `R`, `B`, `F` work as before
- Still needs sanity checking for `LRBF`
2015-03-02 20:00:17 -08:00
C-o-r-E
874d3d3fc5
Add support for solenoid articulated extruders
2015-03-02 20:07:12 -05:00
chrono
7540a81106
Minor fixes
2015-03-02 22:55:00 +01:00
chrono
a375d648c7
Merge remote-tracking branch 'upstream/Development' into Development
2015-03-02 17:21:05 +00:00
domonoky
4a7aca2736
Merge remote-tracking branch 'remotes/upstream/Development' into Development
2015-03-02 17:52:12 +01:00
alexborro
715104e477
Fix Endstop check for CoreXY bots.
...
The X_Axis could not home to min while Y_Max endstop was trigged.
2015-03-02 13:36:58 -03:00
Scott Lahteine
e428e8da75
Merge pull request #1552 from thinkyhead/cleanup_cardreader
...
Cleanup of cardreader.*
2015-03-02 07:57:26 -08:00
Scott Lahteine
20e59dc61e
Don't skip files starting with underscores
2015-03-02 07:56:11 -08:00
Scott Lahteine
f171656f8e
Cleanup of cardreader.*
...
- Apply standards to cardreader.*
- Fix minor issues with cardreader.cpp
- Apply standards to some other stale regions
2015-03-02 07:06:01 -08:00
Scott Lahteine
f379edca78
Cleanup rotary encoder encrot* defines
...
The encrot values are used in only one place, and don’t vary, so remove
redundant references.
2015-03-02 06:42:48 -08:00
Scott Lahteine
c7cdb176c8
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-03-02 06:13:10 -08:00
Scott Lahteine
49f471a5fc
Merge pull request #1541 from thinkyhead/fixup_temperature
...
Cleanup of temperature code
2015-03-02 05:38:10 -08:00
Scott Lahteine
f2710e11d1
Optimize initial loading, code cleanup
2015-03-02 05:23:36 -08:00
chrono
558c6313f7
Merge branch 'pr-felix' into Marlix
2015-03-02 10:27:58 +00:00
chrono
08bc723a3c
Enable PIDBED
2015-03-02 10:26:42 +00:00
chrono
e487bd642b
Updated PR to streamline integration
2015-03-02 09:49:45 +00:00
Scott Lahteine
2eeb241b42
Find fields that group together
...
- Do field grouping
- Tweak configurations for better grouping
2015-03-02 01:45:53 -08:00
Scott Lahteine
e30bfedce4
Fix undefined *_PROBE_BED_POSITION error
2015-03-01 19:57:35 -08:00
chrono
3eafea840d
Minor fixes in Configuration.h
2015-03-01 11:04:02 +01:00
chrono
c7fb1b70f2
Initial Configuration.h for Felix 2.0/3.0
2015-03-01 09:54:36 +00:00
chrono
2e172f38bd
Added support for Felix 2.0/3.0 printers
2015-03-01 09:16:55 +00:00
Scott Lahteine
f994729999
Parse and use dependent groups
...
- Parse #if, #ifdef, etc. for rules to enable fields
2015-02-28 22:40:20 -08:00
maverikou
9b50ec6512
Panel One encoder pins
2015-02-28 10:52:15 +02:00
Scott Lahteine
838a22de64
Fix switch value method, make app global
2015-02-27 21:08:09 -08:00
Scott Lahteine
8d5839151b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-02-27 20:40:23 -08:00
domonoky
443e7edef4
- Add support for L6470 Drivers.
...
- Both TMC, L6470 and pin-driven drivers work.
- All can be mixed and matched as needed.
2015-02-27 12:43:23 +01:00
Scott Lahteine
1db02c2891
Merge branch 'Development' into fixup_temperature
...
Merge upstream changes
2015-02-26 17:25:28 -08:00
Scott Lahteine
a99470fbb0
Merge pull request #1527 from maverikou/panel_one
...
Added support for PanelOne from T3P3.
2015-02-26 16:01:13 -08:00
domonoky
5727cb3ed4
Cleanup TMC Stepper a bit.
2015-02-26 12:57:46 +01:00
Scott Lahteine
a5bbd402bf
Merge pull request #1539 from AnHardt/dummysensor
...
Extend the idea of dummy temperature sensors.
2015-02-26 01:29:14 -08:00
Scott Lahteine
1a7b0d9a37
Redo HAS_* macros to fix define error
2015-02-26 01:14:59 -08:00
Scott Lahteine
864dddc878
Macros to the top, a few HAS_* macros
2015-02-26 00:33:30 -08:00
alexborro
227ab8c665
Merge pull request #1503 from MarcelMo/patch-2
...
Support for simple customisable AutoZProbing area
2015-02-25 13:22:42 -03:00
Scott Lahteine
fd1ea9d56f
Move literal strings to language files
2015-02-24 23:03:08 -08:00
maverikou
8742b6bd56
Merge branch 'Development' into panel_one
2015-02-24 22:24:57 +02:00
Scott Lahteine
aa9c1f1bed
Better name for ADC macro
2015-02-24 05:38:10 -08:00
Scott Lahteine
9c9726d469
Cleanup of temperature code
...
- Reduce calls to millis()
- General cleanup of manage_heaters
- General cleanup of pid autotune
- Formatting here & there
- Macros to clean up and shrink ISR code (reduced by ~364 lines)
2015-02-24 04:46:11 -08:00
AnHardt
c6d2ebe452
Extend the idea of dummy temperature sensors.
...
Added a second sensor and made them configurable.
2015-02-24 11:02:16 +01:00
Scott Lahteine
c9a3eb0c1a
Spacing in calculate_volumetric_multiplier(s)
2015-02-23 20:35:18 -08:00
Scott Lahteine
2af559cca3
Shared function for menu_edit_* and menu_edit_callback_*
2015-02-23 20:31:28 -08:00
Scott Lahteine
df8c51528f
Merge branch 'Development' into cleanup_ultralcd
...
Latest upstream changes
2015-02-23 20:13:08 -08:00
Scott Lahteine
517f411999
Spacing adjustment to menu_edit* macro
2015-02-23 20:11:52 -08:00
Scott Lahteine
4938ae5caf
Add required backslash for macro expansion
2015-02-23 20:10:49 -08:00
Scott Lahteine
e182cdebf9
Add required backslash for macro expansion
2015-02-23 19:54:07 -08:00
Scott Lahteine
fa4c36df68
Fix menu callback issue wrt LCD_CLICKED
2015-02-23 19:40:57 -08:00
Scott Lahteine
0cf0c20532
Optimize calculate_volumetric_multiplier
2015-02-23 18:10:35 -08:00
domonoky
38500165ea
First attempt at adding TMC Driver support. May need some cleanup.
2015-02-23 17:45:29 +01:00
domonoky
b55995aae8
Introduce a layer of macro indirection to all stepper pins. This allows other stepper drivers to redefine them, so they can use SPI/I2C instead of direct pin manipulation.
2015-02-23 16:12:35 +01:00
kieranc
8ccdac9898
Enable PID debugging for heated bed
2015-02-23 09:42:01 +01:00
kieranc
29097b0ab2
Enable PID debugging for heated bed
2015-02-23 09:41:25 +01:00
kieranc
21bd4fd6db
Enable PID debugging for heated bed
2015-02-23 09:40:53 +01:00
kieranc
fb56aad898
Enable PID debugging for heated bed
2015-02-23 09:40:29 +01:00
kieranc
08c543f8fb
Enable PID debugging for heated bed
2015-02-23 09:40:06 +01:00
kieranc
c89413db1e
Enable PID debugging for heated bed
2015-02-23 09:39:39 +01:00
kieranc
1c71e4751a
Enable PID debugging for heated bed
2015-02-23 09:39:07 +01:00
maverikou
a9e15aa503
Updated example configurations
2015-02-22 20:15:05 +02:00
Scott Lahteine
3ba47ea277
Remove test/demo multi=line code menu items
2015-02-22 10:10:37 -08:00
Scott Lahteine
c1240f23dd
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-02-22 10:02:25 -08:00
alexborro
a57869ba49
Dummy Thermistor Table for testing purposes
...
Am I the only one who always need to change the thermistortable.h to add
a dummy table??
Ok, it is done. Just set the thermistor to 999 and it will always read
25C. Great for Testing or Development purposes.
2015-02-22 11:02:04 -03:00
Maverikou
2e166f5337
Added support for PanelOne from T3P3.
2015-02-22 09:14:43 +02:00
Scott Lahteine
40ef472a25
Merge in encoder multiplier
2015-02-21 20:18:49 -08:00
Scott Lahteine
1c13cd604b
Formatting in babysteps defines
2015-02-21 18:45:10 -08:00
Scott Lahteine
3a26804d80
Adapt to latest PID code and fix typos
2015-02-21 18:41:04 -08:00
Scott Lahteine
422582da71
Prep formatting for upcoming PR
2015-02-21 18:24:16 -08:00
Scott Lahteine
27ac3e985d
Add options to example_configurations
2015-02-21 18:17:37 -08:00
Scott Lahteine
0d6a7a2df0
Merge with latest upstream changes
2015-02-21 18:13:31 -08:00
Scott Lahteine
c7a97e18b7
Merge branch 'Development' into cleanup_ultralcd
...
Latest upstream changes
2015-02-21 18:04:08 -08:00
Scott Lahteine
6d5c13df74
Merge pull request #1520 from thinkyhead/fixup_temperature
...
Fix typos in checkExtruderAutoFans
2015-02-21 17:53:26 -08:00
Scott Lahteine
5b9e341222
Merge pull request #1516 from thinkyhead/fixup_ramps
...
Cleanup ramps boards
2015-02-21 17:51:57 -08:00
Scott Lahteine
57bc28b42c
Cleanup and fix ultralcd.cpp
...
- Fix bug in lcd_control_temperature_menu
- Remove test menu-item left in from multi-line command feature
- Replace literals with translatable strings
- Reduce lcd_preheat code redundancy
- Reduce menu macro redundancy
- Clean up formatting
2015-02-21 17:38:56 -08:00
Scott Lahteine
4fcd4b444e
Merge pull request #1519 from thinkyhead/fix_recent_issues
...
Fix implementation of PID menu items
2015-02-21 16:43:11 -08:00
Scott Lahteine
9c35ed149d
Merge pull request #1508 from AnHardt/iss1492
...
Fix iss#1492
2015-02-21 16:26:37 -08:00
Scott Lahteine
430c4b6538
Replace missing backslash
2015-02-20 02:17:16 -08:00
Scott Lahteine
3aa5f98b64
Download all as ZIP, adjust layout on resize
2015-02-20 02:12:00 -08:00
Scott Lahteine
a8939eec28
Readability of MENU_MULTIPLIER_ITEM
...
Last commit before bed.
2015-02-20 02:08:41 -08:00
Scott Lahteine
09e09b308e
Tweaky spacing adjustments
2015-02-20 01:22:56 -08:00
Scott Lahteine
e3fd3e8fa4
Fix typos in checkExtruderAutoFans
2015-02-20 00:08:59 -08:00
Scott Lahteine
c610471b0c
Add PID_PARAMS_PER_EXTRUDER conditional
2015-02-20 00:00:19 -08:00
Scott Lahteine
2d6fa9ce80
Proper implementation of PID menu items
...
- Make this work per #1344
2015-02-19 23:54:06 -08:00
wgm4321
b8e79dce89
Fix compilation errors when encoder multiplier is disabled
2015-02-19 21:51:23 -05:00
wgm4321
65e1fc71be
Add encoder rate multiplier
2015-02-19 21:42:57 -05:00
Scott Lahteine
859c8d3fef
Azteeg X3 overrides too
2015-02-19 17:28:38 -08:00
Scott Lahteine
7891eacf21
Merge branch 'Development' into fixup_ramps_boards
...
- Also apply cleanup for #1514
2015-02-19 17:26:22 -08:00
Scott Lahteine
1600506545
Merge remote-tracking branch 'upstream/Development' into marlin_configurator
2015-02-19 15:15:55 -08:00
Scott Lahteine
5d0c93ae10
Keep config boxes in view on wide screen
2015-02-19 03:41:41 -08:00
Scott Lahteine
335b7680c9
Tooltip code, widescreen layout, hide auto-expands
...
Slightly better layout for wide screens.
2015-02-19 03:11:16 -08:00
domonoky
15b73386b5
Add pin definitions for the Boards BAM&DICE + BAM&DICE Due
2015-02-19 11:53:31 +01:00
Scott Lahteine
08c236059e
Merge pull request #1505 from thinkyhead/issue_1499
...
Bed leveling probe behavior issue?
2015-02-19 01:24:17 -08:00
Scott Lahteine
f238c7428d
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
2015-02-18 21:56:17 -08:00
Scott Lahteine
da275c72ab
Cleanup Github reply.data.content before atob()
2015-02-18 21:45:38 -08:00
MagoKimbra
159196d1e9
Reset Alert message when finish M600 command
2015-02-18 21:33:38 +01:00
daid
266ff227cf
Merge pull request #1510 from docdawning/Development
...
Trivial spelling correction
2015-02-17 20:59:32 +01:00
DocDawning
dfd4e74a5c
Trivial spelling correction
2015-02-17 12:37:05 -07:00
AnHardt
6cdcd6c6d1
Fix iss#1492
...
Introduced lcd_strlen() and lcd_strlen_P().
Replaced the old functions where necessary.
Reworked language_ru.h.
Speeded up test for zero length string in cardreader.cpp
2015-02-16 13:53:58 +01:00
Scott Lahteine
c033904693
Updated config file section markers
2015-02-15 23:25:57 -08:00
Scott Lahteine
84a87a5b1c
Fix up configs a little
2015-02-15 23:19:22 -08:00
Scott Lahteine
63a5ff7ab9
Merge pull request #1489 from tommil/Development
...
Updated Finnish language file
2015-02-15 23:02:11 -08:00
Scott Lahteine
efb0491d40
Merge branch 'Development' into issue_1499
...
Merging latest upstream changes
2015-02-15 22:59:07 -08:00
Scott Lahteine
8309b4f408
Merge branch 'Development' into marlin_configurator
...
Merging latest upstream changes
2015-02-15 22:58:04 -08:00
Scott Lahteine
961998cf91
Merge pull request #1496 from thinkyhead/issue_1493
...
Megatronics 3 servo pins
2015-02-15 22:00:14 -08:00
Scott Lahteine
b71322e793
Issue #1504 – K8200 Z_ENABLE_PIN
...
- K8200 uses a non-standard RAMPS with Z_ENABLE=63 ??
- Assuming from previous input that 3DRAG is the same.
2015-02-15 21:56:23 -08:00
Scott Lahteine
978d114c73
Bed leveling probe behavior issue?
...
The `float` keyword should not be on these vars because they conceal
the outer vars, preventing them from obtaining known values before
being passed in `set_bed_level_equation_3pts`. Possibly related to
`Z_RAISE_BETWEEN_PROBING` not functioning.
2015-02-15 20:51:27 -08:00
Scott Lahteine
7c6236761a
Merge branch 'Development' into issue_1493
...
Merging latest upstream changes
2015-02-15 20:45:35 -08:00
Scott Lahteine
9875352dd8
Merge branch 'Development' into marlin_configurator
...
Merging latest upstream changes
2015-02-15 20:44:21 -08:00
MarcelMo
d28f5b9e82
Support for simple customisable AutoZProbing area
...
When probing PCB´s I had the problem that i needed auto-leveling for specific areas (it´s never the same size).
Not much code, but very useful.
Now I use simply G29 L5 R55 F5 B35 P3 to probe a 4x6cm PCB before milling.
I used int for values... might be wrong...
I hope this time I got the right development tree. (tried first with https://github.com/MarlinFirmware/Marlin/pull/1130/commits )
2015-02-15 15:58:29 +01:00
Tommi Lamberg
513ff94b89
Merge remote-tracking branch 'upstream/Development' into Development
2015-02-15 12:21:45 +02:00
Scott Lahteine
83cb702e72
Config sections, multi-field values, toggles, etc
...
- Auto-detect “switchable” items where possible
- Handle switchable multi-value fields
- Add standard sections to config form
- Add section markers to configurations
- Add value options to configurations
- Remove and re-add fields for loaded configs
- Preserve sections across configs
- Preserve non-added fields
- Style added fields wider & newline by default
2015-02-14 23:44:01 -08:00
alexborro
afc737ca0c
Fix CoreXY Homing Routine.
...
Fixed how stepper ISR figure it out when the head (extruder) is going to
Min or Max direction.
Added Homing to Max Endstops.
2015-02-13 14:38:05 -02:00
Scott Lahteine
ec53c6309a
More fields, options in config, fix tooltips
2015-02-13 03:02:56 -08:00
Scott Lahteine
68184af57b
Merge branch 'Development' into marlin_configurator
...
Latest upstream commits
2015-02-12 21:59:26 -08:00
Scott Lahteine
7866fa161f
Merge pull request #1476 from Natealus/Development
...
Compiling errors with 4 Extruders defined and Viki 2 Implementation
2015-02-12 16:56:55 -08:00
Natealus
ea9e49b20d
ARRAY_BY_EXTRUDERS 4th hotend PID parameters
2015-02-12 00:56:47 -07:00
Scott Lahteine
d0ad8a978c
Megatronics 3 servo pins
...
- Naive implementation, assuming the data sheet pin numbers correspond
to Arduino pin numbers.
2015-02-11 23:46:27 -08:00
Scott Lahteine
e74138b2be
More robust fetch code, download buttons
...
- Fetch code now handles github, local, or http: access
- Download button creates a time-stamped inline download
- More complete error messages
- Show warnings when approaching the hourly fetch quota (limit
reloading!)
- Added my test domain (where the _htaccess is deployed)
- `_htaccess` file added to set Access-Control-Allow-Origin “*”
- Marlin logo with css
- Limit selectable areas to avoid annoying selections
- Messages now persist until dismissed
- Default repo for files set to thinkyhead, ‘marlin_configurator’ branch
- Cosmetic changes
2015-02-11 04:59:07 -08:00
Tommi Lamberg
622a531d9c
Fixed error in translation
2015-02-11 08:50:48 +02:00
Tommi Lamberg
290ab42d22
Updated Finnish translations
2015-02-11 08:37:07 +02:00
Jérémie FRANCOIS
22a7985445
reverted to upstream
2015-02-11 07:12:55 +01:00
Jérémie FRANCOIS
b3bda57ca2
reverted to upstream
2015-02-11 07:12:02 +01:00
Jérémie FRANCOIS
9d75a56b56
Merge remote-tracking branch 'upstream/Development' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
2015-02-11 06:38:36 +01:00
Tommi Lamberg
0a59fee763
Merge remote-tracking branch 'upstream/Development' into Development
2015-02-11 06:53:43 +02:00
Scott Lahteine
eb5889b3da
Merge pull request #1479 from AnHardt/en_first
...
#include "language_en.h" before the national language in language.h
2015-02-10 15:33:45 -08:00
kieranc
b9ed873827
Enable PID debugging for heated bed
2015-02-10 14:13:06 +01:00
kieranc
0a19109476
Enable PID debugging for heated bed
2015-02-10 14:11:44 +01:00
Tommi Lamberg
a4f939cc27
Updated Finnish language file
2015-02-10 10:48:33 +02:00
Scott Lahteine
32d4dd073f
Merge pull request #1487 from AnHardt/iss1485
...
Fix for #1485
2015-02-09 21:41:07 -08:00
AnHardt
c246026bda
Sorry.
2015-02-10 00:23:39 +01:00
AnHardt
07e488cfae
Fix for #1485
2015-02-10 00:13:46 +01:00
Souko
e7ecf14d0c
Update ultralcd_st7920_u8glib_rrd.h
...
Fixed delay-times during Init. REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER won't get initialized on some Boards because delay was to short.
2015-02-09 21:46:06 +01:00
Scott Lahteine
52c3cf6d34
Fix a logging error
2015-02-09 05:07:05 -08:00
Scott Lahteine
ba24a09f24
Use api.github to get Configurations
...
- Make api.github the default source for configurations
- Remove configurations from the configurator
- Continuation and enhancements
2015-02-09 04:34:57 -08:00
Natealus
f4b0a40abb
Additional fixes to temperature.cpp and found another missing line
...
Looks like INVERT_E3_DIR was missing in the configuration.h also as I
did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also
added those lines too. Additional formatting to make the comments line
up better in that section.
2015-02-08 15:43:58 -07:00
AnHardt
3aac2df057
Now the oter way around.
...
Include of language_en.h now behind national language.
All "#define MSG_STR_*" now surrounded by #ifndef and #endif.
2015-02-08 20:41:20 +01:00
AnHardt
488633bf44
#include "language_en.h" before the national language in language.h
...
+ May decrease the workload for feature developers. They may omit to
update all the language files but "language_en.h". When loading _en
first, all new features give some display, but the new in English.
- May throw some additional warnings about redefinition during compile.
2015-02-08 14:26:24 +01:00
AnHardt
8e92729141
Make display language configurable in Configuration.h
2015-02-08 13:45:22 +01:00
Natealus
38a500d05c
Viki 2 Implementation
...
I've insert the define and pointer entries for the Viki 2 and miniViki
from Panucatt in all of the example configs and main config. With these
additions and with pins done in the old single pin.h style...I was able
to get the display working fine save for needing to turn Delta Segments
per Second down. But that's a common graphics lcd issue being looked
into right now.
I need assistance in understanding how the new divided pins files fit
together because my previous attempts at trying to get it to work
appropriately didn't seem successful. This originally came from trying
to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg
X3 Pro. It only comes with one set of connectors and they're Min
Endstops. My previous experience didn't turn out well trying to tell the
firmware to home to the Min Endstops so the best solution I found was to
swap the pins in the firmware. If I'm missing a conflict with a setup
other than delta please let me know, but it makes sense in my setup.
2015-02-08 03:14:59 -07:00
Natealus
697ee2dc50
Compiling errors with 4 Extruders defined
...
Here were a few changes that I had to make/add lines for the 4th hotend.
A compiling problem in the Temperature.cpp and missing lines in
configuration.h and configuration_adv.h. I added these lines in all of
the example configs too.
2015-02-08 01:05:05 -07:00
Jérémie FRANCOIS
85e5aa4011
Generalized enqueue_commands_P, and moved them to Marlin_main as they should
2015-02-07 23:24:20 +01:00
Scott Lahteine
4228758f1d
Clean up and improve tooltips, show the name
2015-02-07 11:58:19 -08:00
Scott Lahteine
0116320d2c
Strip slashes off the front of tooltips
2015-02-07 11:04:10 -08:00
Scott Lahteine
69240d41b0
Offset the timing of the pulsing animation
2015-02-07 10:45:56 -08:00
Scott Lahteine
78b9428f4e
Avoid capturing disabled items in comments
2015-02-07 10:34:16 -08:00
Scott Lahteine
5d159851e5
Fix positioning of tooltip
2015-02-07 09:03:00 -08:00
Scott Lahteine
c99f1de9f3
Fix tooltips blocking clicks
2015-02-07 07:39:10 -08:00
Scott Lahteine
1a548c1bc1
Find nearby comments and make them into tooltips
2015-02-07 06:20:04 -08:00
Scott Lahteine
90fa1345b0
Fix purge + refresh of define info
2015-02-07 03:02:26 -08:00
Scott Lahteine
aa67b38a44
Fan speed and 4th extruder on graphical LCD
...
- Display fan speed 0-1 as “—“ and 254-255 as “100%”.
- Display 4th extruder instead of the heated bed
2015-02-07 02:44:35 -08:00
Scott Lahteine
7850ae2f4f
Merge branch 'Development' into marlin_configurator
...
Merge latest Development
2015-02-07 02:20:25 -08:00
Scott Lahteine
2647402095
Use info.repl in updateDefineFromField, fix regex
2015-02-07 02:04:44 -08:00
Scott Lahteine
12a3975341
Close section tag, add String.prototype.lineCount
2015-02-07 00:46:14 -08:00
Scott Lahteine
4bb72f9480
Highlight the edited line
...
- Add a span to the edited text line to provide a highlight
- Scroll and highlight for switch checkboxes also
- Clean up initialization
- More API documentation
- Smarter handling of asynchronous file loading during init
2015-02-06 23:46:16 -08:00
Scott Lahteine
37c43a7ab3
Scroll to reveal on switches as well
2015-02-06 18:09:14 -08:00
Scott Lahteine
9c0adae3cd
Scroll to setting position in file when edited
...
- Animate scrolling to the edited item’s position
- Sanity check file drops and show warnings
- Fix form init / refresh on new configuration drop
- Document the API methods that get/set defines
2015-02-06 17:57:31 -08:00
Scott Lahteine
4d341bb758
Copy configs into subfolder
...
Browsers may not want to load files outside the folder, but they may be
okay with these relative references within the folder.
2015-02-06 14:58:47 -08:00
Scott Lahteine
72856166a9
Fix bad typo in ConfigurationStore.cpp
2015-02-06 14:43:58 -08:00
Scott Lahteine
b51204cc1c
Add fieldsets and make them into tabs
2015-02-05 20:28:39 -08:00
Scott Lahteine
56769ba4f8
Make comment/uncomment a little neater
2015-02-05 19:39:42 -08:00
Scott Lahteine
94bebf31ac
Pre-collect info about options on field init
...
- When initializing fields use the configuration to determine the format
- Cache the line for each option for fastest string compare / replace
- Add logging levels for debugging
2015-02-05 19:30:11 -08:00
Scott Lahteine
32aaadc301
Include minimized jQuery 2.1.3
2015-02-05 11:50:42 -08:00
Scott Lahteine
53f6bbdfe0
Try a stepper for the serial port
2015-02-05 11:44:43 -08:00
Scott Lahteine
ac7a4358d6
Add a responsive file uploader
...
- Specify HTML5
- Allow drag and drop for loading configurations
2015-02-05 11:14:31 -08:00
Scott Lahteine
09a385d9b0
Add "use strict" to the top.
2015-02-05 08:22:51 -08:00
Scott Lahteine
b2627200ea
Get thermistors from config, add temp sensors
2015-02-05 08:19:09 -08:00
Scott Lahteine
ef18bfdd3f
An in-place browser-based configurator utility
...
- A web form with fields for configuration values
- Reads and parses standard config files
- Modifies configurations dynamically in-place
2015-02-05 07:05:29 -08:00
Scott Lahteine
3490a19103
Merge pull request #1466 from CONSULitAS/Development_K8200_de
...
K8200: Example Configuration.h fixed
2015-02-04 17:28:04 -08:00
CONSULitAS
cfbb94a2a8
K8200: Example Configuration.h fixed
...
Example Configuration.h: fixed strange white characters preventing
compilation in lines 1 and 3 - oops
2015-02-04 10:35:10 +01:00
Scott Lahteine
b65c5d8ec6
Merge pull request #1464 from AnHardt/iss1448-Menu
...
Unified menu selection - by hilighting - made first column avilable
2015-02-03 22:43:29 -08:00
CONSULitAS
0de5083aff
K8200: Example Configurations readme.md updated
...
Example Configurations for K8200 readme.md updated
* readme.md: added description for german umlaut support on LCD
2015-02-04 00:24:51 +01:00
CONSULitAS
c421ffd520
K8200: Example Configuration_adv.h back in sync
...
Example Configuration_adv.h for K8200 back in sync
* Configuration_adv.h: rebased and added missing changes for 4th
extruder
2015-02-04 00:19:18 +01:00
CONSULitAS
0575dd10de
K8200: Example Configuration.h back in sync
...
Example Configuration.h for K8200 back in sync
* Configuration.h: rebased and added missing changes
* Configuration.h: updated comments for K8200
2015-02-04 00:15:50 +01:00
AnHardt
f708884808
Introduced new function lcd_implementation_mark_as_selected()
...
New function now drops the prechar (select character) and makes the first
column usable for text.
Marking the line is now constantly made by highlighting (reverse).
Replaced selection code in:
lcd_implementation_drawmenu_generic()
_drawmenu_setting_edit_generic()
_drawmenu_sd()
with new function.
2015-02-03 23:35:33 +01:00
Scott Lahteine
b6ca50a2cc
Merge pull request #1463 from thinkyhead/cleanup_recent_merge
...
Apply some cleanup for recent merge
2015-02-03 12:06:47 -08:00
Scott Lahteine
cc56f36870
Merge pull request #1461 from thinkyhead/issue_1453_redo
...
Apply fix for M600 filament change
2015-02-03 11:52:09 -08:00
Scott Lahteine
8663f4bbaf
Apply some cleanup for recent merge
...
Combine 1/(rows+1) with u8g.getHeight() to get rowHeight and just use
that.
2015-02-03 11:48:49 -08:00
Scott Lahteine
0cb1029311
remove extra plan_buffer_line
2015-02-03 11:26:36 -08:00
AnHardt
9381bfe7f9
Fixes issue #1447 - Overlapping of long descriptions with values.
2015-02-03 20:15:16 +01:00
Scott Lahteine
b97a950f53
Apply fix for M600 filament change
...
- Patch from #1453 for delta movement plan
- Fix: Set X with code X instead of adding to X
2015-02-03 09:57:16 -08:00
AnHardt
2abf1ad940
Distribute recent changes in Configuration.h to the examples.
2015-02-03 17:59:04 +01:00
AnHardt
33f8580255
Merge branch 'lcd-width' into b-
2015-02-03 14:45:58 +01:00
AnHardt
0c24bb6cfc
Adjust LCD_WIDTH to make better use of DOGM LCDs
2015-02-03 14:21:43 +01:00
AnHardt
b1dbd765c6
Centralise definition of fonts for DOGM displays
...
Prework for issue #1448 and #1447
Will merge in when pull request #1457 is in.
2015-02-03 13:10:09 +01:00
AnHardt
65642592ee
Added dualline version.
2015-02-03 12:25:36 +01:00
AnHardt
f9cc1df00b
Droped URL from bootsplash.
2015-02-03 11:14:27 +01:00
AnHardt
c20606b8d7
Replaced some literal constants with defines
...
Replaced calculation to centre bitmap with fixed values.
Saved 20 bytes.
2015-02-03 09:52:29 +01:00
AnHardt
3602474c25
Replace solitaire use of u8g_font_5x8 font and replace with u8g_font_6x10_marlin
...
and win another 1694 bytes.
2015-02-03 09:07:57 +01:00
AnHardt
f5fd94d62a
Kick suspicious loop an win 72 bytes.
...
No visible impact.
2015-02-03 08:56:00 +01:00
Scott Lahteine
b3973ed224
Fix HD44780 misspelled as HD44870
2015-02-02 22:33:58 -08:00
Scott Lahteine
d8b7f29fa2
Merge pull request #1452 from thinkyhead/fix_M200_bug
...
M200 cleanup, normalization of EXTRUDER loops
2015-02-02 21:58:15 -08:00
Scott Lahteine
6d81968db5
Merge pull request #1450 from docdawning/Development
...
Normalized section headers, added some headers, added help URLs for newb...
2015-02-02 21:17:06 -08:00
DocDawning
5bb3933b21
Fixed n00bsauce
2015-02-02 14:18:53 -07:00
DocDawning
d109cd940b
Normalized all configuration files to include my new section headers and the like.
2015-02-02 14:11:21 -07:00
DocDawning
055c4beaf9
Normalized section headers, added some headers, added help URLs for newbies
2015-02-02 14:11:09 -07:00
Scott Lahteine
9dc5de6166
Hide code that makes veteran geeks go "aha!"
2015-02-02 05:55:55 -08:00
Scott Lahteine
bd387068bb
Apply loops for extruders elsewhere also
2015-02-02 05:27:27 -08:00
Scott Lahteine
4a146d584b
Loop, since the pending feature can use an array
2015-02-02 05:16:17 -08:00
Scott Lahteine
bca884bf72
Realized it's not a bug, but cleanup code anyway
2015-02-02 04:41:31 -08:00
AnHardt
2dd43a82b1
Ups. #else added
2015-02-01 14:16:35 +01:00
AnHardt
26e55471f8
Update example configurations.
2015-02-01 13:46:32 +01:00
AnHardt
85385be132
Removed now automatic define of DISPLAY_CHARSET_DOGM + improved description.
2015-02-01 13:33:25 +01:00
AnHardt
0e40408ee5
Make exemplaric use of new display charsets in language_en.h and languag_de.h
2015-02-01 13:20:58 +01:00
AnHardt
8dce5a6644
Improve new charset featur.
...
Select DOGM-displays automaticly.
Give hint where to find charsets.
Add '²' and '³' characters.
2015-02-01 13:09:59 +01:00
Scott Lahteine
c009c81e65
make marlin-main the default
2015-01-31 23:11:28 -08:00
Scott Lahteine
f4ebc02555
marlin url
2015-01-31 23:09:12 -08:00
Scott Lahteine
0af9a0bf57
url to firmware downloads
2015-01-31 22:19:45 -08:00
Scott Lahteine
5f8dd92905
toss in a fix for .ru
2015-01-31 21:58:38 -08:00
Scott Lahteine
3f3ad9b3ad
typo
2015-01-31 21:42:53 -08:00
Scott Lahteine
07639053fb
Add support for BQ Prusa i3 "Hephestos"
2015-01-31 21:38:30 -08:00
Philip Schell
fb7c636ecf
Avoid compiling error
...
Only a missing ","... now it will compile again
2015-02-01 01:33:04 +01:00
alexborro
787d6fb61a
Update RUMBA pins file
...
Add FAN1_PIN and SERVO0_PIN
2015-01-31 18:03:28 -02:00
Scott Lahteine
5fd5105d44
Merge pull request #1439 from clefranc/Development
...
Fix nozzle in temperature menu
2015-01-30 19:05:45 -08:00
AnHardt
76bf93efcb
Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h"
...
This reverts commit 4d5b0e2037
.
2015-01-30 22:42:44 +01:00
AnHardt
4d5b0e2037
get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h
2015-01-30 22:20:10 +01:00
Christian Lefrançois
33408a4dfc
Update ultralcd.cpp
...
Fix number of nozzle displayed in temperature menu.
2015-01-30 11:16:13 -05:00
AnHardt
6e6e3cf443
merged https://github.com/MarlinFirmware/Marlin.git
2015-01-30 11:05:29 +01:00
AnHardt
b3ca430a20
Inducted the defined placeholders in the translation table.
2015-01-30 10:35:14 +01:00
AnHardt
e045034c3f
Included Configuration.h to read the defined charsets.
...
Defined the charsets plus a default.
2015-01-30 10:31:58 +01:00
AnHardt
27c638803e
Defined three charsets.
2015-01-30 10:28:22 +01:00
Scott Lahteine
073c59c50a
Clean up some formatting
...
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
2015-01-29 18:52:21 -08:00
AnHardt
9a4d4b3a2f
translated Deltamenu
2015-01-29 13:19:32 +01:00
AnHardt
8aa6487b4b
MSG_ENDSTOP_ABORT = 'Endstop abort' > 'Endstop Abbr. Ein'
2015-01-29 13:12:55 +01:00
AnHardt
666ad7106b
Translated redundand: define MSG_INIT_SDCARD and MSG_CNG_SDCARD
2015-01-29 13:09:12 +01:00
AnHardt
e5c45fbe8c
Infoscreen messages end with a '.' if not to long.
...
MSG_NO_MOVE = 'Kein Zug.' > 'Motoren Eingesch.' hat mich grau Haare gekostet.
Die englisch Meldung will sagen - Du kannst jetz am Extruder arbeiten, die
Achsen sind bockiert, die Motoren sperren die Achsen weil sie unter Strom
stehen, weil sie eingeschaltet sind.
2015-01-29 13:02:21 +01:00
AnHardt
1e22137e27
MSG_STOP_PRINT = 'Druck stoppen' > 'SD-Druck Abbruch'
...
to work out that this can't be resumed.
2015-01-29 12:41:46 +01:00
AnHardt
05d2ebd118
MSG_WATCH > 'Beobachten' > 'Info'
2015-01-29 12:29:31 +01:00
AnHardt
06cba91c39
eye candy 2
2015-01-29 12:26:21 +01:00
AnHardt
9352c9547f
MSG_SPEED = 'Geschw' > 'Geschw.'
2015-01-29 12:13:44 +01:00
AnHardt
0dfb0162f3
eye candy.
2015-01-29 12:07:01 +01:00
AnHardt
7222b27501
MSG_MOVE_AXIS = 'Achsen bewegen' > 'Bewegen'. Is Extruder an axis?
2015-01-29 12:02:58 +01:00
AnHardt
a6f808c9b1
remove unused #define MSG_RETRACT
2015-01-29 11:58:50 +01:00
AnHardt
152fa579f5
MSG_SWITCH_PS_OFF = 'Switch Power Off' -> 'Netzteil Aus'
2015-01-29 11:55:36 +01:00
AnHardt
7a32b742f3
MSG_SWITCH_PS_ON = 'Switch Power On' ->'Netzteil Ein'
2015-01-29 11:50:51 +01:00
AnHardt
4e176d2ce8
MSG_SET_ORIGIN = 'Setze Nullpunkt' ->'Setze Null hier'
2015-01-29 11:45:18 +01:00
AnHardt
1f8c8ad3ed
MSG_SET_HOME_OFFSETS = 'Set home offsets' ->'Setze Home hier'
2015-01-29 11:39:35 +01:00
AnHardt
0e8836ce5e
MSG_AUTO_HOME = 'Auto Nullpunkt' ->'Home'
2015-01-29 11:36:07 +01:00
AnHardt
56d3e6615d
MSG_DISABLE_STEPPERS = 'Stepper abschalt.' -> 'Motoren Aus'#
2015-01-29 11:19:10 +01:00
Scott Lahteine
1258980832
Merge pull request #1429 from bq/Development
...
Add bq Witbox 3D printer
2015-01-29 01:14:18 -08:00
Victor Andueza
766762a4dc
Change url link
2015-01-29 09:28:50 +01:00
Scott Lahteine
7df9ca051c
Merge pull request #1428 from thinkyhead/issue_1388_eeprom
...
Make EEPROM storage consistent
2015-01-28 22:58:04 -08:00
Scott Lahteine
fe3810f073
yeah, what he said
2015-01-28 22:27:15 -08:00
Scott Lahteine
6137bbd484
use eeprom read correctly
2015-01-28 22:10:31 -08:00
Scott Lahteine
9bc9051405
Flag EEPROM write errors on serial output
...
- Also adds a language string for the error.
- Also adds SERIAL_EOL as an alias for SERIAL_ECHOLN(“”)
2015-01-28 21:19:51 -08:00
Scott Lahteine
ff99ca3040
Fix alignment of Restore following PIDTEMP
...
Should be reading 4 x 4 PID values instead of 4 x 3
2015-01-28 20:48:32 -08:00
Philip Schell
6c285930cb
Fixing wrong pin to heater extruder 2 <-> 3
...
Extruder 2 and 3 was swapped
2015-01-28 23:57:22 +01:00
Victor Andueza
0d4ce27b79
Add pins_WITBOX file
2015-01-28 17:26:50 +01:00
Victor Andueza
13118cde33
Add bq Witbox 3D printer
2015-01-28 16:52:36 +01:00
Scott Lahteine
093fedfde8
Make EEPROM storage consistent
...
Update ConfigurationStore to always write dummy values for disabled
options, including FWRETRACT, DELTA, and SCARA. Update the EEPROM
version to “V15.” Also fixes a buffer overrun with axis_scaling in
Config_ResetDefault.
2015-01-28 01:08:48 -08:00
Scott Lahteine
34377ee512
Merge pull request #1427 from thinkyhead/fewer_preheat_strings
...
Remove language strings that only add a number
2015-01-27 22:10:08 -08:00
Scott Lahteine
7378a7fef4
Merge pull request #1408 from thinkyhead/cleanup_servo
...
Formatting cleanup of quiet sources
2015-01-27 22:09:04 -08:00
Scott Lahteine
5fbef6bed2
Merge pull request #1409 from thinkyhead/rename_lastnr
...
Rename lastnr to autostart_index and...
2015-01-27 22:07:23 -08:00
Scott Lahteine
53eea611b8
Fix MSG_NOZZLE
2015-01-27 22:00:32 -08:00
Scott Lahteine
d7211a5324
Changes for Portuguese too
2015-01-27 21:53:08 -08:00
Scott Lahteine
0a21727c0a
Portuguese (pt) and Brazilian Portuguese (pt-br)
2015-01-27 21:45:21 -08:00
Scott Lahteine
c90f2e77d8
Remove language strings that only add a number
...
This won’t reduce the string storage in the end, but it makes the
language files smaller. Also removed remaining unused strings.
2015-01-27 21:36:58 -08:00
Scott Lahteine
2ce4a102ee
Add support for Megatronics 3 a la #1426
2015-01-27 15:54:46 -08:00
Scott Lahteine
ae4b348d77
Make sure _Ex_PINS is defined
...
Also fix analogInputToDigitalPin so it uses proper C hex notation
2015-01-27 15:36:47 -08:00
Scott Lahteine
80be6f3f91
tweak tweak
2015-01-27 15:36:47 -08:00
Scott Lahteine
ebe78cb36f
tweak
2015-01-27 15:36:47 -08:00
Scott Lahteine
82474fef8a
Max endstop pins disabled by configuration
...
There’s no need to ask users to uncomment Max Endstop pins when they
have them. These will be set to -1 later if the endstop option is
disabled.
2015-01-27 15:33:21 -08:00
Scott Lahteine
8045e4d60d
Add support for 4th extruder
...
#1405 includes some changes to pins.h for a 4th extruder. This commit
applies those changes. It also deals with a possible problem with
SENSITIVE_PINS.
2015-01-27 15:33:21 -08:00
Scott Lahteine
df4f3e7712
cleanup
2015-01-27 15:32:34 -08:00
Scott Lahteine
b6ecbd8cc4
cleanup
2015-01-27 15:32:34 -08:00
Scott Lahteine
4e573134de
Cleanup heading
2015-01-27 15:32:34 -08:00
Scott Lahteine
574a5ab72a
Split up pins to make it more manageable
...
Hopefully this is helpful to organization and future expansion….
2015-01-27 15:32:34 -08:00
clefranc
d55c62bf9f
Update ConfigurationStore.cpp
...
Moved #endif to allow filament settings to print.
2015-01-27 13:28:37 -05:00
clefranc
e779641c73
Update ConfigurationStore.cpp
...
Added PIDTEMP dummy write to align EEPROM read/write operation.
2015-01-27 13:25:47 -05:00
Scott Lahteine
baac6e242d
Merge pull request #1419 from AnHardt/bootsplash
...
repair Bootsplash
2015-01-27 00:30:29 -08:00
AnHardt
75cf302da3
example configurations changed to meet Configuration.h
2015-01-27 00:01:33 +01:00
Philip Schell
61fd45a0c2
Add 4th extruder
2015-01-26 21:22:00 +01:00
Philip Schell
2650be4921
Add 4th extruder
2015-01-26 21:21:31 +01:00
Philip Schell
a9763d894e
Add 4th extruder
2015-01-26 21:20:56 +01:00
Philip Schell
4949088302
Add 4th extruder
2015-01-26 21:20:04 +01:00
Philip Schell
fc5204bd42
Add 4th extruder
2015-01-26 21:17:35 +01:00
Philip Schell
9834818ef7
Add 4th extruder
2015-01-26 21:16:23 +01:00
Philip Schell
8696963154
Add 4th extruder
2015-01-26 21:15:24 +01:00
Philip Schell
ee8a7419f4
Add 4th extruder
2015-01-26 21:14:18 +01:00
Philip Schell
e18403235d
Add 4th extruder
2015-01-26 21:12:55 +01:00
Philip Schell
7baee555f4
Add 4th extruder
2015-01-26 21:11:49 +01:00
Philip Schell
cebc7daf2a
Add 4th extruder
2015-01-26 21:10:42 +01:00
Philip Schell
ef4c7abb21
Update language_es.h
...
Add 4th extruder
2015-01-26 21:09:24 +01:00
Philip Schell
22e591518a
Update language_de.h
...
Add 4th extruder
2015-01-26 21:08:13 +01:00
Philip Schell
a20c35bb38
Update language_ca.h
...
Add 4th extruder
2015-01-26 21:04:31 +01:00
Jérémie FRANCOIS
dd301be52d
Added suport for multiline G-code commands in the LCD menus
2015-01-26 18:50:29 +01:00
AnHardt
aa48056c03
Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h
2015-01-26 17:26:22 +01:00
AnHardt
0d219b3e14
Make centering of STRING_SPLASH work
2015-01-26 16:00:10 +01:00
AnHardt
59315330dd
Remove definition of VERSION_STRING and replace where usend with STRING_VERSION
2015-01-26 15:52:01 +01:00
AnHardt
8c792c7b22
Make STRING_VERSION and VERSION_STRING the same
2015-01-26 15:40:44 +01:00
Scott Lahteine
865ca0ef04
Merge pull request #1405 from MagoKimbra/4th-extruders
...
All the additions look proper. I can't think of any other extruder-count-related items that you might have missed. So, with some optimism, I will merge this for testing.
2015-01-25 19:30:51 -08:00
MagoKimbra
3021f7f743
Fix PID_dT
...
Add PID_dT in temeprature.cpp
2015-01-25 17:56:14 +01:00
Scott Lahteine
a7b02975b7
No TEMP1 or TEMP2 pins for TEENSYLU || PRINTRBOARD
...
Pins 2 and 3 are probably general-use pins, since the filament sensor
uses pin 2.
2015-01-24 05:10:48 -08:00
Scott Lahteine
6723388f7f
Proposed fix to #1379 . Printrboard I2C LCD support
2015-01-24 05:01:02 -08:00
Scott Lahteine
03c9cb60e8
Rename lastnr to autostart_index and...
...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
2015-01-24 04:57:44 -08:00
MagoKimbra
ef5959a705
Fix Temperature
...
Githun insert this line when i merge with actual Branch development...
2015-01-24 13:49:29 +01:00
MagoKimbra
3d4ee6c868
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
...
Conflicts:
Marlin/temperature.cpp
2015-01-24 13:41:15 +01:00
MagoKimbra
986e723eeb
Add 4th extruder
2015-01-24 13:37:58 +01:00
Scott Lahteine
f16bdd2ff2
Borrow from Ultimaker to fix MAX6675 SPI conflict
...
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
2015-01-24 03:49:15 -08:00
Scott Lahteine
06c3b37933
Formatting cleanup of quiet sources
...
Formatting for code-folding plus minor style changes to less active
code.
2015-01-23 22:26:52 -08:00
Scott Lahteine
23fcd1ecb2
Merge pull request #1407 from thinkyhead/cleanup_marlinserial
...
Formatting cleanup of quiet sources
2015-01-23 21:33:43 -08:00
Scott Lahteine
fd78902194
Formatting cleanup of quiet sources
2015-01-23 21:11:50 -08:00
Scott Lahteine
5c1814383a
Merge pull request #1390 from floyd871/Development
...
Show Custom M_Code for Z-Probe Offset when entering M503
2015-01-23 20:08:23 -08:00
MagoKimbra
0ebf896070
Add 4th extruder
2015-01-23 23:13:06 +01:00
Michael Neumann
a9d7ab9530
Update ConfigurationStore.cpp
...
Done
2015-01-23 21:05:27 +01:00
Scott Lahteine
3a9a3e5ed8
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
...
This define is not used.
2015-01-23 10:51:06 -08:00
Scott Lahteine
54d5b52a2e
Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones
...
Code wont compile with extruder but without bed runaway protection defined.
2015-01-23 08:36:25 -08:00
Mark Hindess
0ce252ba7a
This ifdef is for bed code so should use bed constants for testing.
...
Without this fix, the code wont compile with extruder but without bed
runaway protection defined.
2015-01-23 16:30:13 +00:00
Scott Lahteine
9040446780
Merge pull request #1395 from AnHardt/iss1394
...
removed function step_wait() from stepper.cpp
2015-01-23 06:58:10 -08:00
Scott Lahteine
25f79c5010
Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
...
Add: Board for Vellemann K8200 (derived from 3Drag)
2015-01-23 06:08:38 -08:00
Scott Lahteine
9ce75ab7de
Merge pull request #1386 from roglio/Development
...
Fixing a build error for melzi and gfx display
2015-01-23 06:00:24 -08:00
Scott Lahteine
15a00a5a7c
Add 1µs delay in other appropriate spots
2015-01-23 03:24:45 -08:00
AnHardt
23cb899c5a
removed function step_wait() from stepper.cpp
...
removed function step_wait() from stepper.cpp because its used nowhere.
2015-01-21 16:30:45 +01:00
Scott Lahteine
d9d4a78e0f
Add proper delay in stepper.cpp
...
Issue #1385 describes a delay that the compiler is optimizing out and
this solution.
2015-01-21 01:51:29 -08:00
CONSULitAS
d1322dafc9
Add: Example Configuration for Vellemann K8200 - based on new BOARD_K8200 #1391
...
# Add: Example Configuration for Vellemann K8200 - based on new
BOARD_K8200 #1391
* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag http://reprap.org/wiki/3drag , too. Please
report)
* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters form genuine Vellemann Firmware "firmware_k8200_marlinv2"
based on the recent development branch
I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows (SD library added to IDE manually) - everything works well
2015-01-20 23:13:44 +01:00
CONSULitAS
3b50a5e2e6
Add: Board for Vellemann K8200 (derived from 3Drag)
...
## Add: Board for Vellemann K8200 (derived from 3Drag)
* Boards.h: updated comment for board 3Drag - K8200 removed
* Boards.h: added `BOARD_K8200` with ID 78
* language.h.: machine name and firmware URL for new board
* pins.h: added `K8200` to any `#if` with `3Drag` and corresponding
comments
2015-01-20 20:46:20 +01:00
Michael Neumann
2d454da3af
Update ConfigurationStore.cpp
...
Show Custom M Code when entering M503
2015-01-20 16:21:44 +01:00
Scott Lahteine
4f35de991a
Merge pull request #1383 from CONSULitAS/Development
...
Update Boards.h for Vellemann K8200 - comment only
2015-01-19 15:59:38 -08:00
roglio
22571ca13d
Revert "Configuration for Aurora Z605"
...
This reverts commit 935ee968a7
.
2015-01-19 15:02:11 +01:00
roglio
935ee968a7
Configuration for Aurora Z605
...
Still not fine tuned but working.
2015-01-19 11:18:52 +01:00
roglio
ccdbeda526
Fixing a build error for melzi and gfx display
...
When a melzi board and a full gfx are both selected, the build fails
blaming for some missing defines.
This is a fix for the issue: now my configuration works.
2015-01-19 10:43:26 +01:00
CONSULitAS
e13f159343
Update Boards.h for Vellemann K8200 - comment only
...
## Update Boards.h for Vellemann K8200 - comment only
* Boards.h: updated comment for board 3Drag - K8200 uses same board
2015-01-19 00:53:17 +01:00
CONSULitAS
51c7f2fd5a
Revert "## Add: Example Configuration for Vellemann K8200"
...
This reverts commit 5333590ac2
.
2015-01-19 00:37:57 +01:00
CONSULitAS
5333590ac2
## Add: Example Configuration for Vellemann K8200
...
* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag too, please report)
* K8200/language.h: updated machine name and URL for K8200
* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters
form genuine Vellemann Firmware "firmware_k8200_marlinv2" based on the
recent development branch
* K8200/files by Vellemann: added folder with original files from
Vellemann homepage, since there is no GitHub fork you could link to by
them
I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows - everything works well
2015-01-19 00:28:55 +01:00
Denis Chertykov
ba3ac40b9d
Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER.
...
Change default value of AVRDUDE_PROGRAMMER to 'wiring'.
2015-01-18 20:18:43 +03:00
daid
53f971095d
Revert "Reduce PROGMEM warnings"
2015-01-16 16:48:22 +01:00
PxT
67b597ad46
Update printrboard pin assignments
...
Backported from Printrbot branch, allows the fan to work correctly.
2015-01-15 19:48:40 -08:00
galexander1
d4880a9e60
Revert "Move Sd library out into library"
2015-01-15 18:52:10 -05:00
Bo Herrmannsen
ccdb086fc8
Merge pull request #1363 from PxT/patch-1
...
Fixes #1361
2015-01-15 10:57:44 +01:00
Bo Herrmannsen
5151db5c2f
Merge pull request #1349 from msutas/patch-2
...
Improvement - G29 Option for Not Retracting Servo
2015-01-15 10:56:31 +01:00
Bo Herrmannsen
1746b2582b
Merge pull request #1332 from Sniffle/Development
...
Rambo FAN_PIN documentation and servo support
2015-01-15 10:56:17 +01:00
Bo Herrmannsen
4b51b5a46d
Merge pull request #1357 from odewdney/SDlib
...
Move Sd library out into library
2015-01-15 10:56:07 +01:00
Bo Herrmannsen
f2cb4a3655
Merge pull request #1353 from thawkins/Development
...
fix avrdude upload in makefile
2015-01-15 10:55:33 +01:00
PxT
9fd4292923
Fixes #1361
2015-01-13 10:59:50 -08:00
odewdney
f84ff4ba7d
Move SD Fat library out of main src
2015-01-13 13:31:55 +00:00
Bo Herrmannsen
ab074dac17
Merge pull request #1344 from grob6000/independent_pid
...
Independent PID parameters for each extruder
2015-01-13 12:10:37 +01:00
Bo Herrmannsen
d4a665694a
Merge pull request #1350 from odewdney/Development
...
Reduce PROGMEM warnings
2015-01-13 11:26:50 +01:00
odewdney
9d9c859ac1
First move of SdFat library
2015-01-13 08:04:32 +00:00
Tim Hawkins
5045d17a39
fix avrdude upload in makefile
2015-01-13 13:01:43 +08:00
msutas
3a5a6f42fb
Corrected the ABL grid option
...
G29 E was not retracting the probe on the last probe point when used with ABL grid. Corrected.
2015-01-12 11:07:46 +02:00
odewdney
cd55a93a13
re-add blank line
2015-01-11 19:22:35 +00:00
odewdney
23bfe30036
moved include themister to temperature.c
2015-01-11 18:18:32 +00:00
odewdney
538859669d
Removing compiler warnings for progmem
2015-01-11 18:14:21 +00:00
grob6000
bf2c923db5
Make multiple PID parameters a config option
...
* Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID
parameters to be used where this would be preferable (e.g. dual
identical extruders)
* When disabled, will use `float Kp, Ki, Kd, Kc;` as before.
Preprocessor macros used to switch between.
* ultralcd.cpp defines extra menus for extra parameters only where
required
* M301 reports `e:xx` only if independent pid parameters enabled
* EEPROM structure still leaves space for 3 extruders worth, when undef
will save single parameter to all extruder positions, but only read the
first
* Switching off saves approx 330 B with no LCD enabled, 2634B with LCD
(RRD) enabled: this is significant.
* LCD modifications should be tested.
2015-01-11 13:50:17 +11:00
grob6000
0877aa0fe0
Merge remote-tracking branch 'upstream/Development' into independent_pid
2015-01-11 11:32:58 +11:00
msutas
e0beb98fd3
Improvement - G29 Option for Not Retracting Servo
...
This change introduces an improvement to G29 command on Marlin.
Auto bed leveling operation's reliability is based on the repeatability of the Z-probe switch and the servo. This change introduces an option to G29 command. When the G29 command is sent with an "e" option, during auto bed levelling the servo is not retracted between probes which decreases the bias on auto bed levelling resulting from servo.
G29 command does the auto bed probing as it is.
G29 E command engages the servo on first probing point, probes all points and retracts the servo after probing the last point.
Please comment your opinions, test on your printer and check the code on a programmer's perspective. (I am not a good programmer.)
2015-01-10 17:25:39 +02:00
grob6000
7d32c7f36d
Multiple PID parameter edit for ultralcd
...
* Depending on extruder count, will add menu items for ultralcd to edit
individual PID parameters for each extruder
* Added menu items to each language_xx.h
* Builds OK, but recommend testing with typical LCD
2015-01-11 01:14:02 +11:00
Steffen Vogel
69dc411ae0
Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD
...
Conflicts:
Marlin/dogm_lcd_implementation.h
2015-01-10 14:57:11 +01:00
grob6000
3e2af67ce3
Fix R-H compatibility
...
* R-H reads incorrect M301 line from EEPROM output if more than one is
present. Reverted to original output format, using only E0 value.
2015-01-10 16:44:28 +11:00
grob6000
37c7e8300f
Independent PID parameters for each extruder
...
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
2015-01-10 16:35:12 +11:00
Scott Lahteine
326b925557
DOGLCD and LCD_PROGRESS_BAR to coexist
...
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
2015-01-09 18:16:56 -08:00
Erik van der Zalm
1aade4a8e2
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development
2015-01-09 21:33:29 +01:00
Erik van der Zalm
8a2e84e3f1
Possible fix for FWRETRACT with 0 zlift.
2015-01-09 21:33:02 +01:00
Steffen Vogel
905aab3b85
added missing #endif
2015-01-09 20:23:38 +01:00
Steffen Vogel
b9cf1465a7
updated LCD bouts with new strings and bitmaps
...
new version is pretty generic and should work in most scenarios
2015-01-09 18:49:59 +01:00
Steffen Vogel
c7632be5cc
added high and low resolutions version of splash screen logo (saving code size)
2015-01-09 18:49:24 +01:00
Steffen Vogel
8f0dba7cbf
adding string for bouts splash string to config
2015-01-09 18:48:30 +01:00
Bo Herrmannsen
d94109e886
updated logo post and ver info
2015-01-09 15:51:15 +01:00
Bo Herrmannsen
cd33b5b062
changed logo and ver info
...
logo is now 110 pixels wide and starts 9 pixels in from top left corner and also 9 pixels down from same corner... this will give a 9 pixel border all way round
ver info is placed centered and there is a 9 pixel from bottom of display to ver info
2015-01-09 15:44:47 +01:00
Bo Herrmannsen
9b6c1cfda6
removed unneeded lines in welcome msg
2015-01-09 15:20:41 +01:00
Bo Herrmannsen
ffa09f86f4
moved ver info 5 spaces to the right
2015-01-09 13:31:23 +01:00
Alex Borro
2bbb68be8a
Fix calculation of BAL grid fitting into the bed
...
The previous calc was wrong. Between N points there are only N-1 gaps,
not N.
So changing AUTO_BED_LEVELING_GRID_POINTS to
(AUTO_BED_LEVELING_GRID_POINTS-1)
2015-01-09 10:17:33 -02:00
Bo Herrmannsen
590caafa2d
changed ver info
2015-01-09 13:17:08 +01:00
Bo Herrmannsen
3bb9b31515
changed boot logo a bit to test if fat wall goes away
2015-01-09 12:51:21 +01:00
Steffen Vogel
da192c521f
Merge pull request #1333 from andrewsil1/development
...
Fix grammar/typos in new Configuration.h option
2015-01-08 00:34:01 +01:00
Erik van der Zalm
3a30d45c2e
Revert "issue 968 for dev branch"
2015-01-07 23:40:17 +01:00
andrewsil1
269ec9f87f
Fix grammar/typos in new Configuration.h option
...
(For the SLOW_PWM_HEATERS option)
2015-01-07 12:41:09 -08:00
Todd Swindoll
506353892e
Rambo Pin documentation and servo support
...
Updated pins reference and servo support.
cross referenced between Rambo 1.1, 1.2, and 1.3
2015-01-07 11:02:05 -06:00
Steffen Vogel
8d7bfd03d8
moved/renamed documentation stuff to top-level directory
2015-01-07 15:33:50 +01:00
Bo Herrmannsen
3c9e6b7b62
added link for pic to hex converter
2015-01-07 14:28:51 +01:00
Bo Herrmannsen
0e760274bd
changed reprap logo to marlin logo
2015-01-07 14:27:51 +01:00
Bo Herrmannsen
b291a422e9
added square png version of logo
...
406*406 pixels
2015-01-07 13:00:37 +01:00
Luis E Alvarado
7ae548cf34
Update Marlin Firmware URL
2015-01-07 05:26:47 -06:00