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

221 commits

Author SHA1 Message Date
Scott Lahteine
e15354e387
Simplify serial port redirect (#13234) 2019-02-23 22:53:01 -06:00
Scott Lahteine
0feeef2604 Update copyright in headers 2019-02-12 15:30:11 -06:00
Giuliano Zaro
773fa5c40f Fix define used when PID is off (#13119) 
Replaced `PID_MAX` with `BANG_MAX` since it should be the correct define to be used when PID is not enabled.
 2019-02-11 17:29:17 -06:00
LinFor
7ee35c2611 PID_MENU option to save PROGMEM in LCD menus (#13095) 2019-02-10 04:03:18 -06:00
AnHardt
0e37fe8776 Apply minimum C in M303 (#13113) 
Apply minimum `C` in `M303`. `PID_autotune()` needs to be called with a 'C'ycles-parameter >2 to give meaningful (different from 0) PID-factors. Therefore silently raise C to 3. Fixing one aspect of #13104
 2019-02-10 03:54:45 -06:00
Scott Lahteine
3c49396370
Fix compile error with DUE + MAX6675 (#13086) 2019-02-05 22:56:13 -06:00
Nicolas G
6fb4001b58 Add option to disable fan speed slowing in M303 (#13066) 2019-02-04 00:12:41 -06:00
Jiri
24fffb8d93 Fix undefined lcd_tmpfan_speed on NO_LCD_MENUS (#13006) 2019-01-24 16:34:40 -06:00
Ludy
acf266fe78 Fix a compile warning, etc. (#12955) 2019-01-19 18:47:29 -06:00
Scott Lahteine
712e23c383 Fix up some whitespace 2019-01-17 18:05:36 -06:00
mikeshub
7fde8d9d1e Add CreatorPro / Makerbot / QIDI / etc and Mightboard RevE support (#12855) 
- Fix a bug in MAXxxxx thermocouple temp reporting.
- Add support for 3-wire HD44780.
- Add support for PCA9533 RGB driver.
- Add configuration examples for FlashForge CreatorPro.
 2019-01-14 14:29:55 -06:00
InsanityAutomation
082f6a27de ADAPTIVE_FAN_SLOWING extension to hotend thermal protection (#12853) 2019-01-12 00:41:48 -06:00
Scott Lahteine
459f4fef60 Fix Temperature::init bug with HEATER_4_PIN 2019-01-11 22:54:26 -06:00
Marcio Teixeira
60cb36bef3 Misc. improvements (#12747) 
* Make ExtUI respect MAXTEMP limits
  - Temperatures are now clamped by MAXTEMP limits rather than arbitrary values.
* Speed up USB init, add status
  - Speed up USB initialization
  - Show status message if init failed
* Enable status messages for EXTENSIBLE_UI
* Adjust max limit to MAX_TEMP - 15
* Misc. tweaks to formatting, const, etc.
 2019-01-01 15:17:48 -06:00
Scott Lahteine
9d59a9c840 Followup to #12691 (typo) 2018-12-20 16:38:32 -06:00
Roman Moravčík
4dad489a50 [2.0.x] Limit PID autotune target to maxtemp-15 (#12691) 2018-12-20 15:55:30 -06:00
Scott Lahteine
c986239837
A single SERIAL_ECHO macro type (#12557) 2018-11-29 16:58:58 -06:00
Scott Lahteine
03ef2d6c82
Fix "paused" message and M125 called by M25 (#12551) 2018-11-28 19:28:31 -06:00
Scott Lahteine
09d6db491a Fix wait_for_bed compile error 2018-11-25 18:05:41 -06:00
Sinisa Culic
8a0992d921 Fast PWM for controller fan (#12485) 2018-11-23 16:03:39 -06:00
Ludy
1f93d2bcf7 Fix LCD compile error, etc. (#12472) 2018-11-18 20:39:49 -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
Mateusz Krawczuk
ca21ac6b9b Support two MAX6675 thermocouples (#8686) 2018-11-16 18:20:33 -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
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
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
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
Ludy
5ba6607181 Fix keypad-related compile error (#12306) 2018-11-02 22:29:32 -05:00
Giuliano Zaro
323c088356 Restore LED light color after pid tuning (#12082) 2018-11-01 22:04:19 -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
Giuliano Zaro
d43d4e4219 Refactor PRINTER_EVENT_LEDS, apply to M303 (#12038) 
Co-Authored-By: Giuliano Zaro <gmagician@users.noreply.github.com>
 2018-10-10 21:25:43 -05:00
Scott Lahteine
d556dc1865
Fix and improve EEPROM storage (#12054) 
* Clean up Temperature PID
* Improve EEPROM read/write/validate
* Group `SINGLENOZZLE` saved settings
* Group planner saved settings
* Group filament change saved settings
* Group skew saved settings
* Group `FWRETRACT` saved settings
 2018-10-10 09:45:20 -05:00
InsanityAutomation
74cd6cb4fc Single nozzle filament change (#11994) 2018-10-07 17:06:14 -05:00
Scott Lahteine
d6b0fbd771
Use uint8_t for all fan speeds (#12032) 2018-10-07 15:34:41 -05:00
Scott Lahteine
11ac75edcb
Use PGM_P for PSTR pointers (#11977) 2018-09-30 23:44:33 -05:00
Scott Lahteine
d89d8fe852 Fix Busy State in temperature.cpp 
Fix #11954
 2018-09-29 17:03:35 -05:00
Scott Lahteine
e4389f7d23
Standard methods to wait for heating (#11949) 2018-09-29 01:44:47 -05:00
Scott Lahteine
1718eff54a Code changes supporting up to 6 extruders 2018-09-16 22:32:53 -05:00
Scott Lahteine
b220a825a7 Fix raw_filwidth_value error 2018-09-12 04:31:55 -05:00
AnHardt
530a13ab6c [2.0.x] SECURITYFIX missing max temp error when PID is used (#11717) 2018-09-05 01:41:45 -05:00
Dave Johnson
c64199941e Compile only selected PIO environment (#11519) 2018-08-14 03:28:52 -05:00
Andy Shaw
624986d423 Ensure ADC conversion is complete before reading (#11336) 
The current Marlin implementation relies on a timer interrupt to start the ADC conversion and read it. However in some circumstances the interrupt can be delayed resulting in insufficient time being available for the ADC conversion. This results in a bad reading and false temperature fluctuations. These changes make sure that the conversion is complete (by checking the ADC hardware via the HAL) before reading a value.

See: https://github.com/MarlinFirmware/Marlin/issues/11323
 2018-07-26 03:59:19 -05:00
Scott Lahteine
22ebbc091f Tweak some SoftPWM code 2018-07-25 18:09:31 -05:00
etagle
1367df2875 Replace double with float, optimize calculation 2018-07-04 22:28:56 -05:00
Scott Lahteine
3fd1f32b73 Fix ADC key and chamber temp 2018-06-10 20:11:40 -05:00
Scott Lahteine
3701869e6c Add HAL_timer_start for AVR, use stepper timer to time pulses 2018-06-09 22:30:13 -05:00
Scott Lahteine
853a9056ac Long thermistor tables need special consideration 2018-05-28 06:28:34 -05:00
Scott Lahteine
1ce97f1f6d
Faster (bisect) search in thermistor tables (#10883) 2018-05-27 23:27:51 -05:00
Bob Kuhn
d557c84a71 [2.0.x] Error for FAST_PWM_FAN with 32 bit CPU (#10798) 2018-05-20 11:37:55 -05:00
etagle
569df3fc0c Fix interrupt-based endstop detection 
- Also implemented real endstop reading on interrupt.
 2018-05-20 07:10:24 -05:00
etagle
a11eb50a3e Refactor and optimize Stepper/Planner 
Better encapsulation and considerably reduce stepper jitter
 2018-05-20 06:23:58 -05:00
etagle
0566badcef Add memory barrier, optimal interrupt on-off 
Disabling an ISR on ARM has 3 instructions of latency. A Memory barrier is REQUIRED to ensure proper and predictable disabling. Memory barriers are expensive, so avoid disabling if already disabled (See https://mcuoneclipse.com/2015/10/16/nvic-disabling-interrupts-on-arm-cortex-m-and-the-need-for-a-memory-barrier-instruction/)
 2018-05-20 02:39:34 -05:00
Giuliano
e1d9046efc [2.0.x] Temperature reading fix (#10774) 2018-05-19 15:39:36 -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
8f8c6a9bc4
Move get_axis_position_mm to Planner (#10718) 2018-05-12 09:59:11 -05:00
Scott Lahteine
a1062eec5b
Better handling of DELAY_NS and DELAY_US (#10716) 
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-05-12 08:34:04 -05:00
Scott Lahteine
f5aaa2d6c0 Fix some compiler warnings 2018-05-12 05:28:12 -05:00
Scott Lahteine
625035a9ce
Fix M301 access to lpq_len (#10714) 
Co-Authored-By: Zwaubel
 2018-05-12 02:13:40 -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
81b632c255 Additional temp-oriented improvements 2018-05-02 08:43:22 -05:00
nightdemonx
e911635fb1 Add thermocouple with AD8495 support 2018-05-02 08:43:16 -05:00
Scott Lahteine
5ac226aa93 Further cleanup of inline delays 2018-04-27 19:22:22 -05:00
Chris Pepper
2242b98248 [LPC176x] Emergency Parser Feature (#10516) 2018-04-25 06:44:26 -05:00
Scott Lahteine
9789c1c719 Fix current_temperature_chamber compile error 
Fix #10505
 2018-04-24 07:55:58 -05:00
Eduardo José Tagle
0c428a66d9 Proper AVR preemptive interrupt handling (#10496) 
Also simplify logic on all ARM-based interrupts. Now, it is REQUIRED to properly configure interrupt priority. USART should have highest priority, followed by Stepper, and then all others.
 2018-04-23 22:05:07 -05:00
Scott Lahteine
cb46cb8480
Add HAS_HEATED_BED conditional (#10495) 2018-04-23 17:13:01 -05:00
Lenbok
0e8242180d Chamber temperature monitoring and auto fan control. 
This is an initial cut for feedback, updated for 2.0.x.

Chamber temperature is currently reported along with hot end and bed
temperatures to serial. The format is just like that used for hot end
and bed temperatures, but using 'C' prefix. As there is no heater,
target is always 0. Is this appropriate, is there a better way to report
chamber temperatures?

Chamber temperatures are not reported on the LCD in any way.

When auto chamber fan is enabled, it currently just uses the same
temperature threshold as the other auto controlled fans.

As the chamber temperature is not connected to any heater, it doesn't
undergo mintemp/maxtemp monitoring. This would need to change in the
future if chamber heating became a feature.
 2018-04-06 23:09:06 -05:00
Scott Lahteine
1c36606886 Fix MSG_HEATING_FAILED_LCD_BED macro evaluation 2018-04-04 19:01:22 -05:00
Marcio Teixeira
8bc93c6f2b Improve heating/cooling LCD messages (#10293) 2018-04-04 18:29:27 -05:00
Karl Andersson
7cbbc2af7a [2.0.x] Optional heater signal inversion (#10260) 2018-04-02 19:37:41 -05:00
Eduardo José Tagle
97e8a6ebd9 Various fixes for DUE... (#10152) 
- Watchdog reset during SD Card initialization.
- Move `DebugMonitor` to `DebugMonitor_Due.cpp`.
- Since the watchdog is enabled on boot do extra resets during init.
- Have `thermalManager` do watchdog reset before its ISR starts to prevent reset.
- Ensure that timers are stopped before reprogramming them to address tone issues.
- Improve SAM3XE reset when reflashed through the native port.
 2018-03-21 19:04:45 -05:00
AnHardt
837ac2fdbd [2.0.x] Fix_Autotune_THERMAL_PROTECTION_BED_off (#10166) 
- Fix Autotune Thermal Protection
- Make 2 constants in autotune configurable
 2018-03-20 16:48:36 -05:00
Scott Lahteine
c6ff39cc14 Spacing cleanup 2018-03-17 16:49:08 -05:00
Scott Lahteine
ffbf63e6af Add HAS_TEMP_SENSOR conditional 2018-03-07 01:53:50 -06:00
Scott Lahteine
649f375494
Fix: M112 calling kill from interrupt (#9923) 
Fix #9906
 2018-03-03 23:14:01 -06:00
Scott Lahteine
83d7e95de0
Add MSG_THERMAL_RUNAWAY_BED (#9691) 2018-02-18 02:23:55 -06:00
Scott Lahteine
e698998343 More reliable PROBING_HEATERS_OFF with BED_LIMIT_SWITCHING 2018-02-08 21:10:11 -06:00
Scott Lahteine
b5e92f4f90
[2.0.x] Enable / disable PSU automatically (#9503) 2018-02-06 00:22:30 -06:00
Scott Lahteine
2bea1bda56 Move more strings to PROGMEM 2018-01-24 00:06:06 -06:00
Scott Lahteine
750cc02b3a
Use delay() in serial temp report 2018-01-20 14:13:17 -06:00
Scott Lahteine
a408209d24 More reliable temperature serial report? 2018-01-15 00:43:51 -06:00
Thomas Moore
f7efac57b7 Multi-host support 2018-01-10 00:14:47 -06:00
revilor
0e93506985 Fix for issue #9005, #8942 - Bed PID autotuning (#9036) 2018-01-04 03:26:14 -06:00
Scott Lahteine
4af3d436b2 M303 pid autotune cleanup, commentary 2018-01-03 21:30:45 -06:00
Scott Lahteine
5e01ee8adf Temperature updates for parity with 1.1.x 2018-01-01 18:29:08 -06:00
Scott Lahteine
fdc5e72720 A single setting to validate filament width 2017-12-19 21:33:25 -06:00
Scott Lahteine
de5ca96654 More parity with 1.1.x, plus whitespace 2017-12-19 18:36:16 -06:00
Dave Johnson
0d531d9655 Missing HAS_HEAT_BED conditional 
Fixes issue found in #8779
 2017-12-15 11:33:37 -08:00
Scott Lahteine
cf2193c07f Comment, fix filament width sensor 2017-12-13 02:32:34 -06:00
Scott Lahteine
4fa65a5c25 TCNT0 => HAL_timer_get_current_count 
Fix #8710
 2017-12-08 22:35:28 -06:00
Richard Wackerbarth
c1184552ac Change K1 to required option PID_K1 2017-12-05 19:59:59 -06:00
Scott Lahteine
45c2388a58 Apply const to thermal_runaway_protection args 2017-12-01 19:42:44 -06:00
Scott Lahteine
27c5692b13 Syntax tweaks 2017-11-25 18:13:36 -06:00
Roxy-3D
d29cb646e3
Fix erroneous reference to temperature in time calculations 
Travis is having problems at:  https://github.com/MarlinFirmware/Marlin/pull/8560   

So...   doing a direct commit to get things correct.   Bugfix_v1.1.x does not have this bug.  Nothing needs to be done to that branch.
 2017-11-25 10:40:56 -06:00
Vitaliy Sapyanov
e2724c68ab Update pins_RURAMPS4D.h 
Add and bugfix pins
 2017-11-20 15:36:13 -06:00
Bob-the-Kuhn
c14000775b PWM fixes, slow down fan update 
include LPC1768 syntax for M42

couple more pin_t changes

consistency

change M42 to R, P format

Revert "change M42 to R, P format"

This reverts commit 01f12f579ec9ccc1bb9126e68d2c86449e9b7edf.
 2017-11-18 07:05:50 -06:00
Bob-the-Kuhn
7eea000f4b E0 auto fan fixes 2017-11-16 18:42:56 -06:00
Scott Lahteine
b2dda096fe Fix FILAMENT_LCD_DISPLAY for disabled state 2017-11-16 16:57:48 -06:00
RowanMeara
6131533157 Change dithering behavior to intended. 2017-11-14 00:47:07 -08:00
Scott Lahteine
91baca6abb Patches for compiler warnings/errors 2017-11-13 04:43:47 -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
Scott Lahteine
1ed86adf9c Cleanup around updatePID 2017-11-10 19:27:34 -06:00
Scott Lahteine
cba9c1cf9e Add pre-calculated planner.e_factor 2017-11-10 03:14:24 -06:00
Scott Lahteine
8fea26aa9d Fix PID_autotune watch temp increase value 2017-11-07 15:51:48 -06:00
Scott Lahteine
2f9e42feb9 M303 thermal runaway protection 2017-11-03 03:57:46 -05:00
Scott Lahteine
eae0aea1e0 Fix M303 thermal protection 2017-10-29 04:30:50 -05:00
Scott Lahteine
ca66574062 ADC sensor fix inspired by 'Evgen2' on Twitter 2017-10-14 02:28:13 -05:00
Thomas Moore
0cb00f52d9 Cleanup warnings 2017-09-30 16:47:17 -05:00
Phr3d13
10c1b442ca Fixes for Anet10 and gt2560 
Fixes for 2 "... not declared in this scope" compiler errors.
 2017-09-27 07:34:02 -05:00
Scott Lahteine
37eb6d1732 Babystepping code tweak 2017-09-26 23:43:05 -05:00
Dave Johnson
f58ba3a64e Improve AVR arch detection 
Replace ARDUINO_ARCH_AVR with __AVR__ to better detect architecture for non-Arduino dev environments.  Resolves compile failure in PIO for 8-bit Teensduino targets

More info:
https://forum.pjrc.com/threads/33234-Using-Teensyduino-Selecting-Teensy-3-2-3-1-board-has-incorrect-platform-define
http://www.atmel.com/webdoc/avrlibcreferencemanual/using_tools_1using_avr_gcc_mach_opt.html
 2017-09-23 21:36:40 -07:00
Scott Lahteine
2e20c53c9d Move endstop debug to Endstops 2017-09-21 16:27:11 -05:00
Scott Lahteine
a10451ceed Move Volumetric methods to Planner 2017-09-21 16:27:11 -05:00
Scott Lahteine
df0432c7c8 Move M155 to cpp, auto-report to Temperature 2017-09-21 16:26:56 -05:00
Scott Lahteine
9c21191f74 Rename SPI class to avoid conflict (good?) 2017-09-21 16:26:49 -05:00
Scott Lahteine
4f1eadf41f FILAMENT_WIDTH_SENSOR feature 2017-09-21 16:26:48 -05:00
Scott Lahteine
71aefc2e22 Move heater output to Temperature class 2017-09-21 16:26:47 -05:00
Scott Lahteine
3d8a0ab4b2 Module updates 2017-09-21 16:26:42 -05:00
Scott Lahteine
0c9231fd04 Move 'module' files 2017-09-12 14:51:05 -05:00
Renamed from Marlin/temperature.cpp (Browse further)