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

5439 commits

Author SHA1 Message Date
Scott Lahteine
c7f22f688f buffer_line can calculate while it's waiting 2016-10-29 17:08:42 -05:00
Scott Lahteine
f3720f4e81 const arguments to test_dual_z_endstops 2016-10-29 16:01:27 -05:00
Scott Lahteine
8cebd2a7db Arrange Z2 min before Z2 max 2016-10-29 01:54:19 -05:00
Scott Lahteine
accabf088a Add support for Z2 min endstop to M119 2016-10-29 01:54:02 -05:00
Scott Lahteine
396434a445 Fix compiler warning in M145 2016-10-28 20:57:36 -05:00
Scott Lahteine
8e787304c9 const float ref args in planner.h 2016-10-28 20:57:36 -05:00
Scott Lahteine
07bfc45df8 Adjust spacing in gcode_M149 2016-10-28 20:57:36 -05:00
Scott Lahteine
1a2310c494 Make LCD preheat vars an array to reduce code size 2016-10-28 20:57:36 -05:00
Scott Lahteine
1226ae1912 Some cleanup in ultralcd.h 2016-10-28 20:57:21 -05:00
Scott Lahteine
50ee749082 Centralize click-handling in the LCD loop 2016-10-28 20:57:21 -05:00
Scott Lahteine
47ad97c35e Merge pull request #5109 from thinkyhead/rc_eeprom_M218_tool_offset 
Save hotend_offset array (M218) in EEPROM
 2016-10-28 20:08:29 -05:00
Scott Lahteine
bff6bbdb12 Indentation in configuration_store.cpp 2016-10-28 18:55:42 -05:00
Scott Lahteine
97115d56f9 Print error for M500 with disabled EEPROM 2016-10-28 18:53:48 -05:00
Scott Lahteine
67ab54185b Save hotend_offset array (M218) in EEPROM 2016-10-28 18:45:23 -05:00
MagoKimbra
dfcdbb437b Fix Command M420 2016-10-28 20:53:48 +02:00
Scott Lahteine
c34dbfb248 Merge pull request #5072 from thinkyhead/rc_preset_auto_fans 
Add predefined AUTO_FAN_PINs to pins files
 2016-10-27 17:12:11 -05:00
Scott Lahteine
9a23f73765 Don't trigger endstops that are actually Z2 or probe 2016-10-27 08:12:17 -05:00
Scott Lahteine
c07cc9e3f1 Revert changes made to z dual endstop test 
#3631 broke z dual endstops. Solved by @Nocturnal42 in https://github.com/MarlinFirmware/Marlin/issues/5078#issuecomment-256572248
 2016-10-27 07:41:39 -05:00
Scott Lahteine
c4c53856a4 Merge pull request #5094 from esenapaj/Fix-for-the-PR-#5088 
Fix for the PR #5088 (Handle M108 in M1 also with ULTIPANEL)
 2016-10-26 21:51:18 -05:00
Scott Lahteine
2e3110539b Merge pull request #5095 from thinkyhead/rc_fix_bilinear_math 
Fix bilinear grid constraints
 2016-10-26 21:48:19 -05:00
esenapaj
d5a5042d23 Fix for the PR #5088 (Handle M108 in M1 also with ULTIPANEL) 2016-10-27 10:32:20 +09:00
Scott Lahteine
9cbedab91b Use DPM where possible 2016-10-26 18:38:32 -05:00
Scott Lahteine
ad38d91692 Sanity check that auto fan pins can do PWM 2016-10-26 18:38:32 -05:00
Scott Lahteine
95275eb9b3 Predefine auto fan pins in some pins files 2016-10-26 18:38:32 -05:00
Scott Lahteine
3f94b15cef Fix bilinear grid constraints 
Followup to #5090
 2016-10-26 18:11:26 -05:00
Scott Lahteine
d439fb95f7 Sanity check for the renamed options 2016-10-26 17:51:26 -05:00
Scott Lahteine
b6aa894893 Rename auto fan pins and add auto fan flags 2016-10-26 17:51:26 -05:00
Scott Lahteine
ada935de87 Allow TEMP_STAT_LEDS with only one LED defined 2016-10-26 17:51:26 -05:00
Scott Lahteine
4b056d8184 Fix warning in ultralcd.cpp 2016-10-26 17:51:26 -05:00
Scott Lahteine
9dfd029911 Fix bug in fastio.h _GET_TIMER 2016-10-26 17:51:25 -05:00
esenapaj
8b1d90e281 Follow-up the PR #5087 (Fixed SERVO pins on Azteeg X3), etc 
・Add header
・Adjust spacing
 2016-10-27 06:46:03 +09:00
Scott Lahteine
bfd3b3c604 Merge pull request #5087 from Fulg/azteeg-x3-pins 
Fixed SERVO pins on Azteeg X3
 2016-10-26 06:01:16 -05:00
Scott Lahteine
208d720614 Merge pull request #5082 from Fulg/RCBugFix 
Only issue MAXTEMP when heating
 2016-10-26 05:55:33 -05:00
Scott Lahteine
f0d673561f Fix for bilinear grid outside bounds 2016-10-26 05:00:03 -05:00
Scott Lahteine
24bcea6c02 Merge pull request #5088 from thinkyhead/rc_break_m1_fix 
Handle M108 in M1 also with ULTIPANEL
 2016-10-26 00:44:01 -05:00
Scott Lahteine
1ba1ec0db9 Handle M108 in M1 also with ULTIPANEL 2016-10-25 23:25:47 -05:00
Scott Lahteine
7ad33422e3 Clear dir_t size, not pointer size 2016-10-25 22:59:40 -05:00
Benoit Miller
1c716034ec Fixed SERVO pins on Azteeg X3 2016-10-25 17:11:26 -04:00
Benoit Miller
2aa12d78dc Only issue MAXTEMP when heating 2016-10-24 17:09:29 -04:00
Scott Lahteine
3fcf915808 Fix uninitialized var in reset_acceleration_rates 2016-10-24 11:55:41 -05:00
Scott Lahteine
14f824c3de Merge pull request #5071 from esenapaj/Extend-measuring-range-of-thermocouple 
Extend measuring range of thermocouple for MAX31855
 2016-10-24 02:00:12 -05:00
Scott Lahteine
1097a50694 Merge pull request #5070 from gcormier/rcbugfix 
Fix #4995 - M48/G29 on CoreXY maybe others?
 2016-10-24 00:56:36 -05:00
Sebastianv650
c397b9d60a Planner acceleration bugfix and speedup v2 
.) Use already existing inverse_millimeters instead of /
block->millimeters.
.) Prevent overflow during acceleration calculation by checking if float
is necessary. Idea modified from Sailfish.
.) Save two uint32_t or even float multiplications by checking if
step[AXIS] has steps and if max acceleration is lower than accel. If
not, there is no need to check this axis.
 2016-10-23 12:47:46 +02:00
esenapaj
70e287ca8c Extend measuring range of thermocouple for MAX31855 2016-10-23 10:22:39 +09:00
Greg Cormier
f0aed9dac7 Fix #4995 - M48/G29 on CoreXY maybe others? 2016-10-22 20:45:13 -04:00
esenapaj
e50992694f Fix for the PR #5066 (Updated french translation) 
MSG_INFO_PRINT_TIME is still being used
 2016-10-23 06:09:56 +09:00
Scott Lahteine
483082387c Merge pull request #5022 from esenapaj/Fix-for-the-PR-#4553 
Fix for the PR #4553 (Save bytes for custom chars (Hitachi LCD))
 2016-10-22 13:54:09 -05:00
Scott Lahteine
8b967a9ff0 Merge pull request #5058 from thinkyhead/rc_reverse_arrow_buttons 
Apply encoder reverse options to keypad arrows
 2016-10-22 13:52:35 -05:00
esenapaj
523c7eaa6c Fix for the PR #4553 (Save bytes for custom chars (Hitachi LCD)) 2016-10-23 03:29:00 +09:00
Scott Lahteine
ca48a49fdb Merge pull request #5065 from petrzjunior/transl 
[LANGUAGE] Update Czech (BLTOUCH and DAC strings)
 2016-10-22 12:46:10 -05:00
Scott Lahteine
f0744fc815 Merge pull request #5066 from thinkyhead/rc_french_update 
Updated french translation
 2016-10-22 12:45:51 -05:00
Gege2B
88b7f6eb46 Updated french translation 2016-10-22 12:30:22 -05:00
Scott Lahteine
3544c3632f Merge pull request #5062 from thinkyhead/rc_warnings_fix 
Warnings fixed redux
 2016-10-22 12:21:36 -05:00
Petr Zahradník junior
8323d78ed7 Translated BLTOUCH and DAC strings 2016-10-22 19:12:21 +02:00
Scott Lahteine
e151f952a3 Apply encoder reverse options to keypad arrows 2016-10-22 11:51:33 -05:00
Scott Lahteine
cfb47929ca Merge pull request #5060 from thinkyhead/rc_fix_ugly_code 
Reduce, clean up MINTEMP / MAXTEMP test code
 2016-10-22 11:27:30 -05:00
Josef Pavlik
dca50737f5 fixed warning: ISO C++ forbids compound-literals 2016-10-22 11:23:16 -05:00
Josef Pavlik
0bd66807b2 fixed warning: extra ; 2016-10-22 11:12:29 -05:00
Josef Pavlik
d35dc407a8 fixed warning: ISO C99 requires rest arguments to be used 2016-10-22 11:12:29 -05:00
Josef Pavlik
c2b51af3ba fixed warning: ISO C does not permit named variadic macros 2016-10-22 11:12:29 -05:00
Scott Lahteine
0d3fc7dd89 Merge pull request #5059 from gcormier/fixbaby 
Set defer delay back to false when exiting babystepping.
 2016-10-22 10:59:17 -05:00
Scott Lahteine
f888597197 Reduce, clean up code for mintemp/maxtemp tests 2016-10-22 10:31:03 -05:00
Scott Lahteine
ad64723354 Move MAX_EXTRUDERS to pins.h 2016-10-22 10:07:51 -05:00
Scott Lahteine
5f5a55a0de Add a ZERO macro to clear arrays 2016-10-22 10:07:18 -05:00
Greg Cormier
0009725637 Set defer delay back to false when exiting babystepping. 2016-10-22 09:43:30 -04:00
Scott Lahteine
627f9d5285 Merge pull request #5056 from thinkyhead/rc_lin_adv_opt 
LIN_ADVANCE optimizations
 2016-10-22 07:06:39 -05:00
Scott Lahteine
0908329d96 Merge pull request #5057 from thinkyhead/rc_mbl_lcd_logical 
Fix manual leveling coordinates
 2016-10-22 06:31:02 -05:00
Scott Lahteine
14e60f0d3b Correct typo in configs 
As pointed out by #5044
 2016-10-22 05:56:32 -05:00
Scott Lahteine
1165e83263 MBL coordinates are logical 2016-10-22 05:55:44 -05:00
Scott Lahteine
dbfabb4c0a Merge pull request #5043 from Kaibob2/patch-5 
Correct grammar and translation in language_de.h
 2016-10-22 05:52:54 -05:00
Scott Lahteine
b19bba275f No LCD timeout during babystepping 
As requested in #5031
 2016-10-22 05:26:07 -05:00
Scott Lahteine
b9109b2875 Improve LIN_ADVANCE commentary (all configs) 2016-10-22 05:03:09 -05:00
Sebastianv650
9818d97587 Fix Z-hops during retract/prime lead to blobs 
We don't want to have retract/prime movements done with LIN_ADVANCE, that's also true with simultaneously executed Z-hops.
 2016-10-22 04:54:59 -05:00
Sebastianv650
599649e45d Add formula for LIN_ADVANCE_K 
With this formula, a start value for K for further fine-calibration can be calculated.
 2016-10-22 04:54:59 -05:00
Scott Lahteine
be7d245eff Merge pull request #5008 from thinkyhead/test_endstop_hits 
Save some PROGMEM in MBL G28
 2016-10-22 03:35:52 -05:00
Scott Lahteine
7c0e52256d Merge pull request #5053 from thinkyhead/rc_fix_baud_config 
Patch BAUDRATE line in configs
 2016-10-22 03:27:45 -05:00
Scott Lahteine
2783dcb4cc Save some RAM in MBL's G29 2016-10-22 02:52:56 -05:00
Scott Lahteine
4f5a8c05d5 Tweaks to endstops macros 2016-10-22 02:52:56 -05:00
Scott Lahteine
083d41a2c2 Remove redundant estep rate code from LIN_ADVANCE 
As noted by https://github.com/MarlinFirmware/Marlin/pull/4971#issuecomment-252503295
 2016-10-22 02:19:14 -05:00
Scott Lahteine
4f6bfabaad Patch BAUDRATE line in configs 2016-10-22 00:48:52 -05:00
Kai
2bfedb74d5 Correct grammar and translation in language_de.h 
Made Filament change Text sound like correct german.
 2016-10-19 14:56:46 +02:00
esenapaj
1e1edeadd3 Fix for the commit dc2cb84 (Revert acceleration limiting to avoid overflow) 
・Add forgotten '\'
 2016-10-18 18:07:20 +09:00
Scott Lahteine
dc2cb8454c Revert acceleration limiting to avoid overflow 2016-10-17 17:08:41 -05:00
Scott Lahteine
6ae5cf17a9 Merge pull request #5033 from esenapaj/Fix-freezing-with-MAX31855 
Fix freezing and MINTEMP Error with MAX31855 thermocouple
 2016-10-17 16:22:20 -05:00
Scott Lahteine
f257c4bcae Merge pull request #5036 from thinkyhead/rc_dac_code_deps 
Fix DAC current code
 2016-10-17 16:19:00 -05:00
Scott Lahteine
b80cc0cbb5 Fix DAC current code 2016-10-17 15:17:57 -05:00
esenapaj
385bd8a4a3 Fix freezing and MINTEMP Error with MAX31855 thermocouple 2016-10-16 07:33:14 +09:00
Scott Lahteine
ca7275a67a Disable EXTRAPOLATE_FROM_EDGE by default 2016-10-14 14:44:28 -05:00
Scott Lahteine
0921c7da84 Merge pull request #4997 from thinkyhead/rc_jerk_from_mk2 
Adapt Jerk / Speed code from Prusa MK2
 2016-10-12 06:38:50 -05:00
Scott Lahteine
4d89652bc2 Apply minor optimizations to planner.cpp 2016-10-12 04:42:15 -05:00
Scott Lahteine
1092319b19 Adapt speed/jerk code based on Prusa MK2 branch 2016-10-12 04:42:14 -05:00
Scott Lahteine
37643fef63 Merge pull request #4972 from bgort/platformio-improvements 
Move platformio directories out of source tree
 2016-10-12 03:42:33 -05:00
Scott Lahteine
8e1cc9332a Replace block flag bools with flag bits 
…and apply const to some method parameters
 2016-10-10 23:17:49 -05:00
Scott Lahteine
d41f2bdbd8 Merge pull request #4991 from thinkyhead/rc_max31855_fix 
Patches for Stepper DAC and MAX31855
 2016-10-10 20:12:06 -05:00
Scott Lahteine
e7cf566fc5 Do kinematic segments with buffer_line_kinematic 
This breaks the raw option, but in the future perhaps all planner moves
will be sent in raw form instead of logical.
 2016-10-10 17:14:03 -05:00
Scott Lahteine
a10e81dc2a Minor cleanup of set_bed_leveling_enabled 2016-10-10 17:14:03 -05:00
Scott Lahteine
029824bc49 Patch ADJUST_DELTA macro for SCARA 2016-10-10 17:14:03 -05:00
Scott Lahteine
5ce5a9c822 Marlin: planner.h tweak 2016-10-10 17:14:03 -05:00
Scott Lahteine
d963020532 Sort out some header dependencies 2016-10-10 17:14:03 -05:00
Scott Lahteine
e17f9b8b99 DAC patches 
As suggested by #4985
 2016-10-10 14:08:04 -05:00
Scott Lahteine
2cb5df8a56 Merge pull request #4984 from esenapaj/Small-fix-for-PR-#4980 
Small fix for the PR #4980 (LIN_ADVANCE bug fix and optimization)
 2016-10-10 13:30:47 -05:00
Scott Lahteine
b6221df3f3 Merge pull request #4983 from MarlinFirmware/revert-4933-rc_drop_pid_func_range 
Revert "Removal of PID functional range"
 2016-10-10 13:29:54 -05:00
Scott Lahteine
a07033a6c1 Merge pull request #4974 from esenapaj/Follow-up-the-PR-#4955 
Fix and follow-up the PR #4955 (PINS_DEBUGGING and M43: Read pin states), etc
 2016-10-10 13:27:52 -05:00
Scott Lahteine
f8199b2cc1 Merge pull request #4982 from thinkyhead/rc_abl_bugfix 
Fix planner with kinematics, delta ABL
 2016-10-10 13:24:22 -05:00
esenapaj
f41c60d4a4 Follow-up the PR #4955, etc 
・More ANALOG NUMBERING to Analog Input
・Add comment header to all the section of all the pins files

・Sort sections as follows:
1. Some special definitions (USBCON, LARGE_FLASH, etc)
2. Servos
3. Limit Switches
4. Z Probe
5. Steppers
6. Temperature Sensors
7. Heaters / Fans
8. Misc. Functions
9. LCD / Controller

・Move MAX6675_SS into "Temperature Sensors" section
・Adjust spacing
 2016-10-10 14:22:43 +09:00
esenapaj
00456b0cb3 Fix compilation errors 2016-10-10 14:22:43 +09:00
esenapaj
cfb5c24bc9 Small fix for the PR #4980 (LIN_ADVANCE bug fix and optimization) 
・Fix a comment about timer
 2016-10-10 07:48:42 +09:00
Scott Lahteine
149b8d9e4b Handle MAX31855 error conditions 2016-10-09 17:12:50 -05:00
Scott Lahteine
f4ec265363 Fix a typo 2016-10-09 16:45:29 -05:00
Scott Lahteine
4ec2d459e6 Fix mcp4728_setVref_all as followup to #4967 2016-10-09 16:45:00 -05:00
Scott Lahteine
1e551c0688 Revert "Squashed - Removal of PID functional range" 2016-10-09 16:27:45 -05:00
Scott Lahteine
4037df82b0 Merge pull request #4981 from esenapaj/Update-Japanese-language 
Update Japanese translation, etc
 2016-10-09 16:11:53 -05:00
Scott Lahteine
e4e290d957 Make EXTRUDER_RUNOUT_PREVENT kinematic compatible 2016-10-09 15:58:33 -05:00
Scott Lahteine
847429eff4 Make tool_change kinematic compatible 2016-10-09 15:58:32 -05:00
Scott Lahteine
a4a7ca10ca Make USE_DELTA_IK_INTERPOLATION compatible with ABL 2016-10-09 15:58:32 -05:00
Scott Lahteine
c5cac486f5 Use a, b, c instead of lx, ly, lz 2016-10-09 14:34:24 -05:00
Josef Pavlik
f8c2473a71 Improve planner kinematics, fix delta ABL 2016-10-09 13:32:46 -05:00
Scott Lahteine
48761f2021 Patch delta endstop adjustment config 2016-10-09 13:32:45 -05:00
Josef Pavlik
28d41b48e3 delta endstop adjustment configurable 2016-10-09 13:09:34 -05:00
Scott Lahteine
ff6b23cb0f Fix an issue with shifted LCD lines 2016-10-09 13:00:00 -05:00
Scott Lahteine
e4d2662d81 Use some macros in M48 2016-10-09 12:21:05 -05:00
Scott Lahteine
3752d9aca8 Fix timer comments 2016-10-09 12:11:00 -05:00
Sebastianv650
a448cedbc5 LIN_ADVANCE bug fix and optimization 
.) long to int: Extruder stalls at 10kHz / 20kHz step limits with long.
.) Take the delta_adv_steps calculation out of the step_loops loop. Wasted calculation performance if done inside.
.) >> 2 replaced by 3: Is divide by 8. Reason: Timer 0 runs at 16/8=2MHz, Timer 1 at 16/64=0.25MHz. ==> 2/0.25=8.
 2016-10-09 11:55:02 -05:00
esenapaj
b27080c1dd Update Japanese translation 
・Add new translation
 2016-10-10 01:52:51 +09:00
esenapaj
0780146034 Move DAC section from inside of the changing filament section 2016-10-10 01:17:46 +09:00
Brian
9c0404eae4 Move platformio directories out of source tree 2016-10-08 13:45:26 -04:00
Scott Lahteine
a1b50f1102 Cleanup of code style 2016-10-07 15:57:24 -05:00
jaysonkelly
13c9dcc600 Add LCD menu for DAC 2016-10-07 15:13:03 -05:00
Scott Lahteine
00261cbfcb Merge pull request #4933 from thinkyhead/rc_drop_pid_func_range 
Squashed - Removal of PID functional range
 2016-10-07 15:07:55 -05:00
Scott Lahteine
ee01def16d Merge pull request #4955 from thinkyhead/rc_debug_pins 
PINS_DEBUGGING and M43: Read pin states
 2016-10-07 14:47:34 -05:00
Scott Lahteine
a0df34fd4c Add PINS_DEBUGGING advanced config option 2016-10-07 14:20:13 -05:00
Scott Lahteine
e21bab5243 PINS_DEBUGGING and M43 Read Pins 2016-10-07 14:11:48 -05:00
Scott Lahteine
3c97fa6e29 Merge pull request #4963 from esenapaj/Fix-for-advance-algorithm 
Move routine of direction signal of ADVANCE and LIN_ADVANCE from Stepper::isr() to Stepper::advance_isr()
 2016-10-07 00:33:42 -05:00
Scott Lahteine
48e63c4730 Comment some globals 2016-10-06 22:06:33 -05:00
Scott Lahteine
9a6c66602f Fix formatting of extrapolate debug output 2016-10-06 17:04:22 -05:00
Scott Lahteine
cd77eb5c40 Clear grid for bilinear G29 2016-10-06 17:00:53 -05:00
Scott Lahteine
53a0856f5c Print Y as int in print_bed_level 2016-10-06 16:46:54 -05:00
esenapaj
f8df88f271 Move routine of direction signal of ADVANCE and LIN_ADVANCE from Stepper::isr() to Stepper::advance_isr() 2016-10-07 02:01:29 +09:00
Brian
357854a7ef tweak variables; 2016-10-05 19:49:05 -04:00
Brian
48cf19151a Improve M48 output; Add min, max, range, etc. 2016-10-05 16:09:39 -04:00
Scott Lahteine
c63cb45268 Fix thermal runaway timeout 2016-10-05 08:42:39 -05:00
Scott Lahteine
e6164d254d Clean up GCode command short comments 2016-10-05 06:13:30 -05:00
Scott Lahteine
47bd142b29 Should marlinAnalogInputToDigitalPin use analogInputToDigitalPin? 2016-10-05 06:13:30 -05:00
Scott Lahteine
bd8520e61d Label analog pins in a similar way 
Some other pins formatting also
 2016-10-05 06:13:30 -05:00
Scott Lahteine
0c0deb5194 Common pin_is_protected function 2016-10-05 04:41:27 -05:00
Scott Lahteine
49d77720d5 More support for 4th extruder or heater 2016-10-05 04:40:22 -05:00
Scott Lahteine
46839c222a Comment and clean up some vars 2016-10-04 23:40:45 -05:00
Scott Lahteine
8910bb7c97 Fix buzzer conditional compile 2016-10-04 21:38:41 -05:00
Scott Lahteine
de7e798e6f Replace single-char S_ECHOs with S_CHAR 2016-10-04 21:38:41 -05:00
Scott Lahteine
0e83f34174 Tweak debugging of probe_pt 2016-10-04 21:38:00 -05:00