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

8870 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
79772219ae Fix Fan Multiplexer init 2017-11-04 22:28:46 -05:00
Scott Lahteine
47e0ee8eff
Merge pull request #8260 from thinkyhead/bf2_anet_keypad_ramps 
[2.0] RAMPS pins for ANET_KEYPAD_LCD
 2017-11-04 21:49:13 -05:00
Scott Lahteine
ca7d36d9ed RAMPS pins for ANET_KEYPAD_LCD 2017-11-04 21:22:53 -05:00
Scott Lahteine
52aec32f3a
Merge pull request #8258 from thinkyhead/bf2_git_scripts 
[2.0] Update git helper scripts
 2017-11-04 21:03:17 -05:00
Scott Lahteine
ca21367dde Update git helper scripts 2017-11-04 18:35:34 -05:00
Colten Edwards
e0a6ee8da5 [2.0] Fix up G33, LPC1768 + SDCARD_SORT_ALPHA (#8250) 
* Update Conditionals_post.h

* Add a cast to round() to convert to a unsigned int

Add's a cast to round() so that it will compile properly. round() returns a float which must be cast to a integer for the following % operation. Use a unsigned int as a negative index to an array is wrong. Should never be more than 255 points allowing us to use a 8 bit cast.

* Update G33.cpp
 2017-11-04 18:04:18 -05:00
Scott Lahteine
46c0b73578
Merge pull request #8252 from PaoloP74/patch-1 
Update README.md
 2017-11-04 15:12:23 -05:00
Scott Lahteine
dac1f6fe74 Tweaks to cubic_b_spline code style 2017-11-04 14:46:10 -05:00
Scott Lahteine
4df024d7b9
Merge pull request #8234 from thinkyhead/bf2_native_operation 
[2.0.x] Operate in Native Machine Space
 2017-11-04 14:31:44 -05:00
Scott Lahteine
601ccded89 Fix case-insensitive config issue 2017-11-04 14:10:13 -05:00
Paolo Paolucci
944b67b0b8
Update README.md 2017-11-04 16:23:12 +01:00
Scott Lahteine
f8393a0908 Operate in Native Machine Space 2017-11-04 00:05:38 -05:00
Scott Lahteine
d83a9a53e8
Merge pull request #8220 from thinkyhead/bf2_serial_port_-1 
[2.0] Add SERIAL_PORT -1 option for configurators
 2017-11-03 15:25:12 -05:00
Scott Lahteine
93ba72ea83 Add SERIAL_PORT -1, set on SBASE, STM32F103RET6 2017-11-03 15:22:45 -05:00
Scott Lahteine
b561ee2738
Merge pull request #8244 from thinkyhead/bf2_probes_link 
[2.0] Fix probes configuration url
 2017-11-03 13:45:53 -05:00
Scott Lahteine
7e43dd1d23 Fix probes configuration url 
Based on #8241 by @machaj
 2017-11-03 13:35:40 -05:00
Scott Lahteine
f606ebf8ee
Merge pull request #8238 from AnHardt/2.0_boot/kill_screen_cleanup 
[2.0] Some cleanup around 'lcd_bootscreen()' and 'lcd_kill_screen()'
 2017-11-03 13:31:49 -05:00
AnHardt
ca0e4b4e96 Some cleanup around 'lcd_bootscreen()' and 'lcd_kill_screen()' 
Move 'lcd_bootscreen()' from `lcd_init()` to 'setup()' where it is cexecute exactly once. Saves 'bool show_bootscreen'.
Move the call of 'lcd_custom_bootscreen()' to the begin of 'lcd_bootscreen()'.
Move the delays into the related functions.
Move the picture loop around 'lcd_kill_screen()' into the function.
 2017-11-03 12:02:48 +01:00
Scott Lahteine
84b93d941f
Merge pull request #8178 from thinkyhead/bf2_config_tweak 
[2.0.x] Faster menu navigation for Anet A8
 2017-11-03 04:49:17 -05:00
teemuatlut
70be4d206e [2.0.x] UltiMachine Archim2 (#8190) 
* UltiMachine Archim2 support

* SPI gets included by the library

* Invert TMC2130 diag pin state

* Clean up Archim2 pins

* Update Archim2 config

* FAN2 -> FAN1

* Cleanup

* Add brief Archim installation instructions

* Bring pins into compliance

* Update 1.0 SD Detect pin for 1.1

* Update Configuration.h

* Update pins_ARCHIM2.h
 2017-11-03 04:48:15 -05:00
Scott Lahteine
f3deb37bdf
Merge pull request #8236 from thinkyhead/bf2_protect_M303 
[2.0.x] M303 thermal runaway protection
 2017-11-03 04:42:14 -05:00
Scott Lahteine
31f112cf58 Cleanup trailing whitespace 2017-11-03 04:07:45 -05:00
Scott Lahteine
2f9e42feb9 M303 thermal runaway protection 2017-11-03 03:57:46 -05:00
Scott Lahteine
e5ae545647 Remove ADCKey steps acceleration 2017-11-03 03:41:55 -05:00
Luc Van Daele
6827e243a0 [2.0.x] G33 magic numbers (#8171) 
* [2.0.x] G33 magic numbers

* oops

* Comments

* oops

* warning

* better comment section

* remarks

* extra grids
 2017-11-03 03:36:16 -05:00
Scott Lahteine
8735ae984b
Merge pull request #8227 from tcm0116/2.0.x-pin_mapping 
LPC1768: updates to use the new pin_t typedef
 2017-11-03 03:10:19 -05:00
Scott Lahteine
3749a746f1
Merge pull request #8231 from AnHardt/2.0_watchdog 
[2.0] Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR
 2017-11-03 03:06:28 -05:00
AnHardt
c72a0610b4 Fix watchdog in WATCHDOG_RESET_MANUAL mode AVR 2017-11-03 04:43:00 +01:00
Thomas Moore
13d839795c LPC1768: updates to use the new pin_t typedef 2017-11-02 18:43:57 -05:00
Scott Lahteine
676a564610
Merge pull request #8225 from thinkyhead/bf2_mks_gen_l 
[2.0.x] Add MKS Gen L board
 2017-11-02 17:07:59 -05:00
Scott Lahteine
eb13b8d985 Add MKS Gen L board 2017-11-02 17:06:08 -05:00
Morten
063e957fc4 Update pins_MKS_SBASE.h (#8188) 
* Update pins_MKS_SBASE.h

Deleted E_MUX2, not used.
Changed #define LCD_PINS_D4      P0_14  // EXP1.5 to #define LCD_PINS_D4      P0_15  // EXP1.5, wrong in MKS's pinout schematic.
Swapped TEMP_BED_PIN and TEMP_0_PIN port's, request from user, more logical...

* Update pins_MKS_SBASE.h

Moved MUX signals to J8 and re added MUX2, cleaner wiring..
 2017-11-02 13:50:23 -05:00
Scott Lahteine
f7133e53fd
Fix case light off 
Addressing #8205
 2017-11-01 21:22:15 -05:00
Alexey Shvetsov
fd8f433cc2 Add Azteeg X5 GT to supported list (#8185) 
* Add Azteeg X5 GT to supported list

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

* Update README.md
 2017-11-01 11:49:51 -05:00
Scott Lahteine
32a9db3e93
Merge pull request #8197 from thinkyhead/bf2_asterisk_not_special 
Allow asterisks in G-Code commands
 2017-10-31 21:53:43 -05:00
Scott Lahteine
0108d5181f Allow asterisks in G-Code commands 
Addressing #6655
 2017-10-31 21:20:41 -05:00
Scott Lahteine
3a81646c9a
Merge pull request #8192 from thinkyhead/bf2_silver_gate 
[2.0.x] Support for SilverGate Board
 2017-10-31 16:30:14 -05:00
Scott Lahteine
34745b2183 Organize boards.h by architecture 2017-10-31 16:10:38 -05:00
android444
9cc1d8e312 [2.0.x] Support for SilverGate Board 2017-10-31 15:27:26 -05:00
Scott Lahteine
03e5369411 Faster menu navigation for Anet A8 
Addressing #8166
 2017-10-31 14:46:55 -05:00
Scott Lahteine
f1edf83720
Merge pull request #8187 from rafaljot/patch-5 
Update InterruptVectors_Due.cpp
 2017-10-31 14:14:08 -05:00
Scott Lahteine
b2bd77c40a
Merge pull request #8191 from thinkyhead/bf2_rearm_more 
[2.0.x] Add SDCARD_SORT_ALPHA options for LPC1768
 2017-10-31 14:12:14 -05:00
Scott Lahteine
571ced712d Add SDCARD_SORT_ALPHA options for LPC1768 2017-10-31 14:05:40 -05:00
rafaljot
778e4e4c23
Update InterruptVectors_Due.cpp 
const pfnISR_Handler *isrtab = get_relocated_table_addr();

What compiler do you use? Arduino 1.8.5 can't compile this "const".
 2017-10-31 15:00:06 +01:00
Scott Lahteine
cae8703e0d
Merge pull request #8181 from thinkyhead/bf2_fix_bootscreen_repeat 
[2.0.x] Only show custom bootscreen once
 2017-10-31 02:37:40 -05:00
Scott Lahteine
a516856df9 Only show custom bootscreen once 2017-10-31 01:47:30 -05:00
GMagician
727a403ba1 [2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour (#8176) 
* [2.0.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour

NO_MOTION_BEFORE_HOMING should prevent XYZ movements only when homing is not done.
E axes should be allowed

* Update G0_G1.cpp

* Update G0_G1.cpp
 2017-10-30 22:50:22 -05:00
Alexey Shvetsov
577659cacf Basic support for Azteeg_X5_GT (#8139) 
* Basic support for Azteeg_X5_GT

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

* Add fan pins for AZTEEG X5 GT

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>

* Fix endstop pins

* Add servo0 pin
 2017-10-30 16:01:20 -05:00
Scott Lahteine
0b02f9cc33
Merge pull request #8168 from thinkyhead/bf2_config_tweak 
[2.0.x] Apply Re-ARM SPI review items
 2017-10-30 15:49:50 -05:00
Scott Lahteine
1f38761da2
Merge pull request #8169 from thinkyhead/bf2_kinematic_soft_endstops 
[2.0.x] Kinematic clamp_to_software_endstops
 2017-10-30 15:49:10 -05:00