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

7315 commits

Author SHA1 Message Date
Scott Lahteine
c45514f811 Merge pull request #8094 from thinkyhead/bf2_neopixel_led_parity 
[2.0.x] Bring NEOPIXEL_LED into parity with 1.1.x
 2017-10-26 17:24:38 -05:00
Bob-the-Kuhn
229a27a1c7 save FLASH by using reduced font for some languages 2017-10-26 16:08:17 -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
Thomas Moore
9e699811d2 Make LPC1768 pinmapping not specific to Re-ARM (#8063) 
* Merging early because of build failures.  See #8105

* Make LPC1768 pinmapping not specific to Re-ARM

* Add HAL_PIN_TYPE and LPC1768 pin features

* M43 Updates

* Move pin map into pinsDebug_LPC1768.h

* Incorporate comments and M226

* Fix persistent store compilation issues

* Update pin features

* Update MKS SBASE pins

* Use native LPC1768 pin numbers in M42, M43, and M226
 2017-10-26 13:37:26 -05:00
Scott Lahteine
3ac581eac9 Neopixel changes for parity with 1.1.x 2017-10-25 18:40:04 -05:00
jeffyl
7b3098bbd5 Add AZSMZ Mini (#8005) 
* Add AZSMZ Mini

* Remove tabs, adjust spacing

* Renumber boards to group by family

* Patch up spacing

* Tweak
 2017-10-25 01:16:54 -05:00
Scott Lahteine
e00ed10c4c GT2560 config MKS_MINI_12864 => SDSUPPORT 2017-10-25 01:12:48 -05:00
Scott Lahteine
10a5e4d80f Merge pull request #8078 from thinkyhead/bf2_mks_mini_lcd 
[2.0.x] Add MKS MINI 12864 support to GT2560
 2017-10-25 01:10:03 -05:00
Scott Lahteine
ee9b8bf0f1 Add MKS MINI 12864 support to GT2560 2017-10-24 19:15:41 -05:00
Scott Lahteine
f65fc7ffab Merge pull request #8044 from thinkyhead/bf2_mesh_consolidate 
[2.0.x] Simplify mesh bounds config
 2017-10-24 18:56:43 -05:00
Scott Lahteine
070cd34fe8 Merge pull request #8077 from thinkyhead/bf2_MKS_BASE_followup 
Clean up HAL trailing spaces, MKS SBASE pins
 2017-10-24 18:38:48 -05:00
Scott Lahteine
7f55d82fd1 Move UBL_SAVE_ACTIVE_ON_M500 to Configuration.h 2017-10-24 18:26:43 -05:00
Scott Lahteine
90a14b4f5b Clean up HAL trailing spaces, MKS SBASE pins 2017-10-24 18:20:23 -05:00
Thomas Moore
51fafccc16 [2.0.x] Enable hardware serial ports on LPC1768 (#8004) 
* Enable hardware serial ports on LPC1768

* Fix compilation errors with other HALs

* FIx order of includes in LPC1768 HAL main.cpp

* Add support for RX_BUFFER_SIZE and TX_BUFFER_SIZE options in Configuration_adv.h
 2017-10-24 17:28:33 -05:00
Scott Lahteine
580b6e9089 Apply physical limits to mesh bounds 2017-10-24 16:54:07 -05:00
Scott Lahteine
4e2baeb3e1 Update indentation, file-wrapping for Marlin 2.0.x 2017-10-24 16:54:06 -05:00
Scott Lahteine
60af705e6d Relocate SPI.h to the HAL folder 2017-10-24 16:54:06 -05:00
Scott Lahteine
46aae4c6e7 Merge pull request #8074 from thinkyhead/bf2_verbiage_like_8061 
Fix some config verbiage
 2017-10-24 15:25:12 -05:00
Scott Lahteine
3356d5a72d Merge pull request #8072 from thinkyhead/bf2_fix_M600 
[2.0.x] Fix position sync in M600 pause/resume
 2017-10-24 14:55:46 -05:00
Scott Lahteine
5f87324536 Fix some config verbiage 2017-10-24 14:53:42 -05:00
Scott Lahteine
272f9f65dc Fix some typos 2017-10-24 14:29:15 -05:00
studiodyne
8181220bfd Fix position sync in M600 pause/resume 2017-10-24 14:29:15 -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
0cb423b5b3 Apply consistency for other configs 2017-10-21 00:41:51 -05:00
Scott Lahteine
8c78f8f790 Add Makeboard MINI for Micromake C1 2017-10-21 00:41:51 -05:00
Scott Lahteine
1fbb307aaf Merge pull request #8021 from thinkyhead/bf2_scroll_longnames 
[2.0.x] Add SCROLL_LONG_FILENAMES to reveal longer filenames
 2017-10-20 21:33:54 -05:00
Scott Lahteine
3d2b2eb1ca Prevent SDCARD_SORT_ALPHA from exploding 2017-10-20 19:13:21 -05:00
Scott Lahteine
783ddf9691 Add SCROLL_LONG_FILENAMES option 2017-10-20 19:13:21 -05:00
Roxy-3D
5439358281 Basic UBL operations working on 32-bit platforms (#8024) 
* 32-bit work for UBL

* Update FT i3-2020 reference file
 2017-10-19 10:44:45 -05:00
Scott Lahteine
9e5cbf0198 BQ should set this in its config, and does 2017-10-18 22:56:03 -05:00
Scott Lahteine
348e5e3109 Simplify Cartesian probing boundaries 
Followup to #8012
 2017-10-18 17:14:32 -05:00
Luc Van Daele
3986a84f77 boolval revisited (#8016) 2017-10-18 14:03:17 -05:00
Roxy-3D
572cf0ec95 UBL able to generate mesh and save and load it on 32-bit platforms (#8015) 
* Get UBL Mesh Generation, Mesh Save & Mesh Load working with 32-Bit platforms

* clean up read_data() and write_data() for non-LPC1768 HAL's

* Get read_data() and write_data() return codes consistent

All HAL's read_data() and write_data() return false if they succeed.

* Get read_data() and write_data() return codes to be consistent

Make read_data() and write_data() return true if an error happens.

* Say UBL is now checked out on machine types in default Configuration.h file.
 2017-10-18 14:00:29 -05:00
Thomas Moore
67cc29cd3c Update UBL mesh boundaries to accomidate beds centered at 0, 0 (#8012) 2017-10-18 10:03:30 -05:00
Roxy-3D
6cb26c98c8 Fix Baby Stepping on 32-Bit platforms (#8001) 
Also, Max7219 debug code was used for this effort.   It has been
improved and hardened.
 2017-10-16 16:29:37 -05:00
Scott Lahteine
3b7b0492f8 Merge pull request #7993 from jeffyl/bugfix-2.0.x 
[2.0.x] Proper support for AZSMZ 12864 LCD on SmartRAMPS
 2017-10-16 14:12:29 -05:00
Jeffrey Li
26531f2715 Add lcd to all sample configs 2017-10-16 03:24:25 -07:00
Scott Lahteine
ce48403a0b Add EXTRA_FAN_SPEED feature 
Based on #7883 by @studiodyne
 2017-10-16 02:34:13 -05:00
Jeffrey Li
eeb4611606 Add proper support for the AZSMZ 12864 LCD on a SMART RAMPS 2017-10-16 00:33:07 -07:00
Scott Lahteine
c46189e429 Fix UBL+Delta segmented feedrate 
Based on #7948
 2017-10-15 16:31:09 -05:00
Scott Lahteine
5c4f3e0107 Add LCD_SET_PROGRESS_MANUALLY 2017-10-15 03:05:29 -05:00
Scott Lahteine
014a83fe09 Merge pull request #7984 from thinkyhead/bf2_micromake_c1 
[2.0.x] Micromake C1 Configurations, Unaccented French
 2017-10-14 21:19:32 -05:00
Scott Lahteine
bc7df0188e Add Micromake C1 configurations 2017-10-14 20:28:12 -05:00
Scott Lahteine
34a261416f Add unaccented French language 2017-10-14 20:28:12 -05:00
Scott Lahteine
e587f0893c Define AVR_ATmega2560_FAMILY_PLUS_70 in Conditionals 2017-10-14 19:05:32 -05:00
Scott Lahteine
fd128b3c93 Fix some AVR HAL code style 2017-10-14 19:05:10 -05:00
Scott Lahteine
799360c576 Enhance Teensy/RAMPS pins files 2017-10-14 18:44:20 -05:00
Scott Lahteine
d3e5a22a5d Add MIN_SOFTWARE_ENDSTOP_[XYZ] to example configs 2017-10-14 18:44:20 -05:00
Jeff Eberl
b206f70693 Split the software endstop capability by axis. 2017-10-14 18:44:20 -05:00
Scott Lahteine
ec69e97bda Merge pull request #7974 from jeffyl/bugfix-2.0.x 
Fix include path for VIKI
 2017-10-14 17:38:42 -05:00
Morten
91e28edda6 [2.0.x] Add new board: MKS Sbase (#7945) 
* Add files via upload

* Add files via upload

* Add files via upload

* Checked LCD / edited / revised pins_MKS_BASE.h

As requested :)

* Delete Configuration_adv.h

* Delete Configuration.h

* Deleted /Marlin/Marlin/src/config/examples/MksSbase/*.* and moved them to /Marlin/Marlin/src/config/examples/Mks/Sbase/*.*

* Add files via upload
 2017-10-14 09:44:18 -05:00
Jeffrey Li
3c8a3a02ba Fix include path for VIKI 2017-10-14 04:06:17 -07:00
Scott Lahteine
4586acad8c Merge pull request #7959 from alexxy/bugfix-2.0.x 
Python isnt always python2
 2017-10-14 05:02:07 -05:00
Scott Lahteine
497f86453e Merge pull request #7964 from gallynero/patch-2 
fix 'axis_unhomed_error' not defined error
 2017-10-14 05:00:58 -05:00
Scott Lahteine
c0dddd4233 Tweaks to tool_change, GcodeSuite::T() 2017-10-14 02:53:19 -05:00
Scott Lahteine
ca66574062 ADC sensor fix inspired by 'Evgen2' on Twitter 2017-10-14 02:28:13 -05:00
Scott Lahteine
1344ca4b2f UBL no longer needs ubl_state 2017-10-14 02:18:32 -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
32c607ffe2 Ensure fade factor is recalculated if fade height changes 2017-10-14 02:18:31 -05:00
Scott Lahteine
ca1e47375c Move fade_scaling_factor_for_z to Planner 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
Scott Lahteine
58abc66c1d Tweak bed leveling conditionals 2017-10-14 02:18:31 -05:00
Scott Lahteine
1adb5a6a48 Remove obsolete UBL z_offset 2017-10-13 08:22:46 -05:00
gallynero
3619a4cbea fix 'axis_unhomed_error' not defined error 
Fix 'axis_unhomed_error' not defined error when pause with unhomed status
 2017-10-13 09:08:02 +02:00
Alexey Shvetsov
12d212d1b4 Python isnt always python2 
So now this script is compatible with both python versions 2 and 3

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
 2017-10-13 01:39:06 +03:00
Scott Lahteine
cc01a36363 Merge pull request #7947 from thinkyhead/bf2_more_READMEs 
[2.0.x] Add a README.h file for Arduino IDE users
 2017-10-12 06:56:41 -05:00
Scott Lahteine
4764710b11 Add a README.h file for Arduino IDE users 2017-10-11 18:10:15 -05:00
Bob-the-Kuhn
4e3ee845b9 config_adv (#7941) 
get rid of twi.h

move to board files
 2017-10-11 15:42:24 -05:00
Roxy-3D
0e260c6c1d Get FolgerTech i3-2020 working again with 32-bit platforms (#7944) 
Setup FolgerTech i3-2020 Configuration files as a reference platform for
32-Bit work.

Also fix MAX7219 debug lights on 32-bit platforms.
 2017-10-11 15:23:04 -05:00
Bob-the-Kuhn
26bfae58d4 MPC4451 I2C support 2017-10-11 00:30:41 -05:00
Scott Lahteine
1f5c432e29 Merge pull request #7920 from thinkyhead/bf2_neopixel_full 
[2.0.x] Move FILAMENT_RUNOUT_SENSOR to a feature
 2017-10-10 03:05:00 -05:00
Scott Lahteine
732e87e83c Merge pull request #7892 from GMagician/Serial-double-echo-fix 
[2.0.x] Serial double echo fix
 2017-10-10 02:42:16 -05:00
Scott Lahteine
f8e8fcb978 Move FILAMENT_RUNOUT_SENSOR to a feature 2017-10-10 02:37:42 -05:00
Slawomir Ciunczyk
a11e6a1022 Different NEOPIXEL types 
Same as #7728 but for 2.0.x,
Lot of cleanup and remove references in whole code to other "LED files" than leds.h. Now will be much easier to add next drivers/libraries. e.g. FastLED. But bad news, currently FastLED is suporting only RGB devices (no RGBW)
 2017-10-10 02:17:36 -05:00
Scott Lahteine
b30b55307c Merge pull request #7909 from thinkyhead/bf2_goodbye_legacy_advance 
[2.0.x] Remove legacy ADVANCE feature
 2017-10-10 00:31:18 -05:00
Scott Lahteine
1d04197f2f Merge pull request #7916 from thinkyhead/bf2_probeless_ubl 
[2.0.x] Allow UBL G29 and G26 to build without a probe
 2017-10-10 00:30:27 -05:00
Thomas Moore
9b0ee53b12 Use segmented moves when moving axis from LCD 2017-10-09 23:25:43 -05:00
Scott Lahteine
442669d23c Allow UBL to build without a probe 2017-10-09 18:57:41 -05:00
Scott Lahteine
20ebe218c8 Tweaks to VIKI lcd support 2017-10-09 17:01:07 -05:00
Scott Lahteine
09fa34a9e1 Modernize configs 2017-10-09 16:18:10 -05:00
Scott Lahteine
560d366b80 Move VIKI SCK/MOSI pins fix to Conditionals_POST.h 2017-10-09 16:13:49 -05:00
Scott Lahteine
e9bcb9d048 Add 4 new LCD displays 2017-10-09 15:58:02 -05:00
Scott Lahteine
03f4891fb9 Remove legacy ADVANCE feature 2017-10-09 04:25:18 -05:00
GMagician
546f02c6f4 [2.0.x] Addressing #7896 
Compiler error, added char c variable
 2017-10-08 23:16:35 +02:00
GMagician
eb96d37da0 Serial double echo fix 
Fix double character sent when TX buffer size is 0 on mega2560
 2017-10-07 22:20:00 +02:00
Scott Lahteine
deeea98d22 LCD filename already concatenated 2017-10-07 15:16:05 -05:00
Scott Lahteine
a058638d11 Merge pull request #7875 from thinkyhead/bf2_fill_eeprom_dat_ff 
[2.0.x] Update LPC persistent store to initialize eeprom.dat with FF
 2017-10-07 15:13:21 -05:00
Scott Lahteine
ae1a18d0a1 LCD filename already concatentated 2017-10-07 15:10:15 -05:00
Scott Lahteine
12aa1b999a Fix display issue with SD_SORT_ALPHA cached names 2017-10-07 15:08:08 -05:00
Dave Johnson
9d0e4ea3d5 [2.0.x] Auto-enable DISABLE_REDUCED_ACCURACY_WARNING if HOME_AFTER_DEACTIVATE enabled (#7879) 
* Auto-enable DISABLE_REDUCED_ACCURACY_WARNING if HOME_AFTER_DEACTIVATE enabled

If HOME_AFTER_DEACTIVATE, there is no need to warn on LCD since printer will home prior to starting print.  Saves 60 bytes PROGMEM on AVR with U8g panel.

* Reduce lines used

* Reduce lines used
 2017-10-07 15:02:55 -05:00
Scott Lahteine
8315a8a716 Apply fixes for DUE 
Alternative to #7882. If F_CPU is greater than 1000 it can be evenly divided by 8. Over 10000, 16; over 100000, 32; over 1 million, 64; etc.
 2017-10-07 14:31:18 -05:00
Scott Lahteine
4b36a542e0 Merge pull request #7876 from thinkyhead/bf2_hotend_messages 
[2.0.x] Addressing #7612
 2017-10-07 13:37:43 -05:00
Unknown
12730c1303 [2.0.0] Resolve USE_CONTROLLER_FAN compile errors 
Add to controllerfan.cpp:
#include "../module/stepper_indirection.h"
#include "../module/temperature.h"
 2017-10-07 05:26:36 -07:00
Scott Lahteine
7fb3343bda [2.0.x] Addressing #7612 
Change "extruder" to HOTEND in sanity error messages
 2017-10-07 02:27:26 -05:00
victorpv
8998f31ee1 Update LPC persistent store to initialize eeprom.dat with FF 
This change initialize any data in eeprom.dat beyond the current file size to FF.
That way if eeprom.dat is deleted and created again, it doesn't take the old values or random ones, but rather starts with FF in all positions as a real brand new or erased eeprom.dat
Currently if you delete eeprom.dat and restart the board, the new file is created in the same sector with the same content, since FAT does not actually delete the data, just marks the sector as free. I tested by deleting the file, and then rebooting the board, and checking the file content.
The change can be tested in the same way, deleting, rebooting the board, and then the new content should be all FF.

If an eeprom file already exist with data on it, but smaller than E2END, it will be padded with FF on first access, so it will not have random or old content appended.
 2017-10-07 02:18:42 -05:00
Scott Lahteine
2aa22c5a5e Merge pull request #7874 from thinkyhead/bf2_anet_encoder_pulses 
[2.0.x] Fixing ANET encoder pulses
 2017-10-07 01:21:23 -05:00
Scott Lahteine
f99d1dedae Fixing #7833 
Derived from #7873
 2017-10-07 00:10:05 -05:00
Scott Lahteine
de84f57a9c Patch SD file draw bug 2017-10-06 23:57:11 -05:00