SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2824 commits 1 branch 0 tags 118 MiB
Commit graph

2281 commits

Author SHA1 Message Date
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
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
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