954 Commits (773229b02049297adb4c67df303453892083215f)

Author SHA1 Message Date
Richard Wackerbarth ad09d6a60f 3 Step Allen Key Probe 10 years ago
AnHardt e400fce271 Merge pull request #2221 from MagoKimbra/Dryrun
Insert Debug DRYRUN Repetier Host compatible
10 years ago
AnHardt c3fe6e61ae Merge pull request #2229 from AnHardt/position-out-of-range
Fix out_of_range_error()
10 years ago
AnHardt d1f4471000 Merge pull request #2146 from Wackerbarth/Versioning
Versioning
10 years ago
AnHardt 17b0ec84ed Fix out_of_range_error()
For sprintf_P() the first parameter has to be a `char*` not `const char*`.
10 years ago
AnHardt 35af5ef23e Merge pull request #2225 from Wurstnase/naming
consistency name for multiplier
10 years ago
wurstnase e7e964432b consistency name for multiplier
replace extruder_multiply with extruder_multiplier
like feedrate_multiplier or volumetric_multiplier
10 years ago
MagoKimbra 76306f9073 Insert Debug DRYRUN Repetier Host compatible 10 years ago
MagoKimbra 881146bc22 Fix problem Width Cura 10 years ago
AnHardt 9d2a980bcf Merge pull request #2170 from thinkyhead/beep_M600_elsewise
Slight size reduction by adding idle()
10 years ago
AnHardt 2728dc0606 Merge pull request #2194 from thinkyhead/reduce_strings
Redo "invalid extruder" to save 304 bytes
10 years ago
Scott Lahteine be5236e839 Reduce setTargetedHotend by removing the switch 10 years ago
Scott Lahteine 06f401e7e5 Redo "invalid extruder" to save 264 bytes
- Use `setTargetedHotend` in `M200`, as with other commands that use
`T` for the extruder
- Synthesize the "invalid extruder" message, obviating several long
strings
10 years ago
Scott Lahteine 1a882bcc2e Merge pull request #2193 from thinkyhead/ignore_unrecognized_commands
Ignore unknown commands if they start with G, M, or T
10 years ago
Scott Lahteine a672872717 Merge pull request #2187 from AnHardt/MAX6675M105
Print active extruder with M105 for MAX6675
10 years ago
Scott Lahteine 9beed830eb Drop commented code_is_good lines 10 years ago
Scott Lahteine 068d4a1eb2 Ignore unknown commands if they start with G, M, or T 10 years ago
Scott Lahteine c5c9d12630 Merge pull request #2183 from AnHardt/displayinit
Initialize the display earlier
10 years ago
Scott Lahteine 0564625757 Update M33 for new gcode parser 10 years ago
AnHardt af7e3f5076 Print active extruder with M105 for MAX6675
Was omitted when T0 is a MAX6675.
10 years ago
AnHardt f0523b5816 Initialize the display earlier
to have it ready to display errors during (temperature)-setup.
10 years ago
Scott Lahteine 03d5709b09 M110 is a known command
- The command parser now displays “unknown command” in more cases.
Known commands must be added to the `switch` inside `process_commands`
to suppress the error.
10 years ago
Scott Lahteine d76a01194d Slight size reduction by adding idle() 10 years ago
Richard Wackerbarth 5ea139fd79 Revised Versioning mechanism 10 years ago
Scott Lahteine 68f6f149d0 Reduce code size with out_of_range_error function
- Affects code size when automatic bed leveling is enabled
10 years ago
Scott Lahteine b55f8718c3 Indent G90/G91, G92 10 years ago
Scott Lahteine b0d520b109 Indent G30, G31/G32 10 years ago
Scott Lahteine ffe27a6225 Indent G29 10 years ago
Scott Lahteine 86083badc2 Indent G4, G10/G11, G28 10 years ago
Scott Lahteine 47d7a9cb5e Indent G2/G3 10 years ago
Scott Lahteine 350f239d84 Indent G0/G1 10 years ago
Scott Lahteine 15a2351675 No need for +1 on initial seen_pointer 10 years ago
Scott Lahteine 550dd87b2a Set seen_pointer before calling code_value 10 years ago
Scott Lahteine 04a1622172 Merge pull request #2127 from Wackerbarth/Kossel_Pro
Kossel Pro
10 years ago
Scott Lahteine f919a2fed1 Merge pull request #2134 from AnHardt/preheat-all
Shift call of start_watching_heater() into setTargetHotend()
10 years ago
AnHardt 0c0ace2a04 Remove start_watching_heater() fom M104 and M109 10 years ago
Scott Lahteine bde9c70d42 Suppress the line mismatch error after M303 10 years ago
Scott Lahteine 50bd7493cc Merge pull request #2108 from thinkyhead/m33_long_filename_host_support
M33 LONG_FILENAME_HOST_SUPPORT
10 years ago
Scott Lahteine 4d11b29959 Merge pull request #2113 from thinkyhead/command_sanitizer
Command sanitizer
10 years ago
Richard Wackerbarth 735bf2d35f Describe Custom M Code 10 years ago
Scott Lahteine f39658c822 M120 and M121 are reversed 10 years ago
AnHardt 89d2ee6f13 Make output on display dependant of ULTRA_LCD 10 years ago
AnHardt f4a93ed997 Add a string parameter to kill()
Makes the output on the LCD adjustable.
10 years ago
Scott Lahteine a0f362c735 Simplify & optimize with current_command_args 10 years ago
Scott Lahteine adc8fcb77f More parser comments, optimize code_seen, save with goto 10 years ago
Scott Lahteine c6d8dd19d9 use fetched value 10 years ago
Scott Lahteine 1116e13f5a Further optimization of command parser 10 years ago
Scott Lahteine 3a4c3ab76e Pre-sanitize the command before handling
- Use a global pointer for the current sanitized command
- Pre-sanitize the current command to bypass `N` and nullify `*`,
removing the need for handlers to bypass, ignore, or nullify these
parts, and reducing overhead for `code_seen`, etc.
- Pre-skip leading whitespace.
- Only look for G, M, T codes at the start of the command.
- Verify that G, M, T codes are followed by command codes.
10 years ago
Scott Lahteine 0f2c9bacfd M33 LONG_FILENAME_HOST_SUPPORT 10 years ago
Scott Lahteine 3feaef6526 Have G92 set the nozzle position on Delta and SCARA 10 years ago
Scott Lahteine 6c27eaf864 Merge pull request #2101 from thinkyhead/code_style
Code style and a dangling "else"
10 years ago
Scott Lahteine d580a0d186 Use "+=" in plane rotation 10 years ago
Scott Lahteine 2f3a410cb0 Fix a potential hanging "else" bug 10 years ago
Scott Lahteine b83e3f0905 Combine "Bed X: " strings 10 years ago
Scott Lahteine 7dfb8becdb Adjust some names and types in Marlin_main.cpp 10 years ago
Scott Lahteine c966aa26ff Comments in Marlin_main.cpp 10 years ago
Scott Lahteine c54a2ea042 Adjust spacing in Marlin_main.cpp and stepper.* 10 years ago
Scott Lahteine 072625ccad Update headings in Marlin_main.cpp and stepper.cpp 10 years ago
Scott Lahteine 16032f149f Rename to codenum as a consistency 10 years ago
Scott Lahteine 273a4a253f Merge pull request #2096 from thinkyhead/cherry_picking3
Hide M117 with no LCD
10 years ago
Scott Lahteine 64825a3d1e Merge pull request #2095 from thinkyhead/cherry_picking2
Add gcode_line_error to reduce code size
10 years ago
Scott Lahteine ca79282eaf Hide M117 with no LCD 10 years ago
Scott Lahteine ce218cafdb Add gcode_line_error to reduce code size 10 years ago
Scott Lahteine 46d59784ad Rename preocess_command to process_next_command 10 years ago
Scott Lahteine 19166a92e4 Merge pull request #2057 from Wurstnase/serial_wait
add plan buffer remaining for 'P' and block buffer remaining 'B'
10 years ago
Scott Lahteine e97fcafd0e Merge pull request #2076 from thinkyhead/mendel_inverting
Use MSG_OK in M105
10 years ago
Scott Lahteine 0f6cd3640b Drop extraneous ok_to_send 10 years ago
Scott Lahteine 0ce355d9e7 Use MSG_OK in M105 10 years ago
Scott Lahteine 7b3acfbb6f Merge pull request #2072 from thinkyhead/better_arc_code
Consolidate arc code, remove motion_control.*
10 years ago
Scott Lahteine 68ce419147 Note on segment size 10 years ago
Scott Lahteine 8b92249f18 Bring arc_offset into auto scope 10 years ago
Scott Lahteine 80807b2d71 Consolidate arc code, remove motion_control.* 10 years ago
Scott Lahteine f65833931d Formatting tweaks 10 years ago
Scott Lahteine 747fd5801c Merge pull request #2055 from thinkyhead/thermal_unified
Combine thermal runaway and watch-period
10 years ago
Scott Lahteine 6e5572228d Merge pull request #2064 from thinkyhead/wait_before_g28
Split up prepare_move by type
10 years ago
Scott Lahteine 27ad381e25 Allow fractional seconds in G4 and M0 10 years ago
Scott Lahteine b2bd9aae7c SCARA_SEGMENTS_PER_SECOND 10 years ago
Scott Lahteine bd20bd5444 Merge pull request #2063 from chris-bo/autobed_sled
improve sled handling
10 years ago
Scott Lahteine 9e95ceb3fc Split up prepare_move by type
- For better encapsulation add inlines for each prepare_move type
- Move controllerFan vars inside the function as statics
- Some formatting cleanup
- Rename `ClearToSend` as `ok_to_send`
10 years ago
Christian Bohn f48599f172 add pin definition to some motherboards 10 years ago
Scott Lahteine b5200e184c Remove extra setup_for_endstop_move 10 years ago
Scott Lahteine 8d814de558 Return void in prevent_dangerous_extrude 10 years ago
Scott Lahteine 367e2eb9f4 Global setup_for_endstop_move 10 years ago
Scott Lahteine fa951f8a0b Always do st_synchronize() before G28 10 years ago
Christian Bohn 27a3b1d895 disable sled pin by default 10 years ago
Christian Bohn fb44b53ae3 sled improvements
- create sled pin definition
- G28 Works with sled
10 years ago
Wurstnase 46d1932380 add plan buffer remaining for 'P' and block buffer remaining 'B' 10 years ago
Scott Lahteine 8a0dc4d54a Merge pull request #1922 from Wurstnase/serial_wait
Serial wait
10 years ago
Wurstnase 526ad82d20 activate advanced_ok and no_timeout 10 years ago
Scott Lahteine 2445ae3d3a Combine thermal runaway and watch-period
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
10 years ago
Scott Lahteine 4097207c75 Merge pull request #2041 from thinkyhead/watch_temp
More thermal protection
10 years ago
Scott Lahteine 9b3d4380d3 Only watch the heater that was set 10 years ago
Scott Lahteine f73f4ce555 Make some z probe and servo code tweaks 10 years ago
Scott Lahteine 54deb9eea3 Enable WATCH_TEMP_PERIOD by default 10 years ago
Wurstnase 0cb87795a3 advanced 'ok'
ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.

Some pseudo code:
If (bufferremaining > 0)  send command
## as long there is free buffer send command

Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received
10 years ago
Wurstnase 182e0d99c9 Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait 10 years ago
Scott Lahteine 7f3252eea9 Merge pull request #1999 from paclema/Filrunout_configurable_script
Added configurable script for filrunout from configuration.h
10 years ago
Scott Lahteine 79633a74ab Fix MBL compile error 10 years ago
Scott Lahteine 777f2d3820 Merge pull request #2018 from fmalpartida/bugFixing
Bug corrected: persistent HOMING message when HOME button pressed for homing.
10 years ago
Scott Lahteine ecb46de349 Merge pull request #2013 from bq/Fix_lowercase
Fixed lowercase change missing on commit a22a228b.
10 years ago
fmalpartida 150a35eff8 Bug corrected:
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
10 years ago
Gina Häußge ab246ab032 Reverting changes to error messages on serial console
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
10 years ago
Ivan Galvez Junquera 59529b755d Fixed lowercase change missing on commit a22a228b.
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
10 years ago
Scott Lahteine 1f039cde61 Merge pull request #1992 from thinkyhead/too_many_probes
Stow Z probe on M402 without extra raise
10 years ago
Scott Lahteine ca8cec8e8a Merge pull request #1998 from paclema/Filament_runout_fix
Fixed sintaxis error of filament runout
10 years ago
Scott Lahteine d4c74b8f8c Don't apply M428 if an error occurs
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
10 years ago
Scott Lahteine d065d37822 Add M428 to set home_offset logically 10 years ago
paclema 013a09dbe6 Added configurable script for filrunout form configuration.h 10 years ago
paclema 4dcc0fd55a Fixed sintaxis error of filament runout 10 years ago
Scott Lahteine ce3caf447b Tweak how homeaxis deploys and stows 10 years ago
Scott Lahteine a235dca79c Stow z on M402 without extra raise 10 years ago
Scott Lahteine 3688256f86 Merge pull request #1974 from thinkyhead/eeprom_in_gcode
Make EEPROM reproducible in GCode
10 years ago
Scott Lahteine 31516e2a3b Merge pull request #1985 from Arengorn/Development
Update of servo.h
10 years ago
Scott Lahteine 0f687b5dda Merge branch 'Development' into eeprom_in_gcode
Latest upstream commits
10 years ago
Scott Lahteine 28aef684b4 Merge pull request #1957 from Voxel8/sjk/home_y_before_x
Allow Y to home before X with option in Configuration_adv.h.
10 years ago
Scott Lahteine 71a0b1a5bb Disable endstops between homing bumps 10 years ago
Scott Lahteine c36226c4dc Fix homing Z position
Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the
planner position in sync when homing.
10 years ago
Scott Lahteine ff178d8cf7 Change M421 to take coordinates
This makes `M421` more amenable for irregular matrices
10 years ago
Bernardo ff67ee73fc Update Marlin_main.cpp
Corrected "servo.h" to "Servo.h" because of the updated filename.
10 years ago
Steve Kelly 98ca46006c Allow Y to home before X with option in Configuration_adv.h.
This addresses comments in #1956 and #1079. In particular, this is useful
when both endstops are stationary on a CoreXY system, and the Y axis needs
to be homed before the X so the flags are aligned.
10 years ago
Scott Lahteine 0fca084ea6 Make EEPROM reproducible in GCode
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.

- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
10 years ago
Scott Lahteine d43cc2dd5f M111 - Debug Level
- Add `M111` as a standard option to set the debug level
- Implement `DEBUG_ECHO` in `process_commands`
- Other debug levels (e.g., `DEBUG_DRYRUN`) need more work
10 years ago
Scott Lahteine a22a228bcc Rename files to move them in the IDE 10 years ago
Scott Lahteine 0438f0d835 Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402
Raise Z for M401 and M402
10 years ago
Scott Lahteine b275946a52 Merge pull request #1966 from thinkyhead/g4_dwell_message
G4 shows status message only if no message is set already
10 years ago
Scott Lahteine 182f2cda35 Minor cleanup of M48 10 years ago
Scott Lahteine 3a6fd912cd Latest upstream commits, merged 10 years ago
Scott Lahteine 3c9e94e035 Merge pull request #1964 from AnHardt/Max6675again
Add variant for MAX6675 in M104
10 years ago
Scott Lahteine 56ff46eb8b Improve code_has_value test 10 years ago
Scott Lahteine ce142afdda G4 shows status message only if no message is set already
- Address issue raised in #1961
10 years ago
Scott Lahteine 35e79d56a5 Remove set-coordinate extension of G28 10 years ago
Scott Lahteine 3a74bb5039 Merge pull request #1945 from Wurstnase/max_endstopp
Max endstopp
10 years ago
AnHardt 0fed46360c Add variant for MAX6675 in M104
Else will throw error:
@:0 B@:0
Error:No thermistors - no temperature
[ERROR] Error:No thermistors - no temperature

when no bed is defined
10 years ago
Scott Lahteine 588ed70d4a Latest upstream commits, merged 10 years ago
Scott Lahteine 0165560333 Apply zprobe_zoffset in axis_is_at_home
Ensure the probe offset will always be included when homing Z.
10 years ago
Scott Lahteine 075386e7fe Merge pull request #1959 from thinkyhead/lcd_move_rate
Include axis parameter to ultralcd's line_to_current
10 years ago
Scott Lahteine 2558c10c6c Use the slower feedrate for XY axes 10 years ago
Scott Lahteine 64268f3312 Fixup axis_is_at_home a little 10 years ago
Scott Lahteine 996d0a9185 Squish the code down a little 10 years ago
Scott Lahteine 8534bc376c Fix homing of YZ with DUAL_X_CARRIAGE 10 years ago
Scott Lahteine 3b97a7d446 Merge pull request #1944 from AnHardt/beep2
More Beeper clean up
10 years ago
Wurstnase be9e4ceddc fix typo
c'n'p ftw :/
10 years ago
unknown c26d816839 filter any 0 10 years ago
Wurstnase 61ae43f35e v <-> code_value 10 years ago
Wurstnase da0d91a79b max endstopp
no user will home to 0 with a max endstopp
10 years ago
AnHardt 064f2b37d0 More Beeper clean up.
Centralised beep code to lcd_buzz().
From gcode_M300() and lcd_quick_feedback().

Enforced max. duration for M300 to 5 seconds.

Corrected description in 'Configuration.h'

LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
LCD_FEEDBACK_FREQUENCY_DURATION_MS.
10 years ago
Wurstnase 92575cecca new timout/add adv_ok 10 years ago
AnHardt 671aaf2dc9 Minor fix for M300
Corrected wrong order of parameters.
10 years ago
Scott Lahteine d931220a65 Tweak comments 10 years ago
Scott Lahteine 47847765e2 Add M410 QuickStop command 10 years ago
Wurstnase b09a957fce make 'wait' optional and mark as workaround 10 years ago
Scott Lahteine 63b98b8280 Raise Z for M401 and M402 10 years ago
wurstnase d69da22f7c last_command_time inside get_command() 10 years ago
wurstnase 574e2d856e remove config 10 years ago
paclema cde5eee2a5 Removed unnecessary comments 10 years ago
paclema e1b69db6d1 Fixed M48 mismatch between n and P parameter on documentation 10 years ago
Scott Lahteine e0e68c5cbc Rename servos[] array in Marlin to servo[] 10 years ago
Scott Lahteine 642f6a92bc fix type of code_has_value 10 years ago
Scott Lahteine 17ad80c1e1 Spacing in XYZ_CONSTS 10 years ago
Scott Lahteine 09d60e0128 Naming and code comments 10 years ago
Mehmet Sutas 5a9e45cc4a Fix Syntax Error Filament Runout Statement 10 years ago
Scott Lahteine ccddc280be Apply three more commits 10 years ago
Scott Lahteine ac2b23f574 Homing fixes
- Prevent `Z_SAFE_HOMING` from homing Z twice in some cases
- Allow `G28` with XYZ values of 0 to explicitly set the position
- Don’t add `home_offset` when setting XYZ explicitly in `G28`
- Add `code_has_value` function to check for the presence of a numeric
value (could just test for space or nul to allow other types of values)
10 years ago
Scott Lahteine 5fe382949b Some G-Codes comment cleanup 10 years ago
Scott Lahteine 8b16ebe705 Break out prevent_dangerous_extrude feature
- It’s inline here, but could be a macro and duplicated for
`planner.cpp`
10 years ago
Scott Lahteine 9189cc66ab Fix moves for DELTA for MANUAL_BED_LEVELING
- Use `line_to_current` in place of `plan_buffer_line`
10 years ago
Scott Lahteine 2ca099d1e7 Merge pull request #1876 from thinkyhead/cold_extrude
Catch dangerous extrude before trying several
10 years ago
Scott Lahteine a00ebf03d4 Merge pull request #1868 from AnHardt/LCD_STR
Moved the definitions of the LCD_STR_* to Conditionals.h
10 years ago
Scott Lahteine 1269c445ab Catch dangerous extrude before trying several 10 years ago
AnHardt 540dbb35e2 And an other MSG_BED in Marlin_main.cpp 10 years ago
AnHardt 14d4419e16 Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed")
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
10 years ago
AnHardt 6a514f3dc9 Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp
and cleaned typo.
10 years ago
Scott Lahteine 3162971cd6 current_position not static 10 years ago
Scott Lahteine 27cb90da8b IsStopped / IsRunning inline 10 years ago
Scott Lahteine e03da4805b Merge pull request #1774 from epatel/Development
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
10 years ago
Scott Lahteine f7c4e7e19f Fix G29 not deploying in some instances 10 years ago
Edward Patel 002340f32c Merge branch 'Development-Marlin' into Development 10 years ago
Scott Lahteine c379f17117 Encapsulate setting of homing_bump_feedrate 10 years ago
Scott Lahteine d20f42c883 Don't stow the probe until the last grid point!
- Address Issue #1682 at hash #issuecomment-89756858
10 years ago
Scott Lahteine 6d084c017f Fix typo in FWRETRACT handler
Should be `retracting` and not `retract`
10 years ago
Edward Patel 2f0081bbb5 Compile error fix! Fix for merge artifacts. 10 years ago
Edward Patel ea10601406 Merge branch 'Development-Marlin' into Development
Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine 61f8394361 Compare indices instead of floats for probe actions 10 years ago
Scott Lahteine 0935084141 Fix manage_inactivity
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
10 years ago
Scott Lahteine c065da52ec Spacing and spelling 10 years ago
Scott Lahteine 8680b515b0 Fix missing tmp_extruder -> target_extruder 10 years ago
Scott Lahteine c185912c19 Latest upstream commits, mostly 10 years ago
Scott Lahteine 1e5c18bb14 Add code_value_short and SERIAL_CHAR 10 years ago
Scott Lahteine 84e4edaea7 Add M48 comment for #1794 10 years ago
Scott Lahteine b98ebd517e disable / enable_all_steppers functions 10 years ago
Scott Lahteine 713953d8c1 Upstream commits, allow no extruder in M105 10 years ago
Scott Lahteine 8f893eb8df Merge pull request #1798 from thinkyhead/fixup_probing
Fix probe height at G28 start
10 years ago
Scott Lahteine dde7e11f8e Merge branch 'Development' into fixup_tr
Latest upstream commits
10 years ago
Scott Lahteine abd7fc36b6 Fix probe height at G28 start 10 years ago
Scott Lahteine 610c8c5471 Merge pull request #1795 from thinkyhead/fixup_probing
Finish pin tests
10 years ago
Scott Lahteine e4934164e4 Merge pull request #1790 from Wurstnase/fix_home_z
fix feedrate for homing z
10 years ago
Scott Lahteine a469d796e1 Add cleanups needed for #1772 10 years ago
Scott Lahteine c0ca26cd50 Merge branch 'Development' into fixup_probing
Latest upstream commits
10 years ago
Scott Lahteine 5c1f08a35f Merge pull request #1772 from croadfeldt/Merge_cleanup
Z_PROBE_ENDSTOP
10 years ago
Scott Lahteine 92119d0f7d Static delta[] for SCARA 10 years ago
Scott Lahteine 6b919e14c1 Group all universal variables 10 years ago
Scott Lahteine 21cd2e4fae Merge branch 'Development' into fixup_probing
Latest upstream commits
10 years ago
Scott Lahteine 0e8182bbf2 Additional pin tests, cleanup 10 years ago
Wurstnase 45565b680d second wrong feedrate 10 years ago
Wurstnase 581b2aae04 fix feedrate for homing z
max_feedrate is in mm/s. line_to_destination needs a feedrate in mm/min because there is feedrate/60.
10 years ago
AnHardt 23cd54755f Fix typo in Marlin_main.cpp
related to current_position[Z_AXIS] and retract_zlift.

'+ =' -> '+='

Fix for #1786
10 years ago
Scott Lahteine e96df67630 Clarify thermal_runaway_protection
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
10 years ago
Edward Patel 6b91b7b411 Mesh bed leveling: Added G29 S3 + finer steps in manual probing.
* Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually
* Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h
10 years ago
Chris Roadfeldt 26dc80bf2d Typo fixed... 10 years ago
Chris Roadfeldt a57862e29f Cleaning up code in prep for merge with upstream. 10 years ago
Chris Roadfeldt 745d9fe1a4 Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
Conflicts:
	Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine 9593f09b99 Merge pull request #1764 from thinkyhead/probe_leveling
Fix homing and leveling
10 years ago
Scott Lahteine 72c7de3570 Cleanup M48 10 years ago
Scott Lahteine 97a258b0b0 Clean up, document home_axis 10 years ago
Chris Roadfeldt a508d835db Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP.
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
10 years ago
Chris Roadfeldt fdb4ddbdea Merge remote-tracking branch 'MarlinFirmware/Development' into Development 10 years ago
Scott Lahteine 1c7391717e Include sync_plan_position_delta for SCARA also 10 years ago
Scott Lahteine 0b57a2ab8b Merge pull request #1757 from bq/Translation-strings
Added new trasnslatable labels.
10 years ago
Scott Lahteine 18bb6be80e Fix homing and leveling
- Include the current Z when raising the axis after and between probing
- Add `sync_plan_position_delta` for parity with `sync_plan_position`
- Clean up and clarify `M48`, `dock_sled`, and others
10 years ago
Chris Roadfeldt c89b8368ee Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
10 years ago
Ivan Galvez Junquera d08782386b Added new trasnslatable labels.
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
  EN, FR, DE, ES, IT, PT, PT-BR.
10 years ago
Scott Lahteine 97a69d9b1c Correct XYZ after obtaining plan_bed_level_matrix
The current position needs to be updated by using the inverse
`plan_bed_level_matrix` on X, Y, and Z. All moves in the planner are
transformed by the `plan_bed_level_matrix` from this point forward.
10 years ago
Scott Lahteine 5f6962dd90 Merge pull request #1755 from thinkyhead/fixup_config
Raise when not retracting
10 years ago
Scott Lahteine ae89ccd2c7 Use Z_RAISE_BETWEEN_PROBINGS 10 years ago
Scott Lahteine 9a5a7a3f68 Raise when not retracting
Code to raise the probe before retraction is good, but the code should
always raise the probe, not just when retracting
10 years ago
Scott Lahteine 2a45922afe Restore extruder_offset, init more simply 10 years ago
Scott Lahteine 28792e5731 Fix typo in assignment 10 years ago
Scott Lahteine bb6174524f Fix EXTRUDER_OFFSET compiler error
- Addressing issue #1741
10 years ago
Chris Roadfeldt 45ece5afb1 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 10 years ago
Chris Roadfeldt 17707e7479 Fixed Z_PROBE_PIN pullup bug.
Documented some additional areas that should be addressed if Z_PROBE is
fully separated from Z_MIN or Z_MAX.
Fixed a documentation error in sanity checks. Servos start at 0 not 1.
10 years ago
Scott Lahteine 50145266cd Merge pull request #1748 from thinkyhead/raise_before_homing
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
Scott Lahteine a117b6bff6 Merge pull request #1747 from thinkyhead/progress_bar_tweak
Fix up LCD_PROGRESS_BAR
10 years ago
Chris Roadfeldt faac2af4af Merge remote-tracking branch 'origin/Development' into Development 10 years ago
Chris Roadfeldt 3be00cce6f Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Configuration.h
10 years ago
Chris Roadfeldt e08f8eed05 Revert 06f767d..cba5692
This rolls back to commit 06f767d608.
10 years ago
Chris Roadfeldt 992b07ca57 Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled. 10 years ago
Chris Roadfeldt cba5692673 Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
10 years ago
Scott Lahteine 8500c80b33 Apply Z_RAISE_BEFORE_HOMING before homing XY 10 years ago
Scott Lahteine 5519882eea Fix up LCD_PROGRESS_BAR
- Some messages should not expire with `PROGRESS_MSG_EXPIRE`.
- Simplify conditional for progress bar with sanity checks.
- Rename `messageTick` to `expireStatusMillis` and make it the expire
time.
10 years ago
Scott Lahteine 8c136a5ab5 Conditionals and comments for PS = 0 10 years ago
Scott Lahteine 2faed961ce Allow POWER_SUPPLY 0 for no power switch 10 years ago
Scott Lahteine baa6787393 Merge pull request #1740 from thinkyhead/fixup_homing
Apply leveling for DELTA
10 years ago
AnHardt 50a732360a Replace extrudemultiply by extruder_multiply[active_extruder]
Fix for #1460.

Seems to work with only one extruder. Can't test this myself with more.
10 years ago
Scott Lahteine 41d258697a Pass the z for after probing to retract_z_probe
A `z_before` value is passed to probe_pt, but the `retract_z_probe`
function assumes that Z is 0, doesn’t add `current_position[Z_AXIS]` as
other cases do. This may be superfluous, so this is a test, and will be
reverted if it has no effect.
10 years ago
croadfeldt 06f767d608 Merge remote-tracking branch 'upstream/development' into development 10 years ago
Scott Lahteine e96db1cd6c Make G29 shared function inline 10 years ago
Scott Lahteine d73b169de3 Apply leveling for DELTA,
- Fix `prepare_move` function not calling `adjust_delta`
- Add more shorthand for plan_buffer_line.
- Fix wrong `federate` usage, assuming they are all mm/m
- Minor `stepper.cpp` cleanup
10 years ago
Scott Lahteine ce44bee28b Small code reduction 10 years ago
Scott Lahteine 0213f7f016 Cleanup case for M666 10 years ago
Scott Lahteine 803425e12c Fix G29 E and M48 n
- Users prefer `G29 E` to work like `M48 E` so fixed that
- `M48 n` replaced with `M48 P` (or `p`). `n` legacy support
- Shorten some strings to save precious bytes
- Smaller code for 3-point probing
10 years ago
Scott Lahteine e8ae51bfe3 Fix G28 homing Y with X
- Fixed a typo causing G28 to home incorrectly
- Added documentation to G28
- Added homeXYZ bools to neaten the code
- Added a note about home_offsets being questionable
10 years ago
Chris Roadfeldt 62834a1c43 Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,
unless Z_SAFE_HOMING is.
10 years ago
Chris Roadfeldt 08a7aa16c5 Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined. 10 years ago
Chris Roadfeldt 324c14943b Bug fixes for Z_PROBE_AND_ENDSTOP.
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
10 years ago
Scott Lahteine afff968e88 ARRAY_BY_EXTRUDERS, shorthand to sync planner
- Add some documentation to planner and stepper headers
- Patch up RAMBO pins with undefs
- Add `sync_plan_position` inline to set current XYZE
- Swap indices in `extruder_offset` to fix initialization values
10 years ago
Scott Lahteine 2b0c25a091 Tweak G92 to call plan_set_position only once, yes? 10 years ago
Chris Roadfeldt 8b81f20c61 Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to
be.
Added Sanity Check for it.
Added hook so it's enabled.
10 years ago
Chris Roadfeldt fd823449ad Added serial message for Z Probe trigger. 10 years ago
Scott Lahteine b14be7235e Merge pull request #1585 from galexander1/strtod_e_fix
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
10 years ago
Scott Lahteine ba871e46bf Fix compiler warnings
- Patched up for most included configurations
10 years ago
Scott Lahteine ffe0df4b36 Latest upstream commits 10 years ago
Scott Lahteine 578f93bc26 Fixup temp arrays and leveling equation, prepare for merge 10 years ago
Scott Lahteine 460f73056b Fix ECHOPAIR ambiguity
- Also patch up some warnings
10 years ago
Scott Lahteine 19d418cd6a Fix up the code to eliminate warnings 10 years ago
Scott Lahteine 267d6bef15 Eliminate most warnings
- Fix a bug reading `code_value` for `M503 Sn`
- Hide and remove unused variables
10 years ago
Scott Lahteine b76a352d41 Fix the planeNormal calculation 10 years ago
Scott Lahteine 0b32431551 Remove abs() from planeNormal.z 10 years ago
Scott Lahteine 06eb7f5b3c Latest upstream commits 10 years ago
Scott Lahteine 04328d7537 Add zprobe_zoffset in set_bed_level_equation_*
- Also a small tweak to SanityCheck.h
10 years ago
AnHardt ebe5b87c2c < like in the oher compareble loops
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
10 years ago
Scott Lahteine fbf9b21e0c Merge plus fixup zprobe_zoffset
- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`
10 years ago
Scott Lahteine 96b5da7198 Fix up bed leveling code
- Init `zprobe_zoffset`
- Remove `current_position[Z_AXIS] = zprobe_zoffset` lines from the
`set_bed_level_equation_*` functions
- Apply standards to `mesh_bed_leveling` files
- Document `MESH_BED_LEVELING`
10 years ago
Victor Torre d43d47da14 Clean "fromsd" array is not SDSUPPORT
if not have SDSUPPORT the fromsd array is not necessary
10 years ago
alexborro 55025558dc Implement Dry-Run mode in G29
It just probe all the bed without appliying the matrix.
Useful after a first G29 to check the topology.
10 years ago
alexborro c2ba5d0c09 Fix ZigZag and Topograph table
ZigZag: Inverted Behavior.. If T supplied, it does not zigzag.
Topograph table: The table was rotated 90º clockwise.
10 years ago
alexborro 0ce3576685 New Feature: Z_DUAL_ENDSTOPS
Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z
steppers - Let's call them Z stepper and Z2 stepper.
That way the machine is capable to align the bed during home, since both
Z steppers are homed.
There is also an implementation of M666 (software endstops adjustment)
to this feature.
After Z homing, this adjustment is applied to just one of the steppers
in order to align the bed.
One just need to home the Z axis and measure the distance difference
between both Z axis and apply the math: Z adjust = Z - Z2.
If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it
is.. think about it) and the Z adjust would be positive.
Play a little bit with small adjustments (0.5mm) and check the
behaviour.
The M119 (endstops report) will start reporting the Z2 Endstop as well.
10 years ago
Scott Lahteine 0d81abe1c9 Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
Scott Lahteine b26a3ea02c Merge pull request #1662 from josla972/refactor_scara
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
Scott Lahteine 4fbb80567e Get upstream commits 10 years ago
Scott Lahteine 146501215f Fix mangled probe_pt calls
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
10 years ago
maverikou 15345cc249 Corrected Z_PROBE_ALLEN_KEY behaviour. 10 years ago
maverikou 0f034dd97e Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED. 10 years ago
maverikou 6c96f32069 Blind fix for #1507 10 years ago
Josef Larsson 379348487e Removed malplaced comment. 10 years ago
Josef Larsson 9b3462f73f Refactor SCARA calibration. Save some lines of code and possibly ROM. 10 years ago
Scott Lahteine 691e753cc3 Don't add home offsets in G29
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
10 years ago
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
Edward Patel 3d0a060a7a Added G29 command 10 years ago
Scott Lahteine 63d5d28085 Merge branch 'Development' into config_testing
Latest upstream changes
10 years ago
Edward Patel 4619d80524 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Scott Lahteine 2424713a8f Merge pull request #1640 from AnHardt/warning6
codepos not used in gcode_M28()
10 years ago
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
10 years ago
Edward Patel a61f679568 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Edward Patel c87faa69ed Shortened mesh_plan_buffer_line() 10 years ago
AnHardt ae01a6b5f2 Make use of codepos.
Saves one addition.
Needs one pointer on the stack.

Don't know if this is a go trade.
10 years ago
Scott Lahteine 80e0ee10ca Merge pull request #1631 from AnHardt/iss1593
Decrease KILL_DELAY
10 years ago
Scott Lahteine 76127b8a55 Merge pull request #1630 from Wurstnase/fix_g29
optional parameters must be named when ignoring order
10 years ago
Scott Lahteine 8664c6d465 Merge pull request #1638 from AnHardt/warning4
delta[3] not used when DELTA not defined.
10 years ago
Scott Lahteine 10711ccc6a Merge pull request #1639 from AnHardt/warning5
G4 could wait for an undefined time
10 years ago
Edward Patel 240b5cfe04 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
alexborro 4521f6655b Restore "S" parameter of M204 for retrocompatibility. 10 years ago
alexborro 5ddb8d94e2 Update Documentation related to M204 10 years ago
AnHardt f8c4d43886 delta[3] is used with SCARA
Shoot in the dark.
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
AnHardt d1658eebfc Decrease KILL_DELAY
Users hat to press kill-button for unexpexted lon times.
See #1593
10 years ago
Wurstnase 00adb2a6c1 optional parameters must be named when ignoring order 10 years ago
Edward Patel 0d43898a22 Remove of mesh_plan_buffer_line parameter reference (e) 10 years ago
Edward Patel 8067a985ce Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
Fixed conflicts:
	Marlin/planner.h
10 years ago
maverikou 3570447ded Fix Z_RAISE_AFTER_PROBING 10 years ago
maverikou 8a739b6fba Merge branch 'Development' into delta_auto_bed_level
Conflicts:
	Marlin/Marlin_main.cpp
10 years ago
Scott Lahteine a686c9878f Move TOPO_ORIGIN define to Configuration.h
- Addressing issue #1608
10 years ago
Edward Patel 8005d22c81 Added menu option for bed leveling. 10 years ago
Edward Patel 0e51e53813 WIP. Adding bed leveling code. 10 years ago
Scott Lahteine 7bc77dc134 Merge pull request #1583 from galexander1/m404fix
M404 should not use 'N' address as parameter because 'N' is reserved
10 years ago
Scott Lahteine b80ed51fcc Fix controllerFan() code
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
10 years ago
Scott Lahteine bb4cb1b15a Merge pull request #1606 from thinkyhead/cleanup_stepper
Cleanup of stepper.cpp
10 years ago
alexborro d3259d0dba Merge pull request #1581 from msutas/Development
Filament Runout Sensor Feature
10 years ago
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
10 years ago
alexborro 2f3c77b751 Fix decimal places in G29 Bed Equation Coeficients 10 years ago
Scott Lahteine e4d77a6313 Merge pull request #1554 from 2PrintBeta/Development
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
10 years ago
Mehmet Sutas b373826428 Merge pull request #2 from MarlinFirmware/Development
update
10 years ago
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.
10 years ago
alexborro 888cf161bd fix travel speed option for G29
I forgot to enclousure the variable with #ifdef
10 years ago
alexborro af63b54562 Add travel speed option to G29 command line 10 years ago
alexborro 60ceca1bc1 Add speed configuration for home-bumping movement 10 years ago
domonoky d813090d90 Merge remote-tracking branch 'remotes/upstream/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
10 years ago
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()
10 years ago
maverikou 53abc5e2f1 Merge branch 'Development' into delta_auto_bed_level 10 years ago
Mehmet Sutas 956fb2d278 Merge pull request #1 from MarlinFirmware/Development
update
10 years ago
Scott Lahteine 624f23f550 Merge pull request #1575 from Wurstnase/fix-controllerFan
Fix controller fan
10 years ago
maverikou 424c747fb3 Enable M401 and M402 for deltas with allen key z-probes. 10 years ago
maverikou 0d593ab7c1 Fix debug message 10 years ago
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.
10 years ago
Greg Alexander ed7874b4e0 M404 should not use 'N' address as parameter because 'N' is reserved for the line number 10 years ago
Greg Alexander b9dfa5cad4 use code_value_long() instead of (int)code_value() 10 years ago
Greg Alexander 901b03d020 use strtol() instead of strtod() when an integer value is desired 10 years ago
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.
10 years ago
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.
10 years ago
Wurstnase a5342c942e Update Marlin_main.cpp 10 years ago
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
10 years ago
Scott Lahteine 254970c92a Merge pull request #1570 from C-o-r-E/escape_fix
Fixes gCode handling of comments and escaped characters
10 years ago
Scott Lahteine 25dc79f124 Remove M48 credits also 10 years ago
Scott Lahteine 34e51f576f Fix compile error in gcode_G29
- A redo of #1576, which missed topo_flag
- Always set verbose_level
10 years ago
Wurstnase 62bd734612 fix controllerFan() for inverted enable pins
add ```^ !(n_ENABLE_ON)``` for each stepper
10 years ago
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 ")"
10 years ago
C-o-r-E 99fb1bc3e8 Attempt to resolve #1568 and add basic escape character support 10 years ago
Scott Lahteine cdc38aa783 Move gcode handlers into inline functions 10 years ago
Scott Lahteine 6d9e9a6bef Merge branch 'Development' into enhanced_g29
Latest upstream changes
10 years ago