melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,687 Commits 2 Branches 0 Tags
Commit Graph

16687 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
c66696c507
Merge pull request #8344 from tcm0116/2.0.x-delta_height 
[2.0.x] Add delta_height variable in lieu of using home_offset
 2017-11-09 01:21:53 -06:00
Scott Lahteine
02e91ffa02
Merge pull request #8343 from thinkyhead/bf2_movement_fixes 
[2.0] Fix PROBE_MANUALLY on kinematic bots
 2017-11-08 23:20:15 -06:00
Scott Lahteine
22e18fe832 Patch _manual_goto_xy for kinematics 2017-11-08 22:21:38 -06:00
Scott Lahteine
0cfb936dd1 Clarify some motion code 2017-11-08 22:15:55 -06:00
Thomas Moore
f34c3597dc Add delta_height variable in lieu of using home_offset 2017-11-08 22:10:08 -06:00
Bob-the-Kuhn
10896b9431
Merge pull request #8341 from Bob-the-Kuhn/u8g-try-4-Arduino-IDE-compatibility 
2.0.x - U8G HAL LCD support - Arduino IDE compatibility
 2017-11-08 21:15:50 -06:00
Bob-the-Kuhn
d47fbf791b Arduini IDE compatibility changes 
changed includes to make Arduino IDE happy
 2017-11-08 20:49:49 -06:00
Scott Lahteine
95ea43bde4 Update XYZ dual stepper configurations 2017-11-08 20:31:43 -06:00
Scott Lahteine
b0b4a20930 Tweaks to core motion code 2017-11-08 20:09:09 -06:00
Scott Lahteine
8805e24cc7
Fix tilt_mesh_based_on_probed_grid output bug 2017-11-08 20:06:20 -06:00
Scott Lahteine
24437fbb13
Fix G26 Y argument bug 2017-11-08 19:20:10 -06:00
Bob-the-Kuhn
5a88e9bc4b
Merge pull request #8338 from Bob-the-Kuhn/u8g-try-4-fix-platformio.ini 
2.0.x - U8G HAL LCD support - platformio.ini correction
 2017-11-08 15:44:26 -06:00
Bob-the-Kuhn
7c274d249b Revert "pins add old names" 
This reverts commit 6f70e5618e4b749829705c4817cb883a2f6735e6.
 2017-11-08 14:12:47 -06:00
Bob-the-Kuhn
c388dce2b5 move U8glib-HAL 2017-11-08 14:08:09 -06:00
Scott Lahteine
09b05c9d79
Merge pull request #8321 from Bob-the-Kuhn/pins_re-arm 
2.0.x - pins_RAMPS_RE_ARM.h - add mega2560 pin numbers
 2017-11-08 13:11:13 -06:00
Scott Lahteine
1e555dfcc2
Merge pull request #8336 from thinkyhead/bf2_fix_get_destination 
[2.0] Fix get_destination_from_command for E
 2017-11-08 13:06:40 -06:00
Scott Lahteine
e6788bb6ae Fix get_destination_from_command for E 2017-11-08 12:54:00 -06:00
Roxy-3D
967104e1ce
Default Extrusion Settings were off a few lines in some of the example config files. (#8333) 2017-11-08 11:56:00 -06:00
Bob-the-Kuhn
8875885a15 pins add old names 
fix typo

re-write PWM section, add "not on Re-ARM" list
 2017-11-08 11:11:38 -06:00
Roxy-3D
1c6e83c137
if !HAS_MESH we still need to do some motion! (#8328) 
* if !HAS_MESH we still need to do some motion!

Thank You MagoKimbra !

* Ooops....   need #else and not #elif
 2017-11-08 09:42:21 -06:00
Scott Lahteine
004fc55eaf
Merge pull request #8317 from thinkyhead/bf2_sprintf_p_fix 
[2.0] Patch G33's use of the term PROBE_MANUALLY
 2017-11-08 00:59:44 -06:00
Scott Lahteine
82f45c3e6a Patch G33 misuse of PROBE_MANUALLY 2017-11-08 00:36:06 -06:00
Bob-the-Kuhn
6f70e5618e pins add old names 2017-11-07 23:37:57 -06:00
Scott Lahteine
064e6fe60e Remove debugging pin toggle from LCD code 2017-11-07 23:00:54 -06:00
Bob-the-Kuhn
29fb48799d
Merge pull request #8262 from Bob-the-Kuhn/u8g-try-4 
2.0.x - U8G HAL LCD support
 2017-11-07 19:57:00 -06:00
Bob-the-Kuhn
0483a7df91 AVR RRD works 
LPC1768 VIKI2 & RRDFG are working

looks like all SPIs are working

library change

sh1106 locks up

fixed lockup, started I2C SW com

pretty

re-org

restore a few files

make library happy

switched HAL version of rrd

fix travis error

travis error fixes

another travis fix

cleanup

minor update

one more

correct spacing in platformio.ini
 2017-11-07 18:40:29 -06:00
Scott Lahteine
a34b5a2bfa
Merge pull request #8314 from thinkyhead/bf2_sprintf_p_fix 
[2.0] Patch abuse of sprintf_P in G33
 2017-11-07 17:50:55 -06:00
Scott Lahteine
96c9d715f3 Patch abuse of sprintf_P in G33 2017-11-07 17:33:50 -06:00
Roxy-3D
ed62c621d7
Fix G26 Circle Drawing. Add Default Extrusion Settings (#8313) 
- Fix G26 Circle Drawing.
- Add default extrusion settings so machine can print lines on print bed
- Yet to be done: Get LCD Menu's to use these settings.
 2017-11-07 17:13:53 -06:00
Scott Lahteine
efa8f20b2f
Merge pull request #8312 from thinkyhead/bf2_thermal_docs 
[2.0.x] Update Thermal Protection Documentation
 2017-11-07 16:32:25 -06:00
Scott Lahteine
8fea26aa9d Fix PID_autotune watch temp increase value 2017-11-07 15:51:48 -06:00
Scott Lahteine
2c099fd4c2 Update Thermal Protection Documentation 2017-11-07 15:46:44 -06:00
Colten Edwards
a6160916b0 [2.0] Fix M48 for delta printers/ABL compile issue (#8286) 
* fix M48 for delta printers

fix M48 for delta printers. home printer if not already homed.

* remove ENABLED(DELTA)

remove ENABLED(DELTA) as it is not needed.

* Update M48.cpp

* abl needs queue.h

without queue.h abl will not compile since there is a script that runs at the end of it and we need to queue it up.
 2017-11-07 15:36:33 -06:00
Scott Lahteine
776cb52629
Merge pull request #8310 from thinkyhead/bf2_fixes_for_117 
[2.0] Fix G92 for native workspace
 2017-11-07 13:23:03 -06:00
Scott Lahteine
17ef0a513b Update G92 for native workspace 2017-11-07 13:07:16 -06:00
Scott Lahteine
b4bf8928aa German language updates 
Corresponding to #8306
 2017-11-07 12:10:29 -06:00
Scott Lahteine
e54881c408
Merge pull request #8304 from tcm0116/2.0.x-delta_eeprom 
[2.0.x] Fix Delta EEPROM
 2017-11-07 12:04:13 -06:00
Thomas Moore
73ca5345e1 Fix Delta EEPROM 2017-11-07 16:48:21 +00:00
Scott Lahteine
714d2b9bbc
Merge pull request #8297 from thinkyhead/bf2_M118_and_others 
[2.0] Fix M118, compiler warnings, etc.
 2017-11-06 23:25:49 -06:00
Alexey Shvetsov
83555933aa Add platformio support for stm32 (#8246) 
[2.0] Add platformio support for stm32
 2017-11-06 23:03:59 -06:00
Scott Lahteine
85a62bbf46 Misc. fixes to compiler warnings, etc. 2017-11-06 22:57:05 -06:00
Scott Lahteine
e6aba99f16 Fix M118 parameters, with strict guideline 2017-11-06 22:57:01 -06:00
Scott Lahteine
6718579ccf
Merge pull request #8294 from thinkyhead/bf2_fix_fallback_font 
[2.0] Patch non-extended font option
 2017-11-06 22:01:08 -06:00
Scott Lahteine
e9b1944a67 Patch non-extended font option 2017-11-06 21:42:21 -06:00
Roxy-3D
6324b09934
Revert "Fix EEPROM crc (#8284)" (#8292) 
This reverts commit 172c36f5176e9405d80e93350cccb03e6960a470.
 2017-11-06 19:52:05 -06:00
Rowan Meara
172c36f517 Fix EEPROM crc (#8284) 2017-11-06 19:19:30 -06:00
Scott Lahteine
cc4d28b73c
Update bilinear for native workspace 2017-11-06 17:04:41 -06:00
Scott Lahteine
94c7205d64
Merge pull request #8281 from thinkyhead/bf2_alligator_dac 
[2.0] Use fastio for Alligator dac084s085, etc.
 2017-11-06 12:16:18 -06:00
Scott Lahteine
2246316605 Fix name collision. timer_t => hal_timer_t 2017-11-05 19:31:07 -06:00
Jason Hitesman
4efaef7039 [2.0.x] Fix archim2 SSDS define (#8278) 
* Fix SSDS define

* Update pins_ARCHIM2.h
 2017-11-05 19:23:19 -06:00