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

9985 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
eb182c08af
Merge pull request #9733 from thinkyhead/bf2_random_fixup_branch 
[2.0.x] Drop HAL_timer_set_count
 2018-02-20 17:03:18 -06:00
Kevin
03b48df7bb RADDS: Add EEPROM Size (#9737) 
needed for UBL
 2018-02-20 16:24:29 -06:00
Scott Lahteine
9f0907d40c Fix big edit font width calculation 
Fix #9685
 2018-02-20 16:24:23 -06:00
Marcio Teixeira
9d5968e8ec Fixed dual-extruder in Lightweight UI. 
- Moved bed icon down when the machine is configured with two nozzles.
 2018-02-20 13:34:34 -07:00
Scott Lahteine
4303f2e377 Fix MALYAN_LCD message bugs 
Fix #9711
Replacing #9731
 2018-02-20 05:40:19 -06:00
Scott Lahteine
12c5fdfdb5 Fix CYCLES_PER_MICROSECOND conflict on STM32F1 2018-02-20 03:10:39 -06:00
Scott Lahteine
a810e585db Drop HAL_timer_set_count 2018-02-20 03:10:39 -06:00
Bob-the-Kuhn
a823b801b8
Merge pull request #9729 from Bob-the-Kuhn/U8G-compile-error-2.0.x 
[2.0.x] Move #include <U8glib.h> in ultralcd_st7920_u8glib_rrd_AVR.cpp (fix bug introduced in PR #9624)
 2018-02-19 18:36:23 -06:00
Bob-the-Kuhn
47d529aac5 move #include <U8glib.h> 2018-02-19 17:39:40 -06:00
Marcio Teixeira
aada1e698f Removed unused configuration options. 2018-02-19 16:14:33 -07:00
Marcio Teixeira
c7513eb032 Merge branch 'pr-lite-st7920-status' of github.com:marcio-ao/Marlin into pr-lite-st7920-status 2018-02-19 15:38:13 -07:00
Scott Lahteine
73cd34b121 Finish AUTO_POWER_CONTROL implementation 
Followup to #9503
 2018-02-19 16:12:04 -06:00
Scott Lahteine
fc460fff94 Extend menu items for SWITCHING_EXTRUDER 
Reference #5367
 2018-02-19 11:12:42 -06:00
Scott Lahteine
c4ec01d59b Conditionals for SWITCHING_EXTRUDER 
In reference to #5367. SWITCHING_EXTRUDER was not fully implemented for EXTRUDERS > 2.
 2018-02-19 10:59:47 -06:00
Scott Lahteine
d4e4fe40e0 Add SENSORLESS_HOMING delay to quick_home_xy 
Fix #9471
 2018-02-19 10:12:16 -06:00
Scott Lahteine
25e3e62354 Null-terminate lcd_status_message 2018-02-19 10:12:16 -06:00
Scott Lahteine
a11fcd46a2
Merge pull request #9699 from Studiodyne/Studiodyne-filamentMulti 
[2.0.x] Support multiple filament runout sensors
 2018-02-19 08:42:39 -06:00
Scott Lahteine
b3deadd898 Don't raise FIX_MOUNTED_PROBE on stow 
Reference #9336
 2018-02-19 08:36:43 -06:00
Scott Lahteine
a74cece6d0 CR-10 Bootscreen 
From @plainpylut in #9660
 2018-02-19 08:07:08 -06:00
Scott Lahteine
8733d5a296 Add NUM_RUNOUT_SENSORS to example configs 2018-02-19 07:02:50 -06:00
Studiodyne
d3ca82d8c2 Support for multiple filament runout sensors 2018-02-19 07:02:50 -06:00
Scott Lahteine
0106c3e476 Style tweak in MarlinSerialUSB_Due.h 2018-02-19 06:58:26 -06:00
Scott Lahteine
3d1692d1fd Fix X2 enable with X_DUAL_STEPPER_DRIVERS 
From #9286
 2018-02-18 22:50:47 -06:00
Scott Lahteine
c241da32e8 stepper.h parity with 1.1.x 2018-02-18 22:50:38 -06:00
Scott Lahteine
3af988a7f3 Add sensorless homing delay to home_z_safely 
Based on #9705
 2018-02-18 19:28:40 -06:00
Scott Lahteine
ca55f2927a
Pulldown pin mode support (#9701) 
Implemented for LPC1768.
 2018-02-18 19:26:23 -06:00
Scott Lahteine
aef9e036bf More overridable FIL_RUNOUT_PIN 2018-02-18 04:43:15 -06:00
Scott Lahteine
79272f98fc Proposed changes to ST7920 lightweight status screen 2018-02-18 02:47:31 -06:00
Marcio Teixeira
24eb275b99 Added a light-weight status screen for the ST7920 
- The status screen uses the ST7920 character generator to greatly
  reduce SPI traffic and MCU load when updating the status screen.

- Has been tested with the RepRapDiscount Full Graphics Smart Controller
  but should work with any LCD that uses an ST7920 or fully compatible
  controller.
 2018-02-18 02:29:45 -06:00
Scott Lahteine
a6563df705
Sync pinsDebug_list.h between 1.1.x and 2.0.x (#9693) 2018-02-18 02:25:32 -06:00
Scott Lahteine
bab0e975c8
The ENDER can use BOARD_MELZI_CREALITY (#9692) 2018-02-18 02:24:39 -06:00
Scott Lahteine
83d7e95de0
Add MSG_THERMAL_RUNAWAY_BED (#9691) 2018-02-18 02:23:55 -06:00
Scott Lahteine
6589f654b0
Merge pull request #9676 from smoki3/bugfix-2.0.x 
[2.0.x] Option to force homing of a dependent axis
 2018-02-18 02:22:03 -06:00
Scott Lahteine
8ffa0b24a4 Strip excess G28 debug logging 2018-02-18 01:11:41 -06:00
Kevin
9019ea0fce Option to force X or Y to home first when homing the other axis 2018-02-18 01:11:41 -06:00
Scott Lahteine
60fc372211 Add CODEPENDENT_XY_HOMING to example configs 2018-02-18 00:46:04 -06:00
Scott Lahteine
da7c51d820 Space out some pins lines 2018-02-17 22:53:58 -06:00
Bob-the-Kuhn
e05673a379 [2.0.x] VIKI2 & RE_ARM changes (#9686) 
* VIKI2 & RE_ARM changes

1. Remove `DISABLED(SDSUPPORT)` from ST7565 in `ultralcd_impl_DOGM.h`. These LCDs share pins with the SD card and can run at the SD card rates.

2. Add SDSS definition to `pins_RAMPS_RE_ARM.h`.  Apparently the SDSS definition in `pins.h` is being processed before the one in `spi_pins.h` which resulted in not being able to read the SD card.
 2018-02-17 16:41:36 -06:00
Scott Lahteine
7a381366aa
Merge pull request #9208 from benlye/benlye-m73 
[2.0.x] Allow M73 without SDSUPPORT
 2018-02-17 15:50:11 -06:00
Scott Lahteine
7d093edc18 Add Tronxy XY100 configuration 
Based on #9674
 2018-02-17 15:48:32 -06:00
Scott Lahteine
472229b974 Fix #9681 2018-02-17 08:28:12 -06:00
Scott Lahteine
f6cc89ec7c LCD_PROGRESS_BAR w/out SDSUPPORT for character LCD 2018-02-17 08:17:22 -06:00
blye
330437ad7c Update LCD_SET_PROGRESS_MANUALLY in configs 2018-02-17 08:12:10 -06:00
blye
168af8bacb Allow LCD_SET_PROGRESS_MANUALLY without SDSUPPORT 2018-02-17 07:54:24 -06:00
Scott Lahteine
bf5df306e1 Fix compile error with SHOW_BOOTSCREEN disabled 
Fix #9530
Fix #9524
 2018-02-17 00:52:08 -06:00
Scott Lahteine
3021058e6d Fix non-UTF8 Czech language 2018-02-16 22:23:29 -06:00
Scott Lahteine
bd54ce830a Include utility.h in neopixel.cpp 2018-02-16 22:19:34 -06:00
Scott Lahteine
ff90cb409e No space for E2 with ReARM+RAMPS 
Addressing #9474
 2018-02-16 21:37:26 -06:00
Scott Lahteine
d7f82c8ddf Drop extra avr/pgmspace include in _Bootscreen.h 
Addressing #9441
 2018-02-16 18:36:35 -06:00
Scott Lahteine
1bf2b1e475 Use serial macro in sd_mmc_spi_mem.cpp for Due 2018-02-16 17:57:24 -06:00