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

261 commits

Author SHA1 Message Date
Scott Lahteine
0ea60d506a Clear up LCD-related compile issues 2018-05-15 00:06:59 -05:00
Scott Lahteine
f07260c33f Don't babystep on long click unless printing 
As pointed out in #10731
 2018-05-13 08:11:35 -05:00
Scott Lahteine
99ecdf59af Smarter MIN, MAX, ABS macros 
Use macros that explicitly avoid double-evaluation and can be used for any datatype, replacing `min`, `max`, `abs`, `fabs`, `labs`, and `FABS`.

Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-05-13 04:52:56 -05:00
Scott Lahteine
083ec9963e Tweaks to heater / lcd conditions 2018-05-13 04:52:56 -05:00
Scott Lahteine
306f0f2135
Move Stepper::synchronize to Planner (#10713) 
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-05-12 01:38:02 -05:00
Scott Lahteine
325bbbc8c2
[2.0.x] Enable AD595 and AD8495 in concert (#10693) 
* Allow both AD595 and AD8495 in concert
* General temperature code tweaks
 2018-05-11 01:01:51 -05:00
Scott Lahteine
a1fab8336e Fix abort of SD printing 2018-05-07 02:52:26 -05:00
Scott Lahteine
81b632c255 Additional temp-oriented improvements 2018-05-02 08:43:22 -05:00
Scott Lahteine
b7e938a9fb LCD_BED_LEVELING enables a sub-menu for ABL 2018-05-01 07:13:56 -05:00
Scott Lahteine
a90d99c27c Rename float32 => float52, etc. 2018-05-01 07:08:47 -05:00
Scott Lahteine
05fca752d6 Clean up autostart handling 2018-05-01 01:35:57 -05:00
Scott Lahteine
05c33833e7
[2.0.x] Add NO_LCD_MENUS option (#10582) 2018-04-30 21:16:31 -05:00
Scott Lahteine
524cc392f4 Fix sd_status comparison 
Co-Authored-By: perkmeister <perkmeister@users.noreply.github.com>
 2018-04-30 21:09:50 -05:00
Scott Lahteine
9e0d99c0c6
Round all floats in string conversion functions (#10566) 2018-04-29 00:51:36 -05:00
Scott Lahteine
cb46cb8480
Add HAS_HEATED_BED conditional (#10495) 2018-04-23 17:13:01 -05:00
Scott Lahteine
9e07df5c1b
Extra options for LEVEL_BED_CORNERS (#10483) 2018-04-22 02:50:48 -05:00
Scott Lahteine
023385ca59
Merge pull request #10479 from thinkyhead/bf2_creality_power_loss_resume 
[2.0.x] Creality3D Power-Loss Recovery
 2018-04-22 00:17:44 -05:00
Scott Lahteine
3396671011
[2.0.x] Reset LCD status to fallbacks (#10470) 
* Remove obsolete strings
* Tweak some static consts
* Reset LCD status to fallbacks
 2018-04-22 00:16:30 -05:00
Scott Lahteine
11ab017dd0 Creality3D Power-Loss Recovery 2018-04-21 21:56:50 -05:00
Scott Lahteine
78ea4871f9 Fix up enqueue now functions 
…and apply to MALYAN_LCD.
 2018-04-19 19:45:53 -05:00
Scott Lahteine
df2f24617b Use 0 as the bed position (not Z_MIN_POS) 2018-04-17 20:32:56 -05:00
Scott Lahteine
e4acd2c40e One fewer compare in _lcd_move_xyz 2018-04-17 16:03:15 -05:00
Scott Lahteine
6c7a17dba6
Abort SD printing more safely (#10407) 
Allow the current command to complete when aborting an SD print, otherwise some commands (G28, G29, etc.) will cause trouble.
 2018-04-15 18:27:54 -05:00
KangDroid
6c535081ec [2.0.x] Add optional menu item to toggle software endstops (#10389) 2018-04-13 00:24:09 -05:00
Scott Lahteine
0535ebc4d2 MESH_BED_LEVELING before PROBE_MANUALLY 2018-04-12 22:45:52 -05:00
Luc Van Daele
12785583d0 [2.0.x] G33 MIN_STEPS_PER_SEGMENT (#10386) 2018-04-12 20:22:29 -05:00
Yunhui Fu
c96412a78f [2.0.x] UTF-8 language translation support (#10213) 2018-04-12 20:14:01 -05:00
Luc Van Daele
646aa20b43 Overhaul of G33 Delta Calibration (#8822) 2018-04-11 21:14:48 -05:00
Sean
2fa0a73c2c Implement filament change continuous purge 2018-04-04 20:57:51 -05:00
Scott Lahteine
adcb87f0db Z Endstop Servo => Z Probe Servo 2018-04-01 23:54:21 -05:00
Scott Lahteine
6098efcc59 Use float62 for LCD edit of Z Fade 2018-03-31 20:03:09 -05:00
Scott Lahteine
1cb810ff1c
[2.0.x] Automatically reset stepper timeout (#10179) 
* Automatically reset stepper timeout in manage_inactivity

Any code that adds moves to the planner can skip resetting the stepper timeout. We can let `idle` / `manage_inactivity` reset the timer whenever it detects any moves in the planner.

* blocks_queued => has_blocks_queued
 2018-03-21 19:30:06 -05:00
Scott Lahteine
fbdc5ad962 Prevent lcd_update stack overflow on SD Card change 2018-03-18 18:58:10 -05:00
Scott Lahteine
f1327fd5f9 Use lcd_goto_previous_menu_no_defer more 2018-03-14 00:50:15 -05:00
Scott Lahteine
51ebdf3b7d Finish scroll_screen with menu direction/multiplier 
Fixes #10041
 2018-03-11 04:41:12 -05:00
Scott Lahteine
3c2bfa5e53
Update powersupply_on in power_on/off (#10015) 
Fix #10004
 2018-03-08 18:56:47 -06:00
Scott Lahteine
1913c37a91 Tweak to manual move eindex arg 2018-03-08 16:20:24 -06:00
Scott Lahteine
03e3011332 Fix compile error with MAX_MESSAGE_LENGTH 
Fix #9988
 2018-03-07 21:57:01 -06:00
Scott Lahteine
be0e100fed Fix sd subdirectory encoder position 
Followup to 7e386c7
 2018-03-07 16:54:19 -06:00
Scott Lahteine
0149680f54 Fix compile error with char LCD 2018-03-07 16:25:37 -06:00
Scott Lahteine
7e386c7e98 Fix encoder position for sddirectory 2018-03-07 05:23:03 -06:00
Scott Lahteine
22a017a856
Rebuild SD file sort array on Stop SD Print (#9976) 
Thanks Chuck Hellebuyck.
 2018-03-07 01:42:11 -06:00
Scott Lahteine
f9cafc4001
Fix menu highlight glitch, tweak scrolling code (#9957) 2018-03-05 23:05:15 -06:00
Scott Lahteine
2d1233b86c Fix lcd_quick_feedback call for BTN_BACK 2018-02-28 20:24:11 -06:00
Scott Lahteine
8bffb26c23 Fix manual move position display 
Manual moves now correctly include the workspace offset.
 2018-02-28 17:33:23 -06:00
Scott Lahteine
35ec67885a
Add support for BACK button (RADDS) (#9835) 2018-02-26 22:52:57 -06:00
TheSFReader
eb079959fb Report sd card progress [FR] #9751 (#9832) 
* SD Status auto-report feature
Feature Request #9751
 2018-02-26 15:38:27 -06:00
Scott Lahteine
43ff15244d Fix a progress bar condition 2018-02-23 19:43:44 -06:00
Scott Lahteine
2bd252b501
[2.0.x] LIN_ADVANCE v1.5 (#9712) 2018-02-23 00:53:29 -06:00
Studiodyne
9c9cd54ef3 Add Z Fade Height edit to UBL and Tune submenus (#9738) 2018-02-23 00:29:58 -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
72f63a4980 Fix DOGM progress bar with LCD_SET_PROGRESS_MANUALLY 2018-02-21 19:47:04 -06:00
Scott Lahteine
fc460fff94 Extend menu items for SWITCHING_EXTRUDER 
Reference #5367
 2018-02-19 11:12:42 -06:00
Scott Lahteine
25e3e62354 Null-terminate lcd_status_message 2018-02-19 10:12:16 -06:00
Thomas Moore
cff62042ee Fix LCD manual movement on kinematic machines (#9655) 2018-02-16 02:34:36 -06:00
Scott Lahteine
93c0198b2d Init LCD welcome message programmatically 2018-02-14 05:09:44 -06:00
Scott Lahteine
e6b8207b03 Restore welcome message 2018-02-12 01:02:30 -06:00
GMagician
299606e4ae [2.0.x] Memory overflow protection (#9562) 2018-02-10 14:14:34 -06:00
Scott Lahteine
5a70887467
Size lcd_status_message based on language (#9545) 2018-02-08 23:03:47 -06:00
Scott Lahteine
e5ee0b6f6c Implement MALYAN_LCD 2018-02-04 18:52:44 -06:00
Scott Lahteine
2ea4e74ed3 Misc. comments 2018-02-04 17:40:39 -06:00
Thomas Moore
786746404b [2.0.x] Apply feedrate to nozzle movement for kinematic machines (#8778) 2018-02-04 00:26:05 -06:00
Scott Lahteine
79796b22ad Fix up _Bootscreen.h and _Statusscreen.h 2018-02-02 00:57:16 -06:00
Scott Lahteine
61bf8478a2 Add hotEnough methods 2018-01-22 04:38:37 -06:00
GMagician
719cd53e09 Standardized max temp values 
Everywhere in menu items temperatures are "defined value" subtracted by 15.
In one place is subtracted by 5
 2018-01-19 19:32:46 +01:00
Roxy-3D
f5f1b069ad
Convert UBL mesh tilting to all use the same algorithm (#9204) 
A number of regressions were patched also. The UBL G29 P2 and P4 Press and Hold had stopped working. It is very possible this is broken in the bugfix_v1.1.x branch also.

The main purpose of the Pull Request is to get the 3-Point mesh tilting to use the LSF algorithm just like the grid based mesh tilt. This simplifies the logic and reduces the code size some what. But the real reason to do it is the 3-Point case can be solved exactly. And by feeding these numbers into the LSF algorithm it provides a way to check all that code for 'correctness'.
 2018-01-16 11:08:00 -06:00
Bob-the-Kuhn
e633ce06c7 LCD contrast type mismatch is back 
WORKS!
 2018-01-11 10:32:58 -06:00
Tannoo
f26805e862 [2.0.x] UBL Mesh Storage Message (#9095) 2018-01-07 20:33:53 -06:00
Bob-the-Kuhn
cb0e826c5d
Merge pull request #9068 from Bob-the-Kuhn/SD-detect 
[2.0.x] SD card detect improvement
 2018-01-05 21:09:57 -06:00
Bob-the-Kuhn
f72b0a7b04 1234 2018-01-05 20:36:05 -06:00
Scott Lahteine
e89f1453ab UBL G29 works without settings.load() 2018-01-05 15:48:34 -06:00
Scott Lahteine
7541316bb4 Add M701/M702 Filament Load/Unload, M603 2018-01-04 15:07:37 -06:00
Scott Lahteine
455592eee8 Improvements to LCD menu macros 2018-01-04 03:56:36 -06:00
Tannoo
e43f3ac989 EEPROM init fix 2018-01-03 04:31:01 -06:00
Scott Lahteine
fc67c64b8f
Merge pull request #8989 from tcm0116/2.0.x_ubl 
[2.0.x] Fix UBL compilation warnings
 2018-01-02 21:38:45 -06:00
Thomas Moore
8afc4f8d9d Fix UBL compilation warnings 2018-01-02 21:00:06 -06:00
Bob-the-Kuhn
e9fc7bc69c
Merge pull request #9000 from Bob-the-Kuhn/2.0-LCD-contrast 
[2.0.x] lcd_contrast type mismatch work around
 2018-01-02 18:46:31 -06:00
Roxy-3D
39e5fabfa9
Z BabyStepping should not be dependent on a bed leveling system being active 2018-01-01 14:46:50 -06:00
Bob-the-Kuhn
ef911a2d12 works 2018-01-01 14:35:16 -06:00
Scott Lahteine
2929c9e56f A specific option to SLIM_LCD_MENUS 2017-12-31 00:11:22 -06:00
Scott Lahteine
615146c069 Enqueue commands better in ultralcd.cpp 2017-12-30 04:44:59 -06:00
Scott Lahteine
9ecdd1f4c7 Multi extruder support for M600 and LCD 2017-12-27 04:33:25 -06:00
Scott Lahteine
a1ce6e8ff4 Clear lcd_clicked immediately on use 2017-12-26 22:26:04 -06:00
Scott Lahteine
f163eede78 No sub-menu if NO_VOLUMETRICS 
For parity with #8911
 2017-12-26 18:28:42 -06:00
Scott Lahteine
4ef965cc40 Fix compiler warnings 2017-12-25 08:53:01 -06:00
Scott Lahteine
4b49ea1e92 General cleanup of config-store, reset_bed_level 2017-12-25 05:16:01 -06:00
Scott Lahteine
933f76fda3 Option to disable all volumetric extrusion 2017-12-19 19:51:25 -06:00
Scott Lahteine
de5ca96654 More parity with 1.1.x, plus whitespace 2017-12-19 18:36:16 -06:00
Scott Lahteine
9898b96992 No lcd_map_control flag in quick_stop 2017-12-06 22:23:34 -06:00
Scott Lahteine
c846388a65 Standardize LCD interface code for UBL a little 2017-12-06 21:50:54 -06:00
Scott Lahteine
2fde60da12 Changes for parity with 1.1.x 2017-12-06 21:50:54 -06:00
Scott Lahteine
aeb5c623c1 Show "Level Bed Corners" with UBL too 
Addressing #8676
 2017-12-05 21:58:43 -06:00
Scott Lahteine
e37dd64548 Apply LEDColor, language fixes 2017-11-29 23:58:12 -06:00
Tannoo
cf0f78336b New Feature: LED_CONTROL_MENU 2017-11-29 21:02:55 -06:00
Scott Lahteine
276271e72f Make MBL work more like PROBE_MANUALLY 2017-11-27 02:12:29 -06:00
Scott Lahteine
f90c075d1f SD Menu patches 2017-11-26 01:14:18 -06:00
Scott Lahteine
9b64be0bc5 Fixes for leveling sub-menus 2017-11-26 00:05:36 -06:00
Scott Lahteine
5926c9c97b Followup for MESH_EDIT_GFX_OVERLAY 2017-11-24 15:53:25 -06:00
Scott Lahteine
c6b0c104bb Adapt G26 to work for all meshes 2017-11-23 22:31:37 -06:00
Scott Lahteine
9406c87a97 Fix up LCD init / charset 2017-11-22 18:22:55 -06:00
Scott Lahteine
56c02b7f59 Shift register buttons question 
Can LCD shift registers keep up with faster MCUs?
 2017-11-21 16:12:40 -06:00
Scott Lahteine
3994d3b935 General cosmetic LCD 2017-11-21 16:12:40 -06:00
Scott Lahteine
6e533748eb Fixes #8472 2017-11-18 05:15:55 -06:00
Scott Lahteine
3bba7d60f3 No retroactive changes with M851 Z 
If using babystep to adjust the Z probe offset, the axis will move and the mesh will be updated at the same time, causing a doubling of the Z offset over the rest of the print.

To correct for this, the current Z position would need to be modified in the opposite direction, canceling out the additional Z offset added to the mesh. This would be confusing to users, and moreover it would not be accurate without also taking the current Z fade level and current Z height into account.

It might make sense to change the mesh in the case where no babystepping is taking place, but this could be considered an undesirable side-effect of changing the `zprobe_zoffset`.

One way to remedy this would be to return to storing the mesh with `zprobe_zoffset` included, then subtracting `zprobe_zoffset` from the returned Z value. Thus, a babystep moving the Z axis up 1mm would subtract 1 from `zprobe_zoffset` while adding 1 to all mesh Z values.

Without including the `zprobe_zoffset` in the `z_values` there is no safe way to alter the mesh in conjunction with babystepping, although it's fine without it.
 2017-11-18 03:36:39 -06:00
Scott Lahteine
36426af564
Merge pull request #8356 from tcm0116/2.0.x-M600 
[2.0.x] Normalize load/unload length in M600
 2017-11-10 19:44:08 -06:00
LVD-AC
e334efb2a7 PROBE_MANUALLY etc. 2017-11-10 19:27:33 -06:00
Scott Lahteine
cba9c1cf9e Add pre-calculated planner.e_factor 2017-11-10 03:14:24 -06:00
Thomas Moore
f34c3597dc Add delta_height variable in lieu of using home_offset 2017-11-08 22:10:08 -06:00
Scott Lahteine
82f45c3e6a Patch G33 misuse of PROBE_MANUALLY 2017-11-08 00:36:06 -06:00
Scott Lahteine
064e6fe60e Remove debugging pin toggle from LCD code 2017-11-07 23:00:54 -06:00
Bob-the-Kuhn
0483a7df91 AVR RRD works 
LPC1768 VIKI2 & RRDFG are working

looks like all SPIs are working

library change

sh1106 locks up

fixed lockup, started I2C SW com

pretty

re-org

restore a few files

make library happy

switched HAL version of rrd

fix travis error

travis error fixes

another travis fix

cleanup

minor update

one more

correct spacing in platformio.ini
 2017-11-07 18:40:29 -06:00
Scott Lahteine
ca7d36d9ed RAMPS pins for ANET_KEYPAD_LCD 2017-11-04 21:22:53 -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
f8393a0908 Operate in Native Machine Space 2017-11-04 00:05:38 -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
e5ae545647 Remove ADCKey steps acceleration 2017-11-03 03:41:55 -05:00
Scott Lahteine
03e5369411 Faster menu navigation for Anet A8 
Addressing #8166
 2017-10-31 14:46:55 -05:00
Scott Lahteine
2cdde08339 Apply items specified in code review 
Followup to #8122
 2017-10-30 15:03:07 -05:00
Bob-the-Kuhn
b7a66742dd tested 
add sort alpha section to other LPC1768 boards
 2017-10-30 13:01:19 -05:00
Scott Lahteine
12458cefc4 Remove 5s timer hack. Encoder pos is saved on print start! 2017-10-29 22:45:19 -05:00
Scott Lahteine
9a4cf11835 Remove return_to_status_ms hack, just use defer... 2017-10-29 22:45:18 -05:00
Scott Lahteine
8949c8c0a5 Move SD_REPRINT_LAST_SELECTED_FILE to ultralcd.cpp 2017-10-29 22:45:18 -05:00
Scott Lahteine
b338cafc65 Merge pull request #8111 from thinkyhead/bf2_fwretract_fix_oct26 
[2.0.x] Improved Firmware Retraction logic
 2017-10-27 02:02:06 -05:00
Scott Lahteine
ada90f7335 Clean up trailing spaces 2017-10-26 23:33:43 -05:00
studiodyne
eb02f8c719 Improve FWRETRACT logic, add common sense 2017-10-26 22:22:54 -05:00
Roxy-3D
3f5f39576b Reprint option for last SD Memory card file (#8106) 
* Re-Print of same SD Memory Card file with single click

* Re-Print of same SD Memory Card file with single click
* This is the bugfix-v2.0.0 version of  https://github.com/MarlinFirmware/Marlin/pull/8104
 2017-10-26 15:50:18 -05:00
cdedwards
6296ab2173 Add GFX overlay to UBL mesh edit (#8038) 
* Add GFX overlay to UBL mesh edit

Fixed misplaced HAS_TEMP_BED in dogm_bitmaps.h

rename _lcd_babystep_zoffset_overlay to _lcd_zoffset_overlay_gfx and move it out of BABYSTEP_ZPROBE_OFFSET to we can use it for over things. Add this function into UBL mesh edit screen.

update all Configuration.h to add ENABLE_MESH_EDIT_GFX_OVERLAY

* Add Sanity to UBL  insanity

Need to check for DOGLCD  otherwise error out.
 2017-10-24 14:14:03 -05:00
Roxy-3D
72156a2029 change to better (more clear) names (#8050) 
set_destination_to_current() changed to set_destination_from_current()

set_current_to_destination() changed to set_current_from_destination()
 2017-10-21 11:42:26 -05:00
Scott Lahteine
783ddf9691 Add SCROLL_LONG_FILENAMES option 2017-10-20 19:13:21 -05:00
Scott Lahteine
ce48403a0b Add EXTRA_FAN_SPEED feature 
Based on #7883 by @studiodyne
 2017-10-16 02:34:13 -05:00
Scott Lahteine
5c4f3e0107 Add LCD_SET_PROGRESS_MANUALLY 2017-10-15 03:05:29 -05:00
Jeff Eberl
b206f70693 Split the software endstop capability by axis. 2017-10-14 18:44:20 -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
9a930ebec2 Make leveling_is_active a macro 2017-10-14 02:18:31 -05:00
Thomas Moore
9b0ee53b12 Use segmented moves when moving axis from LCD 2017-10-09 23:25:43 -05:00
Scott Lahteine
ca3c9baf1b Fix DUAL_X_CARRIAGE manual moves, add T0/T1 menu item 2017-10-02 23:35:55 -05:00
Scott Lahteine
a8b8d4e85e Add a typedef for MENU_ITEM(function,…) functions 2017-10-02 23:33:57 -05:00
Scott Lahteine
90af1fe5ee Implement NO_MOTION_BEFORE_HOMING option 2017-10-01 21:58:50 -05:00
Scott Lahteine
ac41eb5871 Merge pull request #7722 from tcm0116/2.0.x-warnings 
Cleanup 2.0.x compiler warnings
 2017-10-01 21:56:54 -05:00
Thomas Moore
ae2173cd52 Synchronize retractions 2017-09-30 17:28:46 -05:00
Thomas Moore
0cb00f52d9 Cleanup warnings 2017-09-30 16:47:17 -05:00
Scott Lahteine
604b804125 Add confirmation step to Init EEPROM 2017-09-27 11:31:38 -05:00
Tannoo
c869dc9745 User script return-to-status option 2017-09-27 11:31:38 -05:00
Scott Lahteine
ce1638e32f Add Babystep Z graphic overlay 
See PR #7593
 2017-09-27 01:25:05 -05:00
Scott Lahteine
92dbf5f148 Fix babystep edit label, allowing translation 2017-09-26 23:43:05 -05:00
Scott Lahteine
7a29f802d0 Fix ENCODER_PULSES_PER_STEP for G3D_PANEL 2017-09-26 23:43:05 -05:00
Scott Lahteine
6d5fcac54a G33 changes from 1.1.x 2017-09-24 14:16:23 -05:00
Scott Lahteine
71d63fcafb Apply LCD changes from 1.1.x 
Changes from #7720
 2017-09-23 21:50:44 -05:00
Scott Lahteine
bfd1e75c04 Patch for caselight + lcd compile issues 2017-09-23 18:12:04 -05:00