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

8230 commits

Author SHA1 Message Date
Scott Lahteine
5f8b2c2ff0 More descriptive environment error message 2018-02-22 23:34:49 -06:00
Scott Lahteine
b17982bde9
Merge pull request #9769 from teemuatlut/bf2_compile_fixes 
[2.0.x] Fix compiling with M600 and runout sensor
 2018-02-22 22:52:31 -06:00
Scott Lahteine
799e3b2b40 LPC1768 HAL formatting/comments 2018-02-22 14:36:17 -06:00
teemuatlut
5968a3e60e Add ADVANCED_PAUSE_FEATURE include 2018-02-22 20:28:46 +02:00
teemuatlut
93cc3a8492 Make used methods public 2018-02-22 20:26:14 +02:00
Marcio Teixeira
13176dfe2f Merge remote-tracking branch 'origin/pr-lite-st7920-status' into pr-lite-st7920-status 2018-02-22 08:02:31 -07:00
Scott Lahteine
424b9a83cd Slovak language update 
From @rmoravcik at #9760
 2018-02-22 03:00:47 -06:00
Scott Lahteine
e75ccfd727
Hatchbox Alpha Config with E3Dv6 (#9762) 2018-02-22 02:57:48 -06:00
Scott Lahteine
556abc0888 Add LIGHTWEIGHT_UI to example configs 2018-02-22 00:10:43 -06:00
Marcio Teixeira
532bb3aaa1 Lightweight status screen for ST7920 
- This 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-22 00:10:43 -06:00
Scott Lahteine
59c98d6fd5
Hephestos2 heated bed kit for all (#9757) 2018-02-21 22:27:09 -06:00
Scott Lahteine
8c1a82c327
Merge pull request #9753 from ldkraemer/BF2CR-10Bootscr 
[2.0.x] Creality CR-10mini configuration
 2018-02-21 20:29:36 -06:00
Scott Lahteine
72f63a4980 Fix DOGM progress bar with LCD_SET_PROGRESS_MANUALLY 2018-02-21 19:47:04 -06:00
ldkraemer
6c3162f9c6 Add CR-10 Mini configuration 2018-02-21 19:08:42 -06:00
ldkraemer
4431f4deb8 Add CR-10S _Bootscreen.h 2018-02-21 18:55:14 -06:00
Marcio Teixeira
e7f329edb2 Added bed corners to bed icon. 
- This makes it look less like a dash (idea stolen from cjsoong).
 2018-02-21 15:31:56 -07:00
Marcio Teixeira
e84a5545e1 Removed unnecessary extended mode switch. 
- This will slightly reduce the SPI requirements for
  updating the progress bar.
 2018-02-21 15:12:11 -07:00
Scott Lahteine
343c17d5b3
Reduce Creality3D bootscreens flash usage (#9752) 2018-02-21 16:08:52 -06:00
Scott Lahteine
63bc6ade4f Fix pinsDebug compile error 2018-02-21 14:28:58 -06:00
Roxy-3D
d504bbbfa4 Fix botched check for being off the mesh... 2018-02-21 14:28:58 -06:00
Marcio Teixeira
716a22498f Changed temp type from uint8_t to int16_t 
- Also deleted old implementation files which had been renamed.
 2018-02-21 10:15:55 -07:00
Scott Lahteine
7d8c6b3f3c
Add 20x4 option for Sainsmart LCD (#9740) 2018-02-21 00:46:25 -06:00
Scott Lahteine
1d7f5be0ff quick_home_xy sensorless homing 2018-02-20 20:52:48 -06:00
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
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
Scott Lahteine
241e55ef3b Apply SERIAL_FLUSH macro 2018-02-16 17:32:12 -06:00
Scott Lahteine
1f8f8c9104
Merge pull request #9657 from petrzjunior/bugfix-2.0.x 
[2.0.x][Language] Update Czech (Advanced pause...)
 2018-02-16 02:54:06 -06:00
Thomas Moore
cff62042ee Fix LCD manual movement on kinematic machines (#9655) 2018-02-16 02:34:36 -06:00
teemuatlut
749bc42aa9 TMC SGT is int8 (#9651) 2018-02-16 02:19:33 -06:00
Bob-the-Kuhn
2d749d490b Fix / complete USE_CONTROLLER_FAN (#9666) 2018-02-16 02:18:50 -06:00
Scott Lahteine
08d685c97a Followup to 21e60fd 2018-02-16 02:09:17 -06:00
Scott Lahteine
c49844df66 !ENABLED => DISABLED 2018-02-16 01:51:34 -06:00
Scott Lahteine
304e0f8945 Followup to 21e60fd 
`ENABLED` only works for flag-type options. Floats must use `#ifdef`.
 2018-02-15 22:24:23 -06:00
Scott Lahteine
6a70a4fbb3
Fix G26 circles (#9627) 
Easier to configure. Catch an odd divisor.
 2018-02-15 22:11:26 -06:00
Bob-the-Kuhn
349dafa728 config update (set to -1) 2018-02-15 21:42:54 -06:00
Roxy-3D
21e60fd3ed
Allow user to control Z-Height correction for off mesh movements (#9661) 2018-02-15 15:07:42 -06:00
Petr Zahradník
5d9e16ea49 Update Czech advanced pause 2018-02-15 20:22:22 +01:00
Roxy-3D
c78e1c0f23
Fix G26 Circles... (#9641) 
* Fix G26 Circles...
 2018-02-15 11:15:15 -06:00
Bob-the-Kuhn
b648999528
Merge pull request #9624 from Bob-the-Kuhn/RRD-8-bit-code-to-2.0.x 
[2.0.x] Add delays to AVR driver for RRD Full Graphic Smart Controller
 2018-02-14 22:43:17 -06:00
Marcio Teixeira
8db67d1647 Fixed compilation when using avr-gcc 
- avr-gcc is more strict than the Arduino IDE, it seems.
 2018-02-14 15:51:25 -07:00
Marcio Teixeira
f05bd7f082 Added files missing from earlier commit. 2018-02-14 14:51:35 -07:00
Marcio Teixeira
4880ac6533 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-14 14:43:54 -07:00
Roxy-3D
3d74ff3c87
Cartesian UBL systems should not use SEGMENT_LEVELED_MOVES 
There is significant downside to breaking up the long line segments on UBL Cartesian machines.   It adds a lot of extra computation but worse...  It cuts out all of UBL's off mesh Z-Height correction checks.    There have been a large number of people complaining about the nozzle going to infinity or crashing into the bed lately.   They are being caused by
```
void unified_bed_leveling::line_to_destination_cartesian()
```
not watching over the segments being queued up for movement.
 2018-02-14 14:16:12 -06:00
Scott Lahteine
5dc04c5201 Fix #9361 2018-02-14 07:48:20 -06:00
AnHardt
133b38b93b Complete M48 description (#9631) 2018-02-14 05:17:58 -06:00
Scott Lahteine
93c0198b2d Init LCD welcome message programmatically 2018-02-14 05:09:44 -06:00
Scott Lahteine
67a4cc610b French update 
Based on #9610
 2018-02-14 04:15:47 -06:00
Scott Lahteine
e7b50c89b0 Fix #9201 
FILAMENT_LCD_DISPLAY can work with SDSUPPORT
 2018-02-14 03:29:47 -06:00
Scott Lahteine
8d71ad37cb flush comment to match 1.1.x 2018-02-14 02:56:18 -06:00
Scott Lahteine
272f132b82 Remove stray ` from STM32F1 HAL 
As noted in #8585
 2018-02-14 01:06:37 -06:00
Scott Lahteine
5b70d3da1c Update DIGIPOT_I2C_MOTOR_CURRENTS comments 2018-02-13 22:54:12 -06:00
Scott Lahteine
2ec65051fd Fix serial comment sp. 2018-02-13 22:40:56 -06:00
Bob-the-Kuhn
9a423e9a89 tested 2018-02-13 21:59:18 -06:00
Scott Lahteine
d741bcf8a9 Tweak boards spacing 2018-02-13 03:49:28 -06:00
Scott Lahteine
f8912bb19f French update 
Based on #9590 by @studiodyne
 2018-02-12 01:07:47 -06:00
Scott Lahteine
e6b8207b03 Restore welcome message 2018-02-12 01:02:30 -06:00
Scott Lahteine
89165326b4 Cleanup after vim and vigor 2018-02-11 06:07:30 -06:00
Scott Lahteine
423bf9955e Set Megatronics baud rate to 115200 
Fix #9092
 2018-02-11 03:43:36 -06:00
Scott Lahteine
377108619b Fix plan_arc clockwise (G2) 
Fix #9482
 2018-02-11 03:34:25 -06:00
Scott Lahteine
378867d894 Update PB Rev.F pins 2018-02-11 01:45:37 -06:00
Scott Lahteine
8e0c107545
Have Kossel Pro use Z_MIN_PROBE_ENDSTOP (#9586) 2018-02-11 01:41:40 -06:00
Scott Lahteine
03d790451f
[2.0.x] HAL timer set/get count => set/get compare (#9581) 
To reduce confusion over the current timer count vs. the compare (aka "top") value. Caution: this re-uses the function name, changing its meaning.
 2018-02-10 20:42:00 -06:00
Scott Lahteine
7a4029d1b1 Correct MOTHERBOARD for Geeetech i3 Pro X 2018-02-10 20:29:29 -06:00
Scott Lahteine
451fb16f9b Fix CYCLES_PER_MICROSECOND conflict 2018-02-10 20:08:48 -06:00
Scott Lahteine
3e384b60ce
Malyan M200 fix E0_AUTO_FAN_PIN (#9580) 
Fixes #8794
 2018-02-10 20:04:09 -06:00
Scott Lahteine
33752de12d Update some outdated configs 2018-02-10 19:48:16 -06:00
Scott Lahteine
38c7d53bf7 Repair some spacing 2018-02-10 19:33:26 -06:00
Scott Lahteine
e3043d7ac7 Fix #8744 2018-02-10 16:54:42 -06:00
Scott Lahteine
d3ddd5ffaa
Merge pull request #9576 from thinkyhead/bf2_more_tests 
[2.0.x] Fix Power class
 2018-02-10 16:43:55 -06:00
Scott Lahteine
7280fa1e31 Patch Power class 2018-02-10 15:41:18 -06:00
Scott Lahteine
4aff6c1c32 Tronxy X5S pins and configuration 2018-02-10 15:07:04 -06:00
Scott Lahteine
05aa75cecf Melzi boards use melzi pins 2018-02-10 14:44:14 -06:00
gege2b
5785bbb491 Updated french translation (#9556) 2018-02-10 14:15:41 -06:00
GMagician
299606e4ae [2.0.x] Memory overflow protection (#9562) 2018-02-10 14:14:34 -06:00
teemuatlut
5990266724 Init CS pins before loading settings (#9566) 2018-02-10 14:08:53 -06:00
teemuatlut
d3fdb44ad8 Update TMC section with SW SPI pins (#9554) 2018-02-09 22:54:34 -06:00
Scott Lahteine
3168f0e646
Merge pull request #9549 from thinkyhead/bf2_prevent_comments_resetting 
[2.0.x] Prevent watchdog reset due to many comments
 2018-02-09 07:13:26 -06:00
Scott Lahteine
9be6aa3f79
Merge pull request #9544 from thinkyhead/bf2_reliable_probe_heaters_off 
[2.0.x] More reliable PROBING_HEATERS_OFF with BED_LIMIT_SWITCHING
 2018-02-09 07:12:29 -06:00
Scott Lahteine
c0dd9ef9f2
Support for AnyCubic TriGorilla board (#9551) 2018-02-09 05:41:52 -06:00
Scott Lahteine
da693a636e Fix handling of escapes in serial input 2018-02-09 05:19:33 -06:00
Scott Lahteine
cc9cef7f7a Fix HAS_CONTROLLER_FAN in is_power_needed 2018-02-09 05:19:33 -06:00
Scott Lahteine
112917cfef No EXTRUDER_RUNOUT_PREVENT during print 2018-02-09 05:19:33 -06:00
Scott Lahteine
c30a8067ab Prevent watchdog reset due to many comments 
Addressing #7449
 2018-02-09 05:19:33 -06:00
Scott Lahteine
b7053156fe Minor comment/condition cleanup 2018-02-09 01:53:35 -06:00
Scott Lahteine
f64d300cfd
Sanity check SERIAL_PORT 
Addressing #7400
 2018-02-09 00:44:15 -06:00
Scott Lahteine
5a70887467
Size lcd_status_message based on language (#9545) 2018-02-08 23:03:47 -06:00
Scott Lahteine
545cd8fa60 Tweak malyanlcd.cpp 2018-02-08 22:00:23 -06:00
Scott Lahteine
e698998343 More reliable PROBING_HEATERS_OFF with BED_LIMIT_SWITCHING 2018-02-08 21:10:11 -06:00
shaktee
27faeafc1b [2.0.x] BIBO Cyclops (#9541) 2018-02-08 21:01:31 -06:00
Scott Lahteine
2014d38e10 NEOPIXEL_BRIGHTNESS parity 2018-02-08 18:55:19 -06:00
Scott Lahteine
694d2ebec0 TMC SW SPI pins in Configuration_adv.h 
Counterpart to #9632
 2018-02-08 18:49:38 -06:00
GMagician
9854262334 [2.0.x] Fix compile warning (#9539) 2018-02-08 17:59:03 -06:00
Scott Lahteine
b639f1ad4b
Correct some retract() comments 2018-02-08 17:57:48 -06:00
Thomas Moore
1541224a81 Enable Z axis and delta sensorless homing (#9516) 2018-02-08 04:20:44 -06:00
Scott Lahteine
b2f8b4ada5
I2C position encoders update (#9533) 
Updating I2C position encoders to enable babystepping and Babystep XY when using the ecm microstep correction method. Also changed default method to ECM microstep.
 2018-02-08 03:57:11 -06:00
Thomas Moore
93af0365e8 [2.0.x] Add support for Cohesion3D ReMix and Mini (#9512) 
* Add support for Cohesion3D ReMix and Mini
* Two separate pins files for pedantic reasons
 2018-02-08 03:14:39 -06:00
Scott Lahteine
23240f7986 Fix sw serial pins for TMC2208 
From #9518 by @melvinisken
 2018-02-08 02:54:49 -06:00
Scott Lahteine
d42a87cb31 Update language Italian 
From #9508 by @tnw513
 2018-02-08 02:10:15 -06:00
Scott Lahteine
2538f019d0 Update language Basque-Euskera 
From #9514 by @1138-4EB
 2018-02-08 02:08:41 -06:00
Scott Lahteine
d168ee9bed Drop leveling include from steppers.cpp 2018-02-08 01:32:19 -06:00
Scott Lahteine
09c8807a36 Minor formatting in queue.cpp 2018-02-08 01:31:19 -06:00
Scott Lahteine
704d33c374 Special override of LCD_WIDTH 2018-02-08 01:30:56 -06:00
Scott Lahteine
b3f115fa0a
Marlin.ino needs no content (#9506) 2018-02-06 02:28:18 -06:00