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

9669 commits

Author SHA1 Message Date
Scott Lahteine
06674a321a Remove extra include 2018-11-18 00:34:07 -06:00
Marcio Teixeira
c1e17037e5 Various fixes for MarlinUI and ExtUI (#12439) 2018-11-17 22:21:44 -06:00
Giuliano Zaro
d3605cfc26 Don't start watching heaters when target is 0 (#12453) 2018-11-17 21:53:52 -06:00
Ludy
93e958f695 Fix compile error with ZONESTAR_LCD+NO_LCD_MENUS (#12466) 2018-11-17 21:21:30 -06:00
Ludy
22d7fed60a Fix compile error with SD_FIRMWARE_UPDATE (#12462) 2018-11-17 21:13:36 -06:00
Nils Hasenbanck
779b2709ec Change temperature pin order for RemRam V1 (#12458) 
Beta testers suggested to adopt the RAMPS order of temperature probe connectors. This commit fixes the order to the RAMPS order.
 2018-11-17 16:51:06 -06:00
Scott Lahteine
8ebb4dc294 Followup to static CardReader 2018-11-17 07:52:35 -06:00
Scott Lahteine
7ee5894360 Allow float XY probe offsets 
Responding to #12383

XY probe offsets should be integers because adding decimal points makes the code larger. But if decimals are very much wanted, this commit removes the old restriction.
 2018-11-17 07:44:47 -06:00
Giuliano Zaro
43ecdb606f Fix a compile warning (#12452) 2018-11-17 07:08:25 -06:00
Ph0non
984c4ba8c7 Enable SD Card on RepRap Display and RADDS (#12446) 
* Enable SD Card on RepRap Display and RADDS

Define the necessary pins in `pins_RADDS.h` (copied from the `RADDS_DISPLAY` section) for the use of the SD card slot on RRD.
 2018-11-17 06:59:40 -06:00
Ludy
56a94c2a26 Use 'target_extruder' in M104 as with M109 (#12448) 2018-11-17 06:55:25 -06:00
Scott Lahteine
66580f32c2
Make CardReader class static (#12451) 
* Make CardReader a static class
* Make CardReader flags into bitfields
 2018-11-16 22:39:16 -06:00
Scott Lahteine
3e9ffaddb6
Consolidate, optimize some LCD menu code (#12450) 2018-11-16 21:44:48 -06:00
Scott Lahteine
d97e31db4c
Optimize Power-Loss Recovery (#12440) 2018-11-16 20:47:07 -06:00
Mateusz Krawczuk
ca21ac6b9b Support two MAX6675 thermocouples (#8686) 2018-11-16 18:20:33 -06:00
Scott Lahteine
0e610815e4 No need for Cap:PAREN_COMMENTS 2018-11-16 04:28:40 -06:00
Scott Lahteine
7a075a5dc9 Tweak extruder errors 2018-11-16 01:32:21 -06:00
Scott Lahteine
2d92f333f5 Fix GcodeSuite::T active_extruder reference 2018-11-15 14:07:24 -06:00
Scott Lahteine
d2bb53702a
Optimize target_extruder, ignore T with mixing (#12432) 
* Optimize target_extruder, ignore T with mixing
* Give G-code Tn parity with tool_change
 2018-11-14 17:33:04 -06:00
Marcio Teixeira
5e586a6b39 Fix to runout sensor code. (#12431) 
- "old_state" is no longer a class static variable.
 2018-11-14 16:54:05 -06:00
Scott Lahteine
d82c350de7
Miscellaneous LCD code renaming, reordering (#12430) 
* Move special characters to language.h
* Apply some naming standards
* Clean up menu item draw functions
* Rename some Temperature methods
* UI => ExtUI
 2018-11-14 13:13:51 -06:00
Scott Lahteine
edfd106bc5
Rejigger Filament Runout class (#12428) 2018-11-14 11:45:57 -06:00
Scott Lahteine
f4c128ecaa
Move RRW keypad code to a common method (#12429) 2018-11-14 06:00:21 -06:00
Scott Lahteine
54ec5528a0 hasstatus => has_status 2018-11-14 01:34:28 -06:00
Scott Lahteine
ebf585b673 Fix an old sanity check 2018-11-14 01:15:35 -06:00
Ryan
052d102ded UltiMachine Archim 1 support (#12404) 2018-11-14 00:27:39 -06:00
Scott Lahteine
664e20754d Clean up pins files 2018-11-14 00:23:33 -06:00
Scott Lahteine
1eb5249598 Fix Formbot Trex-2+ configs 
Followup to #12422
 2018-11-13 21:53:54 -06:00
thiagodesacosta
075a22ed65 Update Portuguese-Brazilian translation (#12402) 2018-11-13 19:42:25 -06:00
Marcio Teixeira
3ceab8474c Add required "cardreader.h" include (#12419) 2018-11-13 17:12:44 -06:00
Giuliano Zaro
98c2fc4e42 Endstops fix followup (#12423) 
Followup to #12413
 2018-11-13 17:10:07 -06:00
Roxy-3D
f19fd642ce
Updates to Formbot T-Rex 2+ configuration files (#12422) 
Updates to Formbot T-Rex 2+ configuration files
 2018-11-13 13:48:35 -06:00
Roxy-3D
cda5ef08fa
Debug of G2-G3 for UBL (#12386) 
Changes only affect UBL.  Everything else is left alone.
 2018-11-13 11:20:21 -06:00
AnHardt
9ad3aed0ef Fix tool-change for MIXING_EXTRUDER with < 2 virtual tools (#12417) 
Fix #12416

Better handling of `ENABLED(MIXING_EXTRUDER) && !MIXING_VIRTUAL_TOOLS > 1` -  to not fall through to the general case. Fix compiler warnings for `#elif EXTRUDERS < 2`.
 2018-11-13 04:56:10 -06:00
Giuliano Zaro
d631267548 Refine endstops fixes (#12413) 
When endstops/probe are enabled `ENDSTOP_NOISE_THRESHOLD` calls to `update` are required to properly re-sync endstops/probe status.
 2018-11-13 04:31:58 -06:00
Scott Lahteine
0ee1a92971
Group status methods, share reset_status with Extensible UI (#12414) 
* Group status methods, share reset_status with Extensible UI
* Move common DOGM code to headers
 2018-11-13 01:47:45 -06:00
Scott Lahteine
690c4e8457 Clean TLM trailing whitespace 2018-11-13 00:03:34 -06:00
Scott Lahteine
143b2896e0
Add M412 to enable/disable filament runout detection (#12406) 2018-11-12 21:29:46 -06:00
Scott Lahteine
a163c89c6a Followup to 50af1d1 2018-11-12 20:31:53 -06:00
AnHardt
be6271767f Fix BABYSTEP_ZPROBE_OFFSET (#12408) 
Fix #12399

Did not compile without  `WATCH_HOTENDS || WATCH_THE_BED`.
Add condition to include "../../module/temperature.h".
 2018-11-12 17:44:21 -06:00
Scott Lahteine
50af1d1e08 Differentiate translated On/Off from Serial ON/OFF 2018-11-12 17:23:08 -06:00
Scott Lahteine
df907a905f Update UBL comments for debug change 2018-11-12 03:46:48 -06:00
Scott Lahteine
da17f8ad37 For now (!) don't synchronize in M204 and M205 
See if this has any deleterious effect on motion planning by slicers that inser their own jerk and acceleration controls. The problem I see is that these settings can take effect on blocks already in the planner, and the only way around this would be to shadow these settings in planner blocks and use the shadowed settings in the planner.
 2018-11-12 02:43:24 -06:00
Scott Lahteine
a3923424c7 Clean up LCD width/height determination 2018-11-12 02:37:40 -06:00
Scott Lahteine
a0c795b097
Encapsulate common display code in a singleton (#12395) 
* Encapsulate common LCD code in a singleton
* Depend more UBL code on UBL_DEVEL_DEBUGGING
  - Since most users don't need the debugging on at all times, this helps reduce the default build size for UBL by over 2K, a little closer to fitting on 128K boards.
 2018-11-11 12:16:24 -06:00
Scott Lahteine
9da6809ac3 Adjust some comment spacing 2018-11-11 11:28:50 -06:00
Scott Lahteine
471f403a67 Reduce code size with plain inlines 2018-11-11 08:36:10 -06:00
Scott Lahteine
30a49f5ee2 Apply extra condition to LCD_PROGRESS_BAR 2018-11-11 08:36:10 -06:00
Scott Lahteine
4e0c935959 Update HAL and libs formatting 2018-11-10 19:43:23 -06:00
Scott Lahteine
47483e8c17 Update Raptor config 2018-11-10 19:42:46 -06:00
Scott Lahteine
6093df11dc
Allow G26 to use the active extruder (#12387) 
* Make lcd_quick_feedback argument optional
* Add click_to_cancel option to wait_for_hotend/bed
* Have G26 use the active nozzle and wait_for_hotend/bed
* Use wait_for_release in UBL G29
* Add 'T' parameter to G26 for an initial tool-change
 2018-11-10 18:07:38 -06:00
articide
4260282df7 Tevo Little Monster example configuration (#12370) 2018-11-10 03:36:01 -06:00
Scott Lahteine
bed15fcd81 Tweak 'echo_not_entered' used by MBL's G29 2018-11-10 01:32:51 -06:00
Scott Lahteine
c239131ff5 Use 'serial_spaces' in 'print_2d_array' 2018-11-10 01:32:51 -06:00
Scott Lahteine
56150ec030 Add reference comments to MeshLevelingState 2018-11-09 21:31:20 -06:00
Ludy
24c5e57bb6 Update German language (#12379) 2018-11-09 15:25:29 -06:00
Giuliano Zaro
fd7fd55662 Solve endstops issues (#12382) 
- Partially reverts #11900 and tries to solve #12336
 2018-11-09 14:58:04 -06:00
Scott Lahteine
78ccedd6a8 Fix M91x sanity-check to permit TMC2660 
Fix #12362
 2018-11-09 05:48:15 -06:00
revilor
b60abc7c37 [2.0.x] Macro G-codes (#9365) 2018-11-09 05:25:08 -06:00
Giuliano Zaro
ccdbf20f60 Update Italian language (#12368) 2018-11-09 04:04:02 -06:00
Roman Moravčík
d08847b1a6 Update Slovak translation (#12376) 2018-11-09 04:03:07 -06:00
InsanityAutomation
7665dff58b No error on T0 with single-extruder and fix MIXING_EXTRUDER virtual tools (#12375) 2018-11-09 00:15:07 -06:00
Scott Lahteine
4ed6397e5d
More comprehensive NO_LCD_MENUS (#12367) 2018-11-09 00:07:16 -06:00
Scott Lahteine
9c8f083d6c Extend pins errors to include the processor 2018-11-08 22:25:59 -06:00
Scott Lahteine
525ea554a1 Remove obsolete comments 2018-11-08 10:55:18 -06:00
Scott Lahteine
ef724edd80 Apply HAS_LCD_MENU in EEPROM code 2018-11-08 10:03:05 -06:00
Scott Lahteine
b169320a03 Clean trailing whitespace 2018-11-07 02:40:18 -06:00
Scott Lahteine
81b1e9d272 Fix up xdiff, ydiff, zdiff in tool change 
Followup to #12137
 2018-11-06 22:56:33 -06:00
InsanityAutomation
6471a75a22 Combine more tool-change variables (#12137) 2018-11-06 22:22:20 -06:00
Scott Lahteine
147e270208 Restore GTM32_PRO_VB temp and heater pins 
Undo #12345
 2018-11-06 21:41:30 -06:00
Scott Lahteine
8def25e475 Set CUSTOM_MACHINE_NAME for some configs 2018-11-06 21:41:30 -06:00
Scott Lahteine
812f6a7dd7 Fix Resume from SD Pause 
In reference to https://github.com/MarlinFirmware/Marlin/pull/12098#issuecomment-436231690
 2018-11-06 21:09:37 -06:00
Scott Lahteine
4f72e041f2 Use card.stopSDPrint() for completeness 2018-11-06 20:55:17 -06:00
Scott Lahteine
488a17b3f5 Use IS_SD_PRINTING() more 2018-11-06 20:55:17 -06:00
Marcio Teixeira
4dbaa6369f Fix const pointer assignment compile error (#12350) 2018-11-06 19:49:39 -06:00
Giuliano Zaro
959ed32636 Update Italian language (#12352) 2018-11-06 19:30:24 -06:00
Roman Moravčík
812bfec65e Update Slovak translation (#12354) 2018-11-06 19:29:28 -06:00
Ludy
1624722566 Update German translation (#12355) 2018-11-06 19:28:40 -06:00
Scott Lahteine
e574f01568
More advanced pause tweaks (#12356) 
* Followup to LCD_TIMEOUT_TO_STATUS=0
* Make continuous purge screen fit 20x4
* Unify purge message modes
* Preserve last-set pause header mode
 2018-11-06 19:25:57 -06:00
Scott Lahteine
5a470d4a49 Apply some tool-change cleanup 2018-11-06 18:20:01 -06:00
Roman Moravčík
34ea458667 Fixed advanced pause messages (#12353) 2018-11-06 15:27:19 -06:00
Scott Lahteine
4c5ca89d8c
Show the appropriate pause message (#12348) 2018-11-06 04:13:48 -06:00
Marcio Teixeira
8517d5f915 LCD menu code refactoring and cleanup (#12308) 2018-11-05 22:51:10 -06:00
Scott Lahteine
b3b4e6dc45
Change Marlin debug flag names to fix conflicts (#12340) 
In reference to #11000
 2018-11-05 22:48:28 -06:00
Giuliano Zaro
f7e682eeee Update Italian language (#12344) 2018-11-05 22:46:59 -06:00
Phr3d13
a813900fce Add Geeetech Rostock 301 config, update GTM32 Pro VB pins (#12345) 2018-11-05 22:42:06 -06:00
Scott Lahteine
04f173790f Remove trailing whitespace 2018-11-05 22:38:20 -06:00
Scott Lahteine
c536ee1122 Clean up bq Zum Mega 3D pins 2018-11-05 22:38:20 -06:00
Scott Lahteine
c31e1735dd Restore LPC1768_PIN_INTERRUPT_M, apply to Z3 
- In reference to #12166
 2018-11-05 06:28:49 -06:00
Scott Lahteine
93d5b945dd Hide mesh editing until a valid mesh exists 2018-11-05 05:13:34 -06:00
Ludy
f34f09c821 Update German language (#12336) 2018-11-05 04:33:31 -06:00
Roman Moravčík
eefd7676a3 Updated slovak translation (#12338) 2018-11-05 04:31:12 -06:00
Scott Lahteine
486f2a66a9 Fix MBL XY parameter error messages 
Fix #11522
 2018-11-05 04:17:37 -06:00
Scott Lahteine
2613ddf61c Fix "circle" 2018-11-05 04:17:37 -06:00
Scott Lahteine
b779b42ffd Prevent current step-down going negative 
Addressing #11348
 2018-11-05 04:17:37 -06:00
Scott Lahteine
427bc64ba1 G28 O respects HOME_AFTER_DEACTIVATE 
Addressing #11271
 2018-11-05 04:17:37 -06:00
Scott Lahteine
3866aeac52 Clean up ENCODER_RATE_MULTIPLIER config 2018-11-05 04:17:37 -06:00
Scott Lahteine
498dfa291e Update and fix CHDK 2018-11-05 04:17:37 -06:00
Scott Lahteine
fed84f2961 Use multiplier edit item for mesh point editing 2018-11-05 04:17:37 -06:00
Scott Lahteine
d5ab4cd22a Provide a default for Z_PROBE_LOW_POINT 2018-11-05 04:17:37 -06:00