melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,669 Commits 2 Branches 0 Tags 2 GiB
c0dd9ef9f2
Commit Graph

9669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
a12ab611ae Merge pull request #7987 from thinkyhead/bf2_progress_percentage 
[2.0.x] Add M73 (LCD_SET_PROGRESS_MANUALLY)
 2017-10-15 16:13:23 -05:00
Scott Lahteine
5c4f3e0107 Add LCD_SET_PROGRESS_MANUALLY 2017-10-15 03:05:29 -05:00
Scott Lahteine
014a83fe09 Merge pull request #7984 from thinkyhead/bf2_micromake_c1 
[2.0.x] Micromake C1 Configurations, Unaccented French
 2017-10-14 21:19:32 -05:00
Scott Lahteine
bc7df0188e Add Micromake C1 configurations 2017-10-14 20:28:12 -05:00
Scott Lahteine
34a261416f Add unaccented French language 2017-10-14 20:28:12 -05:00
Scott Lahteine
af2397d581 Merge pull request #7979 from thinkyhead/bf2_granular_sw_endstops 
[2.0.x] Software endstop options by axis
 2017-10-14 19:57:16 -05:00
Scott Lahteine
e587f0893c Define AVR_ATmega2560_FAMILY_PLUS_70 in Conditionals 2017-10-14 19:05:32 -05:00
Scott Lahteine
fd128b3c93 Fix some AVR HAL code style 2017-10-14 19:05:10 -05:00
Scott Lahteine
799360c576 Enhance Teensy/RAMPS pins files 2017-10-14 18:44:20 -05:00
Scott Lahteine
d3e5a22a5d Add MIN_SOFTWARE_ENDSTOP_[XYZ] to example configs 2017-10-14 18:44:20 -05:00
Jeff Eberl
b206f70693 Split the software endstop capability by axis. 2017-10-14 18:44:20 -05:00
Scott Lahteine
ec69e97bda Merge pull request #7974 from jeffyl/bugfix-2.0.x 
Fix include path for VIKI
 2017-10-14 17:38:42 -05:00
Morten
91e28edda6 [2.0.x] Add new board: MKS Sbase (#7945) 
* Add files via upload

* Add files via upload

* Add files via upload

* Checked LCD / edited / revised pins_MKS_BASE.h

As requested :)

* Delete Configuration_adv.h

* Delete Configuration.h

* Deleted /Marlin/Marlin/src/config/examples/MksSbase/*.* and moved them to /Marlin/Marlin/src/config/examples/Mks/Sbase/*.*

* Add files via upload
 2017-10-14 09:44:18 -05:00
Jeffrey Li
3c8a3a02ba Fix include path for VIKI 2017-10-14 04:06:17 -07:00
Scott Lahteine
4586acad8c Merge pull request #7959 from alexxy/bugfix-2.0.x 
Python isnt always python2
 2017-10-14 05:02:07 -05:00
Scott Lahteine
497f86453e Merge pull request #7964 from gallynero/patch-2 
fix 'axis_unhomed_error' not defined error
 2017-10-14 05:00:58 -05:00
Scott Lahteine
85b2e7e764 Merge pull request #7966 from thinkyhead/bf2_ubl_remove_z_offset 
[2.0.x] Unify Z fade factor
 2017-10-14 03:15:16 -05:00
Scott Lahteine
c0dddd4233 Tweaks to tool_change, GcodeSuite::T() 2017-10-14 02:53:19 -05:00
Scott Lahteine
ca66574062 ADC sensor fix inspired by 'Evgen2' on Twitter 2017-10-14 02:28:13 -05:00
Scott Lahteine
1344ca4b2f UBL no longer needs ubl_state 2017-10-14 02:18:32 -05:00
Scott Lahteine
8dd08425fd Improve LCD leveling edits 2017-10-14 02:18:31 -05:00
Scott Lahteine
3e3911fb81 Use planner.leveling_active for all leveling systems 2017-10-14 02:18:31 -05:00
Scott Lahteine
32c607ffe2 Ensure fade factor is recalculated if fade height changes 2017-10-14 02:18:31 -05:00
Scott Lahteine
ca1e47375c Move fade_scaling_factor_for_z to Planner 2017-10-14 02:18:31 -05:00
Scott Lahteine
9a930ebec2 Make leveling_is_active a macro 2017-10-14 02:18:31 -05:00
Scott Lahteine
58abc66c1d Tweak bed leveling conditionals 2017-10-14 02:18:31 -05:00
Scott Lahteine
72ef508d55 Merge pull request #7962 from thinkyhead/bf2_ubl_remove_z_offset 
[2.0.x] Remove obsolete UBL z_offset
 2017-10-13 09:06:19 -05:00
Scott Lahteine
1adb5a6a48 Remove obsolete UBL z_offset 2017-10-13 08:22:46 -05:00
gallynero
3619a4cbea fix 'axis_unhomed_error' not defined error 
Fix 'axis_unhomed_error' not defined error when pause with unhomed status
 2017-10-13 09:08:02 +02:00
Alexey Shvetsov
12d212d1b4 Python isnt always python2 
So now this script is compatible with both python versions 2 and 3

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2017-10-13 01:39:06 +03:00
Scott Lahteine
cc01a36363 Merge pull request #7947 from thinkyhead/bf2_more_READMEs 
[2.0.x] Add a README.h file for Arduino IDE users
 2017-10-12 06:56:41 -05:00
Scott Lahteine
4764710b11 Add a README.h file for Arduino IDE users 2017-10-11 18:10:15 -05:00
Bob-the-Kuhn
4e3ee845b9 config_adv (#7941) 
get rid of twi.h

move to board files
 2017-10-11 15:42:24 -05:00
Roxy-3D
0e260c6c1d Get FolgerTech i3-2020 working again with 32-bit platforms (#7944) 
Setup FolgerTech i3-2020 Configuration files as a reference platform for
32-Bit work.

Also fix MAX7219 debug lights on 32-bit platforms.
 2017-10-11 15:23:04 -05:00
Bob-the-Kuhn
e9cf9ad3f3 Merge pull request #7935 from Bob-the-Kuhn/Digipot-MCP4451 
2.0.x - MPC4451 I2C support
 2017-10-11 00:36:51 -05:00
Bob-the-Kuhn
26bfae58d4 MPC4451 I2C support 2017-10-11 00:30:41 -05:00
Scott Lahteine
1f5c432e29 Merge pull request #7920 from thinkyhead/bf2_neopixel_full 
[2.0.x] Move FILAMENT_RUNOUT_SENSOR to a feature
 2017-10-10 03:05:00 -05:00
Scott Lahteine
732e87e83c Merge pull request #7892 from GMagician/Serial-double-echo-fix 
[2.0.x] Serial double echo fix
 2017-10-10 02:42:16 -05:00
Scott Lahteine
f8e8fcb978 Move FILAMENT_RUNOUT_SENSOR to a feature 2017-10-10 02:37:42 -05:00
Scott Lahteine
10124f39d9 Merge pull request #7919 from thinkyhead/bf2_neopixel_full 
[2.0.x] Different NEOPIXEL types
 2017-10-10 02:35:39 -05:00
Slawomir Ciunczyk
a11e6a1022 Different NEOPIXEL types 
Same as #7728 but for 2.0.x,
Lot of cleanup and remove references in whole code to other "LED files" than leds.h. Now will be much easier to add next drivers/libraries. e.g. FastLED. But bad news, currently FastLED is suporting only RGB devices (no RGBW)
 2017-10-10 02:17:36 -05:00
Scott Lahteine
b30b55307c Merge pull request #7909 from thinkyhead/bf2_goodbye_legacy_advance 
[2.0.x] Remove legacy ADVANCE feature
 2017-10-10 00:31:18 -05:00
Scott Lahteine
1d04197f2f Merge pull request #7916 from thinkyhead/bf2_probeless_ubl 
[2.0.x] Allow UBL G29 and G26 to build without a probe
 2017-10-10 00:30:27 -05:00
Scott Lahteine
1f05f10346 Merge pull request #7894 from tcm0116/2.0.x-lcd_segmented_moves 
[2.0.x] Use segmented moves when moving axis from LCD
 2017-10-10 00:28:34 -05:00
Thomas Moore
9b0ee53b12 Use segmented moves when moving axis from LCD 2017-10-09 23:25:43 -05:00
Scott Lahteine
442669d23c Allow UBL to build without a probe 2017-10-09 18:57:41 -05:00
Scott Lahteine
5ad8f5c306 Merge pull request #7914 from thinkyhead/bf2_add_some_lcds 
[2.0.x] Add support for 4 new LCDs
 2017-10-09 17:39:41 -05:00
Scott Lahteine
20ebe218c8 Tweaks to VIKI lcd support 2017-10-09 17:01:07 -05:00
Scott Lahteine
09fa34a9e1 Modernize configs 2017-10-09 16:18:10 -05:00
Scott Lahteine
560d366b80 Move VIKI SCK/MOSI pins fix to Conditionals_POST.h 2017-10-09 16:13:49 -05:00