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

9594 commits

Author SHA1 Message Date
Scott Lahteine
f5eab912ed
Apply #pragma once, misc cleanup (#12322) 
* Apply #pragma once in headers
* Adjust some thermistors formatting
* Misc cleanup and formatting
 2018-11-04 02:25:55 -06:00
Scott Lahteine
8696f882a9
Merge pull request #12313 from thinkyhead/bf2_scara_home_offset 
Revive SCARA home offset (not fully implemented)
 2018-11-03 07:05:24 -05:00
Scott Lahteine
56d2dcb184 Use first_page flag in place of page.page == 0 2018-11-03 06:59:21 -05:00
Scott Lahteine
d1ff22b983 Revive SCARA's home offset (unimplemented) 2018-11-03 06:24:41 -05:00
Scott Lahteine
2c9586be0c Clear up HAS_WORKSPACE_OFFSET meaning 2018-11-03 04:06:37 -05:00
Scott Lahteine
6e3caf23b6 IS_DELTA => ENABLED(DELTA) 2018-11-03 03:57:11 -05:00
Scott Lahteine
19f49db96f Tweak / reduce menu items 2018-11-03 01:18:59 -05:00
Scott Lahteine
e4cf175163
Synchronize on M204, M205 (#12302) 
* Add parser.seen for multiple parameters
* Fix M666, use !seen for report
* Synchronize on M204, M205
 2018-11-03 01:16:37 -05:00
Ludy
5ba6607181 Fix keypad-related compile error (#12306) 2018-11-02 22:29:32 -05:00
Scott Lahteine
2fb2e286ee Followup to #12256 2018-11-02 01:32:24 -05:00
Scott Lahteine
3eb9838dca Simplify TMC sanity-checks 2018-11-02 01:15:49 -05:00
Scott Lahteine
f5b31e218d Followup to #12082 2018-11-02 01:15:27 -05:00
Scott Lahteine
31c28d0dd2
Drop pgm_read_*_near and let headers choose (#12301) 
- Drop `pgm_read_*_near` and let headers choose.
- Define `USE_EXECUTE_COMMANDS_IMMEDIATE` as a conditional.
- Add `process_subcommands_now` for SRAM-based commands.
 2018-11-02 00:42:16 -05:00
Scott Lahteine
fce150f094 inline static => static inline 2018-11-01 23:15:17 -05:00
Giuliano Zaro
323c088356 Restore LED light color after pid tuning (#12082) 2018-11-01 22:04:19 -05:00
Ludy
9f77df2590 Followup to menu refactor. TMC warnings, sanity. (#12288) 
- Followup fixes for menu refactor
- Fix TMC sanity checks, unused var warnings
 2018-11-01 16:13:33 -05:00
Nils Hasenbanck
cafabf2055 Implement DELAY_NS with CYCCNT on Cortex-M7 (#12283) 2018-11-01 16:11:51 -05:00
Scott Lahteine
f5498168ae Ensure PENDING/ELAPSED use a 32-bit integer 2018-11-01 16:08:23 -05:00
MasterPIC
6e041b9c61 Use blink to show more info on LCD (#12256) 2018-11-01 15:56:12 -05:00
Scott Lahteine
eb5600acd2 Add parentheses to LCD_CLICKED 2018-11-01 15:06:14 -05:00
Scott Lahteine
42f8b6c530
Make M125 work with SDSUPPORT (#12289) 2018-11-01 15:03:45 -05:00
Scott Lahteine
f319087372 Followup to #12293 2018-11-01 14:41:03 -05:00
AnHardt
74bbb13008 Fix Mixer calculations for 32-bit processors (#12293) 2018-11-01 14:38:45 -05:00
Scott Lahteine
549d11225a Add to description of Z_STEPPER_AUTO_ALIGN 
In response to #12272
 2018-10-31 18:07:20 -05:00
Scott Lahteine
2cff0d1f39 Move menu_level_bed_corners to its own file 2018-10-31 17:44:42 -05:00
Scott Lahteine
44f2a82a56 Move axis_homed, axis_known_position to motion.* 2018-10-31 17:44:42 -05:00
Scott Lahteine
946cf8b453 EEPROM read code grouping 2018-10-31 16:43:46 -05:00
Ludy
f2adb4b9cc Update German language (#12280) 2018-10-31 16:40:41 -05:00
Karl Andersson
484ca68228 Fix misplaced parentheses (#12284) 2018-10-31 15:34:37 -05:00
Scott Lahteine
1d366db764 Tweaks to CR-10S configuration 2018-10-30 23:36:32 -05:00
Scott Lahteine
b5d7f69b51 Followup to #12249 2018-10-30 22:51:45 -05:00
N95JPL
b780b69c62 Use font ascent and descent for line positioning (#12224) 2018-10-30 22:39:44 -05:00
Scott Lahteine
9cd3529108 Organize language data, fix Korean and Danish 2018-10-30 20:41:16 -05:00
Chris Pepper
66d44c72c3 Add fast binary file transfer to SD card option (#12249) 2018-10-30 19:44:12 -05:00
Marcio Teixeira
72d8adfd1e Cleanup and refactor EXTENSIBLE_UI (#12227) 
- Add `axis_t`, `extruder_t`, `heater_t`, and `fan_t` to eliminate ambiguity, improve type safety.
- Regularized getter/setter argument order and naming.
- `setAxisPosition` no longer stacks moves in the buffer, allowing it to be called repeatedly on each touch ui tap.
- Implement better manual moves for `EXTENSIBLE_UI` (#12205)
- Calling `setAxisPosition_mm` no longer buffers the entire move to the new position, but instead causes small moves towards it to be made during the idle loop. This allows the user to adjust the destination even after the move has started and makes the UI feel much more responsive.
- As suggested by @ejtagle, the new code keeps the planner buffer full to ensure smooth motion without stops and starts.
- Change `En`, `Hn` and `FANn` to zero-based indices.
- Labels consistent with the rest of Marlin code.
 2018-10-30 19:42:26 -05:00
Karl Andersson
1946f729fd STM32 FastIO using register access (#12276) 2018-10-30 19:25:44 -05:00
Scott Lahteine
56057bcecd Fix lcd_impl_status_screen_1 2018-10-30 19:24:16 -05:00
Scott Lahteine
4ed579cafc Americanized English spelling 2018-10-30 18:55:38 -05:00
Scott Lahteine
9e663a624b Apply #pragma once to configuration files 2018-10-30 18:35:12 -05:00
Scott Lahteine
98c32d8df1 Fix a config endif label 2018-10-30 18:28:16 -05:00
Scott Lahteine
3583e2b449
Followup to Menu Refactor (#12275) 2018-10-30 16:34:45 -05:00
TheLongAndOnly
5536228359 G34 Auto-align multi-stepper Z axis (#11302) 2018-10-29 14:01:36 -05:00
Scott Lahteine
f9b80e7217 Make getfilename_sorted standard for listings 2018-10-29 13:54:21 -05:00
Scott Lahteine
5ead026967 Fix menu_temp_xx_filament_change menu items 2018-10-28 20:43:33 -05:00
Scott Lahteine
d632e44c8c
[Merge] Refactor LCD menus / screens (#12199) 2018-10-28 18:18:22 -05:00
Ludy
1f9806875c Update German language (#12261) 2018-10-28 18:11:55 -05:00
mholeys
63ce8baa55 Fix Teensy 3.5/3.6 ADC access for ADC1 (#12258) 2018-10-28 15:51:49 -05:00
Scott Lahteine
3a935fd72b Reduce repetition in menu edit items 2018-10-28 15:46:45 -05:00
Scott Lahteine
b063b1b722 Reorganize includes and declarations 2018-10-28 15:46:45 -05:00
Scott Lahteine
43cf913048 Move SD Card Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
0161d3f733 Move Custom User Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
3b0d2330b6 Move Delta Calibrate Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
6896847210 Move LED Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
9cd5471202 Move Job Recovery Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
9f11e0284c Move Filament Change Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
d87ab3ed20 Move Advanced Settings Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
587a64d80c Move Bed Leveling Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
96f313fb41 Move Info Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
423ab029b2 Move Temperature Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
489017995e Move UBL Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
a489c9fa52 Move Motion Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
3a9ad9f2b1 Move Configuration Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
143d4ec043 Move Tune Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
829effc1fe Move Main Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
37ff663b02 Convert LIGHTWEIGHT_UI to CPP 2018-10-28 15:46:45 -05:00
Scott Lahteine
a964f098b3 Make dogm status screen a CPP 2018-10-28 15:46:45 -05:00
Scott Lahteine
8055ed24ff Move font data to a subfolder 2018-10-28 15:46:45 -05:00
Scott Lahteine
774a6e8199 Drop TALL_FONT_CORRECTION 2018-10-28 15:46:45 -05:00
Scott Lahteine
c825c419d4 Convert DOGM / HD44780 impl to CPP files 2018-10-28 15:46:45 -05:00
Scott Lahteine
182b1405d9 LCD conditionals in configurations 2018-10-28 15:46:45 -05:00
Scott Lahteine
2bf18950ab Refactor LCD menus 2018-10-28 15:46:45 -05:00
Scott Lahteine
ac5f2762b7 Use E_AXIS_N where possible 2018-10-28 15:46:45 -05:00
MasterPIC
6fbc87301f 'G29 H' to set a centered square probe area (linear, bilinear) (#12242) 2018-10-27 20:30:21 -05:00
Karl Andersson
c1e8bd6add Remove STM32 board-specific delays (#12243) 
...and replace with delays for all HAL_STM32 boards.
 2018-10-27 17:26:12 -05:00
Scott Lahteine
3c9daf322a MSG_CNG_SDCARD => MSG_CHANGE_SDCARD 2018-10-27 13:56:29 -05:00
Scott Lahteine
4b7a0a5b39 Require TMCStepper 0.2.2 or newer 
In reference to #12175
 2018-10-27 11:15:28 -05:00
Scott Lahteine
ab8425f1b5
Clean up PROBE_TRIGGERED_WHEN_STOWED_TEST (#12232) 2018-10-26 19:18:20 -05:00
Chris Rigter
3028a620af Add RACK_AND_PINION_PROBE (#12218) 2018-10-26 18:24:24 -05:00
InsanityAutomation
ad60f0691c Add Creality3D RAMPS pins definitions (#12229) 2018-10-26 16:09:04 -05:00
Scott Lahteine
5580773191
Use FastIO, sanity-check LPC SD options, apply formatting (#12231) 2018-10-26 15:23:02 -05:00
Scott Lahteine
d015f746cc
Fix some compile warnings (#12220) 2018-10-26 03:53:06 -05:00
Scott Lahteine
dacb5324e8 Fix display of Y on Graphical LCD 2018-10-26 01:43:47 -05:00
Scott Lahteine
bf9dd4f4cf
Add helpers for custom text in menu items (#12214) 
For some features it can be useful to write custom text in a menu item. This commit provides helpers to make this easier.
 2018-10-25 15:17:53 -05:00
Scott Lahteine
e8031b1152 Add Custom Microstepping options 2018-10-25 11:26:32 -05:00
Scott Lahteine
fbfb48cce0 Indent a block 2018-10-25 10:52:27 -05:00
Marcio Teixeira
1a00d1bdaf Add pullup to USB interrupt line 
- A pullup on the INT pin is required when the pin is level-active
 2018-10-25 10:42:08 -05:00
TheSFReader
a07ac6312f G0 feedrate may be fixed or variable (#12172) 2018-10-25 10:35:16 -05:00
Scott Lahteine
53c535a0c1 Remove trailing whitespace 2018-10-25 09:46:33 -05:00
Roman Moravčík
55dec02ca1 Allow X, Y, Z manual move when cold. (#12209) 2018-10-25 09:13:52 -05:00
Luc Van Daele
7243101135 z_offset fix for deltas (#12210) 2018-10-25 09:11:26 -05:00
Scott Lahteine
9613f00877 Fix getProgress_seconds_elapsed to return seconds 2018-10-24 18:05:15 -05:00
gjdodd
5d487ef40e Fix null exception due to duration_t of zero (#12207) 2018-10-24 17:59:33 -05:00
Giuliano Zaro
a9061714f2 Update Italian language (#12196) 2018-10-24 16:40:48 -05:00
InsanityAutomation
aebbb2359d Fix IDEX homing X0 wrong direction (#12200) 2018-10-24 16:40:06 -05:00
gjdodd
0a549fd1f2 Fix EXTENSIBLE_UI compile errors (#12206) 2018-10-24 16:36:11 -05:00
Roman Moravčík
a80ba8fc6e Slovak translation update (#12202) 2018-10-24 16:02:38 -05:00
Roman Moravčík
e48cbff10d Fixed redefinition warnings of MSG_HOTEND_TOO_COLD. (#12203) 2018-10-24 15:00:07 -05:00
Scott Lahteine
7a04eb3a8b Fix some comment formatting 2018-10-23 22:35:44 -05:00
Scott Lahteine
2f873a119f Revert some UBL strings 2018-10-23 15:39:59 -05:00
Ludy
a93e9e6e9b Use preheat labels in place of PLA/ABS (#12194) 2018-10-23 15:38:17 -05:00
Karl Andersson
aa72884a6e Enable use of SERIAL_PORT_2 on HAL_STM32 (#12197) 2018-10-23 15:24:58 -05:00
Scott Lahteine
46360f18b4 Bring thermistor_75.h up to speed 2018-10-23 14:52:16 -05:00
Scott Lahteine
e229b831fa Customizable preheat labels 2018-10-23 00:57:50 -05:00
Scott Lahteine
a553ab82e0 Add e index to _lcd_move_distance_menu 2018-10-22 23:35:04 -05:00
Scott Lahteine
3a46212dd8
Better cold extrusion prevention in LCD menu (#12189) 2018-10-22 20:54:38 -05:00
Marcio Teixeira
fc31da1114 Implement custom delay/millis for EXTENSIBLE_UI (#12188) 2018-10-22 19:37:48 -05:00
forkoz
3a3ab3391f Return set_directions() to stepper.cpp (#12182) 
Initial manual Z move can be negative if your stepper is inverted. Leads to bad situations for crashed or initially booted printers.
 2018-10-22 19:30:51 -05:00
Scott Lahteine
e5ae7a07d1 Suppress compiler warning 2018-10-21 13:44:27 -05:00
Hannes Brandstätter-Müller
6ee2af5e2d Simplify pins_TRIGORILLA_14.h (#12162) 2018-10-21 03:23:20 -05:00
Roman Moravčík
d801f85963 Correct EEPROM read/write disparities. (#12169) 2018-10-21 02:56:31 -05:00
Scott Lahteine
8d3a92fc4a Followup to millis_t patch 2018-10-20 23:23:58 -05:00
Ludy
44369d536a Use millis_t where needed (#12152) 2018-10-20 23:21:27 -05:00
Scott Lahteine
b641571098 Replace types.h with millis_t.h 2018-10-20 23:07:12 -05:00
Scott Lahteine
eeef4e630a Fix compile error in leds.h 2018-10-20 23:07:12 -05:00
Scott Lahteine
9969c06cb5 Fix compiler warning 2018-10-20 17:16:59 -05:00
Farkas Péter
427c80119a Hide some menu items when busy: fix typo (#12164) 2018-10-20 15:55:31 -05:00
InsanityAutomation
55ac2f4c23 Fix filament runout for idex duplication modes (#12168) 2018-10-20 13:39:33 -05:00
Karl Andersson
b640b3b0d6 Define ST7920 delays for board ARMED (#12161) 2018-10-20 13:12:54 -05:00
Marcio Teixeira
2e5e689a7f Fix kill() and ExtensibleUI (#12160) 
* Fix to isPrintingFromMedia()

  - isPrintingFromMedia() will now return true even if SD print is paused.
  - isPrintingFromMediaPaused() allows UI to determine if the print is paused.

* Don't use _delay_us in minkill (#12145)

  - In HAL_DUE, _delay_us is simply an alias for delay, which causes the board to hang and subsequently reboot due to the watchdog timer.

* Shorten code with IFSD macro
 2018-10-20 01:44:46 -05:00
Scott Lahteine
b381cad399 Clean up trailing whitespace 2018-10-19 15:27:17 -05:00
Scott Lahteine
9090065e9f Move EXTRA_FAN_SPEED above FWRETRACT 2018-10-19 15:15:00 -05:00
Karl Andersson
4eb798dbdc Add support for Arm'ed (STM32F4) board (#12147) 2018-10-19 14:50:52 -05:00
TheSFReader
1fb9b299d4 Add M524 to abort SD printing (#12155) 2018-10-19 14:25:07 -05:00
Scott Lahteine
d26d9d5b81 Tweak IS_SD_INSERTED 2018-10-19 14:00:36 -05:00
Scott Lahteine
c6a5c74208 Add parentheses to SD macros 2018-10-19 13:52:57 -05:00
Giuliano Zaro
aa9202260d Fix endstop when no interrupt (#12158) 2018-10-19 13:45:39 -05:00
Scott Lahteine
8c02dd971b Move disable_all_steppers to minkill 2018-10-19 13:42:04 -05:00
Scott Lahteine
3847c08f7e Disable heaters/steppers before message 2018-10-19 13:30:46 -05:00
Marcio Teixeira
71e19baf69 Fix kill => disable_all_heaters => print_job_timer.stop (#12146) 
- Remove `print_job_timer.stop()` from `disable_all_heaters`
- Call `print_job_timer.stop()` for relevant `disable_all_heaters()`.
- Split up `kill()` for watchdog interrupt safety
 2018-10-18 21:20:56 -05:00
Ludy
4cc1c2627e Update German language (#12143) 2018-10-18 19:17:37 -05:00
Ludy
75a0d46edf Fix compile warning re: LCD_INFO_SCREEN_STYLE 2018-10-18 19:16:24 -05:00
Scott Lahteine
a81763c237 Pins E sanity check tweak 2018-10-18 18:48:23 -05:00
Giuliano Zaro
bc22641002 [2.0.x] Updated Italian Language (#12148) 2018-10-18 18:08:39 -05:00
Michael Triffon
eded90bf87 Updated Azteeg X5 Mini Wifi pins for onboard SD (#12133) 2018-10-18 11:52:55 -05:00
nhchiu
27a84fd021 Remove unused option in Anycubic Kossel config (#12138) 2018-10-18 11:47:59 -05:00
Scott Lahteine
67a3c5a16a
Alternative info screen (Prusa-style) (#12132) 
* Fix Z value display
* Add HAS_PRINT_PROGRESS
* Alternative Info Screen option
* Add LCD_INFO_SCREEN_STYLE to example configs
 2018-10-18 11:34:52 -05:00
Marcio Teixeira
5b7dd553d3 Fix sd_mmc_spi_mem capacity; clean up USB code (#12134) 
- Fix an error in the return value of `sd_mmc_spi_read_capacity` which was causing the host OS to read beyond the last sector in the card.
- Clean up the USB flashdrive code and add better debugging.
 2018-10-18 11:34:07 -05:00
Scott Lahteine
df768e7d8f Followup to #12129 2018-10-18 11:29:49 -05:00
Chris Pepper
3c13c9e3e9 [LPC176x] Fix USEABLE_HARDWARE_PWM macro, cleanup multiple LED support (#12129) 2018-10-18 11:26:50 -05:00
InsanityAutomation
a768df83cb Remove stale variable (#12136) 2018-10-18 11:26:14 -05:00
Hannes Brandstätter-Müller
c36773bffb Update the Ender-4 example config (#12131) 
- Enable filament change menu
- Enable bed-PID
- Enable s-curve acceleration
- Enable some menu items
- Update from Skorpi's new version
- Fix extruder steps, deactivate nozzle clean feature
 2018-10-17 15:49:52 -05:00
Ludy
9c71bff5e8 Update German language (#12115) 2018-10-17 11:17:06 -05:00
Nils Hasenbanck
9deb23aa47 Add missing SerialUSB definition for STM32 HAL (#12124) 2018-10-17 11:14:10 -05:00
Nils Hasenbanck
0519ef0802 Update pins for final RemRam v1.3 board (#12125) 2018-10-17 11:13:38 -05:00
InsanityAutomation
3ec3872730 Single Z raise value for all tool-changing / parking (#12090) 
* Universal tool-change Z lift
* Add TOOLCHANGE_ZRAISE to example configs
* Park/unpark changes to example configs
* Implement DEBUG_DXC_MODE
 2018-10-17 11:11:41 -05:00
Scott Lahteine
6bdbe3299e Fix a comment 2018-10-17 10:33:54 -05:00
Scott Lahteine
bc75eb2c64 Cleanup for HAL_spi_Due.cpp 2018-10-17 10:33:54 -05:00
AnHardt
d82bcdeea1 Make PULSE_STOP(E) conditional (#12121) 2018-10-17 09:52:57 -05:00
Chris Pepper
c90e26dfa6 fix normal extruder stepping (#12118) 2018-10-17 02:47:31 -05:00
Hannes Brandstätter-Müller
96bbda5d48 remove confusing comment (#12120) 2018-10-17 02:47:03 -05:00