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

9153 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
36426af564
Merge pull request #8356 from tcm0116/2.0.x-M600 
[2.0.x] Normalize load/unload length in M600
 2017-11-10 19:44:08 -06:00
Scott Lahteine
c0fe6cc34d
Merge pull request #8324 from LVD-AC/2.0.x-manual-probe 
[2.0.x] PROBE_SELECTED etc.
 2017-11-10 19:43:13 -06:00
Scott Lahteine
1ed86adf9c Cleanup around updatePID 2017-11-10 19:27:34 -06:00
Scott Lahteine
75a58ee4b8 Fix position_is_reachable bug in waiting 2017-11-10 19:27:33 -06:00
LVD-AC
e334efb2a7 PROBE_MANUALLY etc. 2017-11-10 19:27:33 -06:00
Bob-the-Kuhn
a886e98967
Merge pull request #8364 from Bob-the-Kuhn/temp-sd-card 
2.0.x - LPC1768 - update file to new pin numbering system
 2017-11-10 14:59:53 -06:00
Bob-the-Kuhn
b6415dc169 finish 2017-11-10 14:39:55 -06:00
Scott Lahteine
60153b0e3b
Merge pull request #8359 from thinkyhead/bf2_chinese_update 
[2.0.x] Updates to Traditional Chinese
 2017-11-10 04:54:44 -06:00
Scott Lahteine
0efa66be0b Updates to Traditional Chinese 
From @cheton at #8347
 2017-11-10 04:52:20 -06:00
Scott Lahteine
cba9c1cf9e Add pre-calculated planner.e_factor 2017-11-10 03:14:24 -06:00
Thomas Moore
600c85226e Normalize load/unload length in M600 2017-11-10 02:31:46 -06:00
Scott Lahteine
81b91b3f9d Clean up some trailing white-space 2017-11-10 02:31:04 -06:00
Roxy-3D
2f9848ede3
Correct gMax 1.5+ example file 
And...   Keep both branches in synchronization.
 2017-11-09 23:44:14 -06:00
Scott Lahteine
450c5f0814
Merge pull request #8326 from Vynt-1/bugfix-2.0.x 
[2.0] Add new board from Russia
 2017-11-09 21:55:53 -06:00
Scott Lahteine
006dad4b52 Add pins_RURAMPS4D.h & change pins.h 
http://3dtoday.ru/blogs/svs0724/ruramps4d-ramps-for-adruino-due-the-pilot-shipment-available-for-zack/
 2017-11-09 21:51:06 -06:00
Scott Lahteine
00514857e9 SBASE serial port -1, RAMPS spacing 2017-11-09 21:41:07 -06:00
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 6f70e5618e.
 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