2380 Commits (e7aae314deeb25bbf17e9864403c1924512270ea)

Author SHA1 Message Date
Scott Lahteine 443468df8d Merge pull request #1771 from AnHardt/iss1770
Added new - changed entries from Fix up LCD_PROGRESS_BAR
10 years ago
Scott Lahteine 9593f09b99 Merge pull request #1764 from thinkyhead/probe_leveling
Fix homing and leveling
10 years ago
Scott Lahteine 72c7de3570 Cleanup M48 10 years ago
Scott Lahteine 97a258b0b0 Clean up, document home_axis 10 years ago
AnHardt 831016b09f Added new - changed entries from Fix up LCD_PROGRESS_BAR
for when no LCD is defined.
Fix for #1770.
10 years ago
Chris Roadfeldt a508d835db Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP.
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
10 years ago
Chris Roadfeldt fdb4ddbdea Merge remote-tracking branch 'MarlinFirmware/Development' into Development 10 years ago
atfield90 d273c90d53 Added support for Atmega 1281 chip 10 years ago
Scott Lahteine 1c7391717e Include sync_plan_position_delta for SCARA also 10 years ago
Scott Lahteine 8231fb166d Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
10 years ago
Scott Lahteine 0b57a2ab8b Merge pull request #1757 from bq/Translation-strings
Added new trasnslatable labels.
10 years ago
Scott Lahteine 18bb6be80e Fix homing and leveling
- Include the current Z when raising the axis after and between probing
- Add `sync_plan_position_delta` for parity with `sync_plan_position`
- Clean up and clarify `M48`, `dock_sled`, and others
10 years ago
AnHardt 3f2e863206 Improve conditions for HAS_TEMP
and use them in temperuture.h

Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.
10 years ago
AnHardt 85f8a26ba4 Fix MIN&MAX temperatures again
replaced GE0 with th matching GEX in the second row.
added some ()
10 years ago
AnHardt 19b11dfdd7 Fix can't enter MENU_MULTIPLIER_ITEM 10 years ago
Chris Roadfeldt c89b8368ee Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
10 years ago
Ivan Galvez Junquera d08782386b Added new trasnslatable labels.
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
  EN, FR, DE, ES, IT, PT, PT-BR.
10 years ago
Scott Lahteine 97a69d9b1c Correct XYZ after obtaining plan_bed_level_matrix
The current position needs to be updated by using the inverse
`plan_bed_level_matrix` on X, Y, and Z. All moves in the planner are
transformed by the `plan_bed_level_matrix` from this point forward.
10 years ago
Scott Lahteine 5f6962dd90 Merge pull request #1755 from thinkyhead/fixup_config
Raise when not retracting
10 years ago
Scott Lahteine ae89ccd2c7 Use Z_RAISE_BETWEEN_PROBINGS 10 years ago
Scott Lahteine 9a5a7a3f68 Raise when not retracting
Code to raise the probe before retraction is good, but the code should
always raise the probe, not just when retracting
10 years ago
Scott Lahteine 6ff1620fcb Merge pull request #1753 from thinkyhead/fix_extruder_offset
Fix EXTRUDER_OFFSET compiler error
10 years ago
Scott Lahteine cda4bd4ad9 Correct the comment about M206 10 years ago
Scott Lahteine 935592cf6a offsets off by default 10 years ago
Scott Lahteine 2a45922afe Restore extruder_offset, init more simply 10 years ago
Scott Lahteine 28792e5731 Fix typo in assignment 10 years ago
Scott Lahteine bb6174524f Fix EXTRUDER_OFFSET compiler error
- Addressing issue #1741
10 years ago
Scott Lahteine 571652c49b Fix LCD click
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
10 years ago
Chris Roadfeldt 45ece5afb1 Merge remote-tracking branch 'MarlinFirmware/Development' into Development 10 years ago
Chris Roadfeldt 17707e7479 Fixed Z_PROBE_PIN pullup bug.
Documented some additional areas that should be addressed if Z_PROBE is
fully separated from Z_MIN or Z_MAX.
Fixed a documentation error in sanity checks. Servos start at 0 not 1.
10 years ago
Scott Lahteine 21ab44cfa7 Merge pull request #1750 from thinkyhead/fixup_config
Bring all configs up to date
10 years ago
Scott Lahteine 50145266cd Merge pull request #1748 from thinkyhead/raise_before_homing
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
Scott Lahteine a117b6bff6 Merge pull request #1747 from thinkyhead/progress_bar_tweak
Fix up LCD_PROGRESS_BAR
10 years ago
Scott Lahteine 3348b3bf0c Allow SD_FINISHED_RELEASECOMMAND to be undefined 10 years ago
Scott Lahteine 82794fa5f7 Add delta generic not renaming 10 years ago
Scott Lahteine ba2c7cb467 Update configs with all the latest 10 years ago
Chris Roadfeldt ec1d9c0b8f Use Z_PROBE_ENDSTOP_INVERTING when checking pin status. 10 years ago
Chris Roadfeldt 3175c70c79 Manually synching back up with MarlinFirmware/Development. 10 years ago
Chris Roadfeldt faac2af4af Merge remote-tracking branch 'origin/Development' into Development 10 years ago
Chris Roadfeldt 3be00cce6f Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Configuration.h
10 years ago
Chris Roadfeldt e08f8eed05 Revert 06f767d..cba5692
This rolls back to commit 06f767d608.
10 years ago
Scott Lahteine 5e82ed4f30 Restore ENDSTOPPULLUPS in Configuration.h 10 years ago
Chris Roadfeldt 992b07ca57 Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled. 10 years ago
Chris Roadfeldt cba5692673 Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp
10 years ago
Scott Lahteine 8500c80b33 Apply Z_RAISE_BEFORE_HOMING before homing XY 10 years ago
Scott Lahteine 92b54aa27e #define HAS_POWER_SWITCH 10 years ago
Scott Lahteine 5519882eea Fix up LCD_PROGRESS_BAR
- Some messages should not expire with `PROGRESS_MSG_EXPIRE`.
- Simplify conditional for progress bar with sanity checks.
- Rename `messageTick` to `expireStatusMillis` and make it the expire
time.
10 years ago
Scott Lahteine 6864280803 Use elif and parentheses in conditionals 10 years ago
Scott Lahteine 8c136a5ab5 Conditionals and comments for PS = 0 10 years ago
Scott Lahteine 2faed961ce Allow POWER_SUPPLY 0 for no power switch 10 years ago
Scott Lahteine baa6787393 Merge pull request #1740 from thinkyhead/fixup_homing
Apply leveling for DELTA
10 years ago
AnHardt 9ac7dc675e Make filament display on dogm_... same as hitachi...
Thanks @MagoKimbra.
10 years ago
AnHardt 50a732360a Replace extrudemultiply by extruder_multiply[active_extruder]
Fix for #1460.

Seems to work with only one extruder. Can't test this myself with more.
10 years ago
Scott Lahteine e63076504d Merge pull request #1733 from AnHardt/c20
Get back folder symbols on Hitachi displays
10 years ago
Scott Lahteine 41d258697a Pass the z for after probing to retract_z_probe
A `z_before` value is passed to probe_pt, but the `retract_z_probe`
function assumes that Z is 0, doesn’t add `current_position[Z_AXIS]` as
other cases do. This may be superfluous, so this is a test, and will be
reverted if it has no effect.
10 years ago
croadfeldt 06f767d608 Merge remote-tracking branch 'upstream/development' into development 10 years ago
Scott Lahteine b47fa8c064 Merge pull request #1735 from AnHardt/compilerCandy
Remove some further warnings
10 years ago
Scott Lahteine e96db1cd6c Make G29 shared function inline 10 years ago
Scott Lahteine d73b169de3 Apply leveling for DELTA,
- Fix `prepare_move` function not calling `adjust_delta`
- Add more shorthand for plan_buffer_line.
- Fix wrong `federate` usage, assuming they are all mm/m
- Minor `stepper.cpp` cleanup
10 years ago
Scott Lahteine 85b67e5223 Merge pull request #1738 from thinkyhead/fixup_homing
Fix G29 E and M48 n
10 years ago
Scott Lahteine ce44bee28b Small code reduction 10 years ago
Scott Lahteine 0213f7f016 Cleanup case for M666 10 years ago
Scott Lahteine 803425e12c Fix G29 E and M48 n
- Users prefer `G29 E` to work like `M48 E` so fixed that
- `M48 n` replaced with `M48 P` (or `p`). `n` legacy support
- Shorten some strings to save precious bytes
- Smaller code for 3-point probing
10 years ago
Scott Lahteine 1e9999711c Merge pull request #1736 from thinkyhead/fixup_homing
Fix G28 homing Y with X
10 years ago
Scott Lahteine d738b7acdd Merge pull request #1724 from Natealus/Development
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
10 years ago
Scott Lahteine e8ae51bfe3 Fix G28 homing Y with X
- Fixed a typo causing G28 to home incorrectly
- Added documentation to G28
- Added homeXYZ bools to neaten the code
- Added a note about home_offsets being questionable
10 years ago
AnHardt 7b2550a604 Times can't be negative.
cardreader.cpp needs temperature.h for autotempShutdown() when
AUTOTEMP is defined but warns about unused variables.
Unpublished variables by putting them in to temperature.cpp.
10 years ago
AnHardt 507efa771b Remove unused variable fan_rot
and satisfy the compiler about the implicit compare.
10 years ago
AnHardt 2b959a7752 Some additional {} to make the compiler happy. 10 years ago
AnHardt 0f1bd6e4a7 In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned
therefor in macro ST7920_WRITE_BYTE(a) cast a to uint8_t
to make the compiler happy.
10 years ago
AnHardt 81bab8739d Get back folder symbols on Hitachi displays
and make use of column 20.
10 years ago
Chris Roadfeldt a9802c95b3 Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is. 10 years ago
Chris Roadfeldt 62834a1c43 Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,
unless Z_SAFE_HOMING is.
10 years ago
Chris Roadfeldt 666fad3494 Typo fixed in sanity check. 10 years ago
Chris Roadfeldt 08a7aa16c5 Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined. 10 years ago
Chris Roadfeldt 80285251cc More config cleanup work for Z_PROBE_AND_ENDSTOP. 10 years ago
Chris Roadfeldt fe4549cd83 Config file Z_PROBE_AND_ENDSTOP description clean up. 10 years ago
Chris Roadfeldt 82d2f11129 More additional sanity checks for Z_PROBE_AND_ENDSTOP 10 years ago
Chris Roadfeldt 05134f0807 Additional Sanity Checks for Z_PROBE_AND_ENDSTOP 10 years ago
Chris Roadfeldt c75a5e8c55 Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h.
Confirmed Sanity checks are working.....
10 years ago
Chris Roadfeldt a98ac4033b Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support. 10 years ago
Chris Roadfeldt 6125124d6c Config file cleanup for Z_PROBE_AND_ENDSTOP support. 10 years ago
Chris Roadfeldt 324c14943b Bug fixes for Z_PROBE_AND_ENDSTOP.
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
10 years ago
Natealus ca5821aa57 Made #ifdef DELTA branch instead
Another fellow here gave me the idea to do it this way
10 years ago
Natealus 04fda6b3e9 Undesired behavior with endstops swapped
Made my swap commented out so its the option not the default.
10 years ago
Natealus ca1477d830 Revert "Undesired behavior with endstops swapped"
This reverts commit 15028e9b08.
10 years ago
Natealus 15028e9b08 Undesired behavior with endstops swapped
I made my changes to swap MIN and MAX endstops on the Azteeg X3 Pro the
option rather than the default to fix unexpected reversal.
10 years ago
Nate Stokes 18245c6cd2 Update pins_RAMBO.h
Updated for the changes that Thinkyhead made before I submitted mine.
10 years ago
Natealus 234a9d0b12 Viki 2 Pins from Manual
I added in the pins into the new board files for the Azteeg X3, X3 Pro,
Printrboard, and Rambo. I'm sure it can be added for others too but
these are the manual specified pins. Just like many things here though,
I can't test for the boards other than the Azteeg X3 Pro. Hopefully it
works smoothly for everyone who happens on this nifty display. :)
10 years ago
Scott Lahteine a22efc5f11 Merge pull request #1597 from Wurstnase/g29_auto_script
G29 auto script
10 years ago
Scott Lahteine 62a3da9618 Merge pull request #1723 from thinkyhead/tweak_g92
Tweak G92
10 years ago
Scott Lahteine afff968e88 ARRAY_BY_EXTRUDERS, shorthand to sync planner
- Add some documentation to planner and stepper headers
- Patch up RAMBO pins with undefs
- Add `sync_plan_position` inline to set current XYZE
- Swap indices in `extruder_offset` to fix initialization values
10 years ago
Scott Lahteine 2b0c25a091 Tweak G92 to call plan_set_position only once, yes? 10 years ago
Natealus 22bea37393 Azteeg X3 Pro Pin Revisions
I added the fan pins in here and left them at -1 in configuration_adv.h
and it works fine. Pinned for a 4 extruder from 1-4 and HE5 being the
controller fan, HE6 being the Extruder Auto Fan/Water pump in the Kraken
case, and HE7 being for part cooling fan. Added in descriptions for the
MIN MAX pin swap and for servo motor additions.
10 years ago
Scott Lahteine 93dc0d0518 Merge pull request #1718 from AnHardt/blink
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
10 years ago
Scott Lahteine edb67ea165 Patch generic delta config
- Addressing issue mentioned at #1699
10 years ago
AnHardt c481c3b180 Move variable blink from ultralcd.h to dogm_lcd_implementation.h
to avoid warnings about unused blink.

Concentrate definitions of variables in dogm_lcd_implementation.h to one place.

Make only local used variable currentfont static.
10 years ago
Chris Roadfeldt 059052889f Further Sanity Checks for Z_PROBE_AND_ENDSTOP. 10 years ago
Chris Roadfeldt 8b81f20c61 Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to
be.
Added Sanity Check for it.
Added hook so it's enabled.
10 years ago
Chris Roadfeldt fd823449ad Added serial message for Z Probe trigger. 10 years ago
Chris Roadfeldt 92eb8109ab Fix declaration of old_z_probe_endstop. 10 years ago
Chris Roadfeldt 44b88b41a2 Added credit for code. 10 years ago
Chris Roadfeldt 2979b40a7a Fixed typo in Z Probe and Endstop section. 10 years ago
Chris Roadfeldt 9f3ff14008 Enabled separate Z Probe and Z Axis endstop use at same time.
Typo fixes in comments in existing code.
10 years ago
Scott Lahteine b14be7235e Merge pull request #1585 from galexander1/strtod_e_fix
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
10 years ago
Scott Lahteine ba871e46bf Fix compiler warnings
- Patched up for most included configurations
10 years ago
Scott Lahteine ffe0df4b36 Latest upstream commits 10 years ago
Scott Lahteine bc2f249cc6 Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
The big Language Pack
10 years ago
Scott Lahteine abfcbd793f Merge pull request #1693 from chris-bo/rework_lcd_beeper
use only one implementation for beeper feedback
10 years ago
Scott Lahteine 55739a4efe Fix Z_APPLY_STEP 10 years ago
Scott Lahteine df02b992b0 Fix redundant_temperatrure_raw setting 10 years ago
Scott Lahteine fe29bdd72b Also fix temperature externs 10 years ago
Scott Lahteine 578f93bc26 Fixup temp arrays and leveling equation, prepare for merge 10 years ago
Scott Lahteine 7d472367e2 Merge pull request #1713 from epatel/Development
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
10 years ago
Scott Lahteine ce485175eb Give all temp arrays 4 indices 10 years ago
Edward Patel 782464ea4d Parentheses need here otherwise sanitycheck.h does wrong thing on line 222 10 years ago
Scott Lahteine 460f73056b Fix ECHOPAIR ambiguity
- Also patch up some warnings
10 years ago
Scott Lahteine 19d418cd6a Fix up the code to eliminate warnings 10 years ago
Scott Lahteine b2496533c6 Put " M" into pmem 10 years ago
Scott Lahteine 267d6bef15 Eliminate most warnings
- Fix a bug reading `code_value` for `M503 Sn`
- Hide and remove unused variables
10 years ago
Scott Lahteine 3fd7790a15 Merge branch 'Development' into fixup_leveling
Latest upstream commits
10 years ago
Scott Lahteine b76a352d41 Fix the planeNormal calculation 10 years ago
Scott Lahteine 410f64782a Always 4 temp sensors 10 years ago
Scott Lahteine 0b32431551 Remove abs() from planeNormal.z 10 years ago
Scott Lahteine 53169d96e8 Set temp_meas_ready in set_current_temp_raw 10 years ago
Scott Lahteine 06eb7f5b3c Latest upstream commits 10 years ago
Scott Lahteine 04328d7537 Add zprobe_zoffset in set_bed_level_equation_*
- Also a small tweak to SanityCheck.h
10 years ago
Scott Lahteine d2e73545ba Merge pull request #1705 from AnHardt/ddt
Avoid warnings in SanitiCheck.h
10 years ago
Scott Lahteine 78090275a9 Fix probe range editing
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
10 years ago
AnHardt 1ff6df8f9e Avoid warnings in SanitiCheck.h
/SanityCheck.h:107:53: warning: missing terminating ' character
...
10 years ago
AnHardt ebe5b87c2c < like in the oher compareble loops
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
10 years ago
AnHardt 20f909567a Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
Conflicts:
	README.md
Solved
10 years ago
Christian Bohn eab5fad539 code formatting 10 years ago
Scott Lahteine abadeac08d Group zprobe_zoffset with bed leveling 10 years ago
Scott Lahteine 9e8427f253 Merge pull request #1698 from zeuseye/Development
Clean "fromsd" array if not SDSUPPORT
10 years ago
Scott Lahteine 32331faee4 Prettify Bed Level Correction Matrix
- Put + in front of positive values in the output
10 years ago
Scott Lahteine f5f4c2b366 Merge branch 'Development' into fixup_leveling
Latest upstream commits
10 years ago
Scott Lahteine 7667023817 Merge pull request #1694 from Wurstnase/fix_z_config
comment #define Z_DUAL_STEPPER_DRIVERS
10 years ago
Scott Lahteine 5eff15c409 Merge branch 'Development' into fixup_leveling
Latest upstream commits
10 years ago
Scott Lahteine ad05a726c1 Merge pull request #1691 from AnHardt/PID_dt
Move definition of PIDdT back to temperature.h
10 years ago
Scott Lahteine 5261d35737 Fix custom m-code behavior
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
10 years ago
Scott Lahteine fbf9b21e0c Merge plus fixup zprobe_zoffset
- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`
10 years ago
Scott Lahteine 96b5da7198 Fix up bed leveling code
- Init `zprobe_zoffset`
- Remove `current_position[Z_AXIS] = zprobe_zoffset` lines from the
`set_bed_level_equation_*` functions
- Apply standards to `mesh_bed_leveling` files
- Document `MESH_BED_LEVELING`
10 years ago
Scott Lahteine 02b4f5f9cd Merge pull request #1689 from AnHardt/MAXand161
Fix MAX6675 again and introduce set_current_temp_raw()
10 years ago
AnHardt f680e509c4 Enclosed error-messages for TEMP_SENSOR_1_AS_REDUNDANT in PSTR() 10 years ago
Victor Torre d43d47da14 Clean "fromsd" array is not SDSUPPORT
if not have SDSUPPORT the fromsd array is not necessary
10 years ago
AnHardt ac81b4084f Make variables and function static. 10 years ago
alexborro 55025558dc Implement Dry-Run mode in G29
It just probe all the bed without appliying the matrix.
Useful after a first G29 to check the topology.
10 years ago
wurstnase a4ad9117dd comment #define Z_DUAL_STEPPER_DRIVERS 10 years ago
chris-bo 2dfd0e5ce7 Update Configuration.h
documentation how to disable buzzer feedback
10 years ago
Christian Bohn 4c3cbc0961 use only one implementation for beeper feedback 10 years ago
AnHardt 01cc97a3c3 Corected condition for PIDdT 10 years ago
AnHardt 94330705c7 Move definition of PIDdT back to temperature.h
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
10 years ago
AnHardt dd0067afa6 Fix MAX6675 again and introduce set_current_temp_raw()
to make the temperature-code work again with Arduino 1.0.6.

Sorry could not make an extra block on base level.
10 years ago
AnHardt 8848b7e9ef Add the missed {} to END_MENU in ultralcd.cpp
what caused an extra update of encoderLine most of the time.
10 years ago
AnHardt 4beffbca69 Make SMALL_INFOFONT configurable.
Tweak the documentation
10 years ago
alexborro c2ba5d0c09 Fix ZigZag and Topograph table
ZigZag: Inverted Behavior.. If T supplied, it does not zigzag.
Topograph table: The table was rotated 90º clockwise.
10 years ago
alexborro 0ce3576685 New Feature: Z_DUAL_ENDSTOPS
Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z
steppers - Let's call them Z stepper and Z2 stepper.
That way the machine is capable to align the bed during home, since both
Z steppers are homed.
There is also an implementation of M666 (software endstops adjustment)
to this feature.
After Z homing, this adjustment is applied to just one of the steppers
in order to align the bed.
One just need to home the Z axis and measure the distance difference
between both Z axis and apply the math: Z adjust = Z - Z2.
If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it
is.. think about it) and the Z adjust would be positive.
Play a little bit with small adjustments (0.5mm) and check the
behaviour.
The M119 (endstops report) will start reporting the Z2 Endstop as well.
10 years ago
AnHardt c686069ccd Revert "Remove 6x9 font"
This reverts commit e6cb8ee188.

Conflicts:
	Marlin/dogm_lcd_implementation.h
Confilkt solved
Needs rework.
10 years ago
AnHardt b00a531df8 Revert "Removed now unneded FONT_STATUSMENU"
This reverts commit 8c5bb38748.
10 years ago
AnHardt 9d589cbb2a Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji
Conflicts:
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/language.h

Conflicts solved
10 years ago
Scott Lahteine 8db4fd7177 Merge branch 'Development' into planner_oh_planner
Latest upstream commits
10 years ago
Scott Lahteine 0d81abe1c9 Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
Scott Lahteine 01740fd9c6 Merge branch 'Development' into planner_oh_planner
Latest upstream commits
10 years ago
Scott Lahteine fc53e43de6 Don't test raw temp for MAX6675
- Remove test of raw temp for thermistor 0 when using MAX6675
- Longer `raw_temp_value` array for `TEMP_SENSOR_1_AS_REDUNDANT`
10 years ago
Scott Lahteine 03fa9fae9f Merge branch 'Development' into fix_temperature_minmax
Latest upstream commits
10 years ago
Scott Lahteine 1fac388664 Revert measurement loop 10 years ago
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.
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
wurstnase e6f6c6e3a1 fix bad insertion config again 10 years ago
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
10 years ago
Scott Lahteine 34a41648ab Merge branch 'Development' into planner_oh_planner
Latest upstream commits
10 years ago
Scott Lahteine 4fbb80567e Get upstream commits 10 years ago
Scott Lahteine 7717e1ce33 Fix bad insert in configuration 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
Scott Lahteine 8bd6e37b21 Merge pull request #1661 from thinkyhead/G92_no_offset
Don't add home offsets in G29
10 years ago
Scott Lahteine 582cd780cd Fix compile error with `*_DUAL_STEPPER_DRIVERS`
- Patch up macros in stepper.cpp
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 88e81a4804 Latest upstream commits, plus fixes
- Also add Manual Bed Leveling to the rest of the configs
10 years ago
Scott Lahteine 15eb5d35a2 Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
Scott Lahteine 19df90622b Include Conditionals.h file in update 10 years ago
Scott Lahteine 9b639b4135 Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level
Manual bed leveling + mesh bed leveling
10 years ago
Scott Lahteine 2c9bd15625 Move LCD items to `Conditionals.h`
- `Conditionals.h` is included twice, setting LCD values the first time
10 years ago
Scott Lahteine 63abeaff38 Merge branch 'Development' into config_testing
Latest upstream commits
10 years ago
Scott Lahteine 3703694e30 Fix temperature min/max test
- Base tests on all thermistors/thermocouples, not just heater 0
10 years ago
Edward Patel 3d0a060a7a Added G29 command 10 years ago
Edward Patel c516747847 Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
Scott Lahteine af14c684b5 Minor optimizations to planner code
- Prefetch values used more than once
10 years ago
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
10 years ago
AnHardt 64e3d33893 Fix shrinked menucode
by updating 'encoderPosition' in END_MENU() line 1.
10 years ago
Edward Patel a7e89d4cfa Merge branch 'Development' into manual-bed-leveling+mesh-bed-level 10 years ago
AnHardt 8c5bb38748 Removed now unneded FONT_STATUSMENU 10 years ago
Scott Lahteine 2176a22d42 Fix count_direction initializer
- Addressing #1625
10 years ago
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
10 years ago
Scott Lahteine cb6942d4a7 Merge branch 'Development' into config_testing
Get upstream commits
10 years ago