zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
5716 commits 1 branch 0 tags 156 MiB
Commit graph

4654 commits

Author SHA1 Message Date
Scott Lahteine f1f1bac0e1 Merge pull request #4341 from esenapaj/Update-Japanese-translation 
Update Japanese translation
 2016-07-19 15:04:22 -07:00
Scott Lahteine 6c899bb520 Merge pull request #4349 from jbrazio/gcc-bark-bark 
Removes some minor GCC warnings
 2016-07-19 13:42:33 -07:00
Scott Lahteine ef0a22871e Merge pull request #4350 from jbrazio/followup-a875861 
Adds utility.h
 2016-07-19 13:40:52 -07:00
Scott Lahteine 9eba58a031 Merge pull request #4351 from jbrazio/u8glib-converter 
Updates u8glib's bmp2hex converter
 2016-07-19 13:39:33 -07:00
Scott Lahteine c502018eab Merge pull request #4353 from jbrazio/global-enum-file 
General cleanup: enum
 2016-07-19 13:37:56 -07:00
Scott Lahteine 0f9953b031 Merge pull request #4342 from AnHardt/rep-cons-g28 
Introduce line_to_axis_pos() for use in homeaxis()
 2016-07-19 12:56:58 -07:00
AnHardt 11c075c6b2 Introduce line_to_axis_pos(axis_codes axis, float where, float feed_rate = 0.0) 
and use it in `homeaxis()` instead of `do_blocking_move_to_axis_pos()`.
`do_blocking_move_to_axis_pos` was wrong because it performed subdivided, delta-corrected moves for x- and y-axis.

The first common move for delta homing is like quick_home but for 3 towers.

Fix two warnings.
 2016-07-19 17:24:44 +02:00
João Brázio 3ebad4e020 Moves all global enums to a central file 2016-07-19 14:31:09 +01:00
João Brázio 238fefcb00 Updates Stopwatch class to use internal state enum 2016-07-19 14:30:44 +01:00
João Brázio 30ac0782a9 Comment section style correction 2016-07-19 03:27:42 +01:00
João Brázio 8ecee431c4 Updates u8glib's bmp2hex converter 2016-07-19 03:16:30 +01:00
João Brázio 79e7721b76 Removes some minor GCC warnings 2016-07-19 03:03:11 +01:00
João Brázio f4d63796b2 Adds utility.h 2016-07-19 02:55:23 +01:00
esenapaj 361307831e Follow-up the PR #4335 (Debug char, fix compile errors for lcd pins) 
・Solve a flickering when SD card is inserted or removed at using a ASCII
LCD + language_kana.h
 2016-07-18 20:09:24 +09:00
esenapaj ff48bbb86a Update Japanese translation 
・Add new translation
 2016-07-18 17:01:56 +09:00
Scott Lahteine 46117593b9 Merge pull request #4185 from esenapaj/Update-Japanese-translation 
Update Japanese translation (work in progress)
 2016-07-17 18:36:34 -07:00
Scott Lahteine 3422103863 Merge pull request #4310 from thinkyhead/rc_mbl_position_shift 
Fix position shift with MBL
 2016-07-17 18:31:25 -07:00
Scott Lahteine 92757bd7b3 Merge pull request #4339 from esenapaj/Follow-up-the-PR-#4163 
Follow-up the PR #4163 (Mixing and Switching Extruders)
 2016-07-17 18:15:23 -07:00
Scott Lahteine 493d30cd97 Drop intermediate nx, ny, and set destination directly 2016-07-17 17:59:52 -07:00
Scott Lahteine 07a735ad22 We always use destination so modify mesh_buffer_line 2016-07-17 17:57:33 -07:00
Scott Lahteine 04a5b7b257 A macro to normalize positions 2016-07-17 17:57:32 -07:00
esenapaj 5c8e87a866 Follow-up the PR #4163 (Mixing and Switching Extruders) 
・Update forgotten K8400 files
 2016-07-18 09:48:13 +09:00
Scott Lahteine 86eb5251c5 Fix some debug messages 2016-07-17 17:10:02 -07:00
Scott Lahteine 1e57a6af73 Use blocking_move, current_position in G28 homing 2016-07-17 16:56:13 -07:00
Scott Lahteine f6a3a1da09 nz and ne are always set, so drop them down 2016-07-17 14:12:39 -07:00
Scott Lahteine d0009e013b Rename cell index vars 2016-07-17 14:12:39 -07:00
Scott Lahteine 697373b071 Reduce code size of mesh_buffer_line 2016-07-17 14:11:25 -07:00
Scott Lahteine 103d312f6d MBL can actually do up to 9 x 9 2016-07-17 14:11:25 -07:00
Scott Lahteine f4a69281fc Only call mesh_buffer_line when MBL is active 2016-07-17 14:11:25 -07:00
Scott Lahteine 799a31cd30 Include the position_shift when splitting mesh lines 2016-07-17 14:08:20 -07:00
Scott Lahteine f242aea032 Merge pull request #4319 from thinkyhead/rc_feedrates_to_mess_with_you 
Wrangle feed rate variables
 2016-07-17 14:07:52 -07:00
Scott Lahteine 0342661b3f Merge pull request #4335 from thinkyhead/rc_status_pad_jp 
Debug char, fix compile errors for lcd pins
 2016-07-17 14:07:08 -07:00
Scott Lahteine 81e01152bb Merge pull request #4336 from thinkyhead/rc_bltouch_sensor 
BLTouch probe sensor
 2016-07-17 14:06:32 -07:00
Scott Lahteine 1583177ef4 BLTOUCH probe config option 2016-07-17 13:55:38 -07:00
Scott Lahteine 176b9627c7 Some cleanup ahead of BLTOUCH support 2016-07-17 13:55:38 -07:00
Scott Lahteine 39706f3e57 Endstop invert flags as macros instead of const bool 2016-07-17 13:51:02 -07:00
Scott Lahteine 7242d44810 Endstops vars already initialized 2016-07-17 13:38:48 -07:00
Scott Lahteine 5ed1e7a464 codenum => dwell_ms 2016-07-17 13:35:21 -07:00
Scott Lahteine 69d6016941 Revert default state of endstops in M502 2016-07-17 13:35:21 -07:00
Scott Lahteine 0fcd3706dd Replace ENDSTOPS_ONLY_FOR_HOMING with ENDSTOPS_ALWAYS_ON_DEFAULT 2016-07-17 13:35:21 -07:00
Scott Lahteine 671634bf11 Fix spacing after section header 2016-07-17 13:35:21 -07:00
Scott Lahteine f38553b482 fix a debug message 2016-07-17 13:29:42 -07:00
Scott Lahteine 3d78b8f929 Use HYPOT macro instead of hypot function 2016-07-17 13:29:42 -07:00
Scott Lahteine 9f9fe043ba Apply sq macro throughout 2016-07-17 13:29:41 -07:00
Scott Lahteine 93ba5bddd7 Append units to feedrate variables 2016-07-17 13:29:41 -07:00
Scott Lahteine 5e3d3918b6 Patch compile error for RAMPS LCD pins 2016-07-17 12:27:37 -07:00
Scott Lahteine 94955a8bf7 pad string in lcd_finishstatus 2016-07-17 12:27:37 -07:00
Scott Lahteine 21ee0612e3 Debug char 2016-07-17 12:27:36 -07:00
Scott Lahteine 8f24e0a556 Debugging of MBL in G28 2016-07-17 11:08:30 -07:00
Scott Lahteine 05da02f0a2 Implement MIXING_EXTRUDER and SWITCHING_EXTRUDER 2016-07-17 10:53:10 -07:00
Scott Lahteine 22b4cff423 New extruder type configuration options 2016-07-17 00:13:56 -07:00
esenapaj 601015b73e Update Japanese translation 2016-07-17 16:04:12 +09:00
Scott Lahteine 9766e24504 Merge pull request #4277 from thinkyhead/rc_mks_13_viki2 
Support for VIKI2 with MKS 1.3 / 1.4
 2016-07-16 23:49:33 -07:00
Scott Lahteine 02285662f5 Merge pull request #4298 from jbrazio/feature/filament-counter 
Adds filamentUsed and longestPrint stats to PrintCounter
 2016-07-16 23:48:46 -07:00
Scott Lahteine bf16ae5a70 Merge pull request #4299 from jbrazio/feature/g27-park-nozzle 
Implements park nozzle feature
 2016-07-16 23:47:12 -07:00
Scott Lahteine aaa0d298b9 Merge pull request #4326 from thinkyhead/rc_no_static_items_fix 
Suppress compiler warnings in ultralcd.cpp
 2016-07-16 23:38:08 -07:00
Scott Lahteine cc3ef73583 Merge pull request #4327 from thinkyhead/rc_petrzjr_long_print 
LCD Longer print
 2016-07-16 23:37:34 -07:00
Scott Lahteine 77c8fb627f Merge pull request #4329 from thinkyhead/rc_italian_fix 
Added missing Italian translations
 2016-07-16 23:37:15 -07:00
Scott Lahteine b14888501b Merge pull request #4301 from Ingramz/RCBugFix 
Add Cartesio CN Controls V11
 2016-07-16 22:35:07 -07:00
Silvio Didonna 32e0d71729 Added missing translations 2016-07-16 22:26:46 -07:00
Scott Lahteine 0f3232065e Merge pull request #4305 from jbrazio/feature/splash-improvement 
Custom boot screen feature improvement
 2016-07-16 21:59:39 -07:00
Petr Zahradník junior 2d7fe9dc78 LCD Longer print 2016-07-16 18:21:06 -07:00
Scott Lahteine eee903bd4b Format some DAC lines 2016-07-16 17:59:13 -07:00
Scott Lahteine d53dcaa796 Suppress some compiler warnings 2016-07-16 17:59:01 -07:00
João Brázio fa4274cf4c Improves the custom bootscreen logo feature 2016-07-17 01:31:44 +01:00
João Brázio 1f3283e3a5 Adds custom boot logos for bq Hephestos 2 and Cartesio 2016-07-17 01:31:36 +01:00
João Brázio dfa1c45075 Adds a notice to vendors about the SHOW_CUSTOM_BOOTSCREEN directive 2016-07-17 01:15:17 +01:00
Scott Lahteine ed468e848f Merge pull request #4321 from esenapaj/Follow-up-the-PR-#4287 
Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15)
 2016-07-16 17:14:21 -07:00
João Brázio a8758619ec The safe_delay() is now globaly accessible 2016-07-16 12:28:06 +01:00
João Brázio 9a00108cb6 Adds the WEBSITE_URL as the boot screen line 2 2016-07-16 12:24:37 +01:00
João Brázio f5234b0695 Adds a customizable screen timeout for the default boot screen 2016-07-16 12:24:36 +01:00
João Brázio 2f26bc2153 Adds filamentUsed and longestPrint stats to PrintCounter 2016-07-16 12:12:27 +01:00
João Brázio 336481ea81 Added G27 configuration options to all configs 2016-07-16 12:07:59 +01:00
João Brázio c711701626 Implements a nozzle parking command (G27) 2016-07-16 12:07:59 +01:00
João Brázio 5f368d1bc3 Followup for #4320 2016-07-16 11:57:35 +01:00
João Brázio d7c51bc4b9 Merge pull request #4320 from jbrazio/followup/4307 
Moves do_blocking_move_to_xy() out of the HAS_BED_PROBE define
 2016-07-16 11:48:00 +01:00
esenapaj af9b1d79b1 Follow-up and fix the PR #4287 (Allow stopwatch and printcounter to go over 18:12:15) 
・Remove MSG_END_HOUR and MSG_END_MINUTE from all the language files
・Change from MSG_INFO_TOTAL_PRINTS to MSG_INFO_PRINT_COUNT in German
file
 2016-07-16 18:39:22 +09:00
Scott Lahteine e563634a25 Merge pull request #4314 from AnHardt/use-d_b_m_t-in-g28 
Use do_blicking_move_to*() in G28
 2016-07-15 20:22:02 -07:00
Scott Lahteine 59ae1811c2 Merge pull request #4303 from AnHardt/delta-g28 
DELTA: Move out of the clip-zone after G28
 2016-07-15 20:20:22 -07:00
João Brázio fdea8b6e6a Moves do_blocking_move_to_xy() out of the HAS_BED_PROBE define 2016-07-16 03:59:49 +01:00
AnHardt d2a49c016d DELTA: Move out of the clip-zone after G28 
Move down to a safe height after G28 for DELTAs.
 2016-07-15 15:22:44 +02:00
AnHardt 46994fd17d Use do_blicking_move_to*() in G28 2016-07-15 15:02:15 +02:00
João Brázio ffbb31b235 Fixes an PSTR overflow with print_xyz() 2016-07-15 11:25:34 +01:00
Indrek Ardel ecb23c1b65 Add Cartesio CN Controls V11 board 2016-07-15 12:55:47 +03:00
Indrek Ardel c8f2dd7cd5 Fix CN Controls 12 styling 2016-07-15 09:54:09 +03:00
Scott Lahteine cec7110409 Merge pull request #4308 from thinkyhead/rc_debug_gcode_t 
Added logging related to gcode_T
 2016-07-14 19:46:33 -07:00
Scott Lahteine 6446d3939a Merge pull request #4309 from thinkyhead/rc_static_item_fix_77 
Fix skipping of static items
 2016-07-14 19:28:49 -07:00
Scott Lahteine 95ab2fd3ae Fix skipping of static items 2016-07-14 19:16:16 -07:00
Scott Lahteine 166f19251e Add more debugging for leveling 
- Especially in `gcode_T`
- In `update_software_endstops`
- Some tweaks to observe
 2016-07-14 19:04:13 -07:00
Scott Lahteine 7ac0b91a45 Collapsible long comment in gcode_T 2016-07-14 18:28:41 -07:00
João Brázio e71a631f8f do_blocking_move_*() no longer depend on HAS_BED_PROBE 2016-07-15 01:54:14 +01:00
Scott Lahteine 8bf6861af8 Merge pull request #4054 from jbrazio/feature/g12-clean-tool 
Implements clean nozzle feature (Lulzbot's REWIPE)
 2016-07-14 14:38:38 -07:00
Scott Lahteine c5e51f6b96 finished => completed 2016-07-14 11:46:35 -07:00
Scott Lahteine 1618870c84 card.printingHasFinished does print_job_timer.stop 2016-07-14 11:39:58 -07:00
Scott Lahteine 34da77dad3 Simply run M31 at the end of an SD print 2016-07-14 11:39:58 -07:00
Scott Lahteine 23d2bc5ab0 Patch Greek for new strings 2016-07-14 11:39:58 -07:00
Scott Lahteine a8d71f0ac6 Support longer print times in M31 2016-07-14 11:39:58 -07:00
Scott Lahteine e481b79af1 Allow stopwatch and printcounter to go over 18 hours 2016-07-14 11:39:57 -07:00
João Brázio 68c343a09a Added G12 configuration options to all configs 2016-07-14 00:38:42 +01:00
João Brázio 4937f9ada4 Minor G12 tweaks and point_t struct extension 2016-07-14 00:07:36 +01:00
Scott Lahteine 6080924589 Merge pull request #4296 from jbrazio/feature/bqh2-update 
Update the bq Hephestos 2 configuration
 2016-07-13 13:18:09 -07:00
Scott Lahteine ed89c71e53 Merge pull request #4291 from esenapaj/Follow-up-the-PR-#4278 
Follow-up the PR #4278 (Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1)
 2016-07-13 13:17:03 -07:00
João Brázio 021544f572 Improves G12 zig-zag pattern 2016-07-13 21:14:56 +01:00
João Brázio b05a75655a Implements a nozzle cleaning pattern generator (G12) 2016-07-13 21:14:19 +01:00
João Brázio 005af84140
Update the bq Hephestos 2 configuration 2016-07-13 21:06:31 +01:00
esenapaj 8f03f0be9b Follow-up the PR #4252 (Replace PLA/ABS preheating with generic) 2016-07-13 22:42:16 +09:00
esenapaj c2c8ab4698 Follow-up the PR #4278 (Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1) 2016-07-13 22:24:31 +09:00
Scott Lahteine 4f77adddbe Merge pull request #4286 from thinkyhead/rc_debug_clean 
Prefix and suffix in debug output
 2016-07-12 20:49:15 -07:00
Scott Lahteine e5c7af5ddc Merge pull request #4222 from thinkyhead/rc_allow_cold_extrude 
M302: Add "P" parameter, status output
 2016-07-12 20:40:14 -07:00
Scott Lahteine 2224032568 Merge pull request #4285 from thinkyhead/rc_manual_move_fast_fine 
No delay for the smallest LCD moves
 2016-07-12 20:16:38 -07:00
Scott Lahteine cdd77d23bb Neaten up temperature member data 2016-07-12 20:04:15 -07:00
Scott Lahteine d4c68279c8 Add "P" parameter to M302 2016-07-12 20:04:15 -07:00
Scott Lahteine a5bae3c7d5 Merge pull request #4229 from blubbfish/patch-1 
Update language_de.h for German translation
 2016-07-12 20:01:46 -07:00
Scott Lahteine a8b6b6a128 Merge pull request #4252 from thinkyhead/rc_rename_hpb 
Replace PLA/ABS preheating with generic
 2016-07-12 20:00:33 -07:00
Scott Lahteine 1e14df876d Use varname as prefix in DEBUG_POS, string as suffix 2016-07-12 19:58:09 -07:00
Scott Lahteine 9e8b3e5ee6 Homing direction is irrelevant in probe raise! 2016-07-12 18:09:02 -07:00
Scott Lahteine ecd5e810ac No delay for the smallest LCD moves 2016-07-12 18:09:01 -07:00
Scott Lahteine 2b9515d60f Merge pull request #4281 from AnHardt/lang-system 
Don't use UTF-strlen() if the text is not UTF
 2016-07-12 17:21:28 -07:00
Scott Lahteine 973a669aa3 Merge pull request #4264 from thinkyhead/rc_ultralcd_encoder_pos 
Remove extraneous conditions for encoder position
 2016-07-12 16:54:13 -07:00
Scott Lahteine e9f62d8fdb Remove extraneous conditions for encoder position 2016-07-12 16:41:00 -07:00
Scott Lahteine 7c81398f95 Merge pull request #4279 from esenapaj/Follow-up-the-PR-#4271 
Follow-up the PR #4271 (X_DUAL_STEPPER_DRIVERS)
 2016-07-12 16:39:37 -07:00
Scott Lahteine 0554b65d22 Merge pull request #4284 from thinkyhead/rc_serial_ln_macros 
Sled-probe sanity fix, conditionals for remaining types of leveling
 2016-07-12 16:36:33 -07:00
Scott Lahteine 655c3fd55f Move delta ABL sanity checks up 2016-07-12 16:10:16 -07:00
Scott Lahteine db0882d068 AUTO_BED_LEVELING_3POINT and DELTA_BED_LEVELING_GRID 2016-07-12 16:10:11 -07:00
Scott Lahteine e974ac63ef Init matrix in planner.init 2016-07-12 15:55:27 -07:00
Scott Lahteine 47d55513ec Merge pull request #4280 from AnHardt/msg-file-upload 
Finalalize MSG_SD_WRITE_TO_FILE message with a \n
 2016-07-12 13:02:52 -07:00
AnHardt b273736962 Make MAPPER_NON the fall back mapper 
Make MAPPER_NON the fall back mapper - if no other is defined.
One list less to maintain.
 2016-07-12 19:59:14 +02:00
AnHardt 54d35230df Don't use UTF-strlen() if the text is not UTF 2016-07-12 19:59:03 +02:00
Scott Lahteine a1de96d152 Merge pull request #4278 from thinkyhead/rc_more_hotends_1 
Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1
 2016-07-12 10:36:13 -07:00
AnHardt 87957c7b44 Finalalize MSG_SD_WRITE_TO_FILE message with a \n 
Finalalize MSG_SD_WRITE_TO_FILE message with a \n
else RH hangs.
 2016-07-12 13:13:04 +02:00
esenapaj 9b5cbf2423 Follow-up the PR #4271 (X_DUAL_STEPPER_DRIVERS) 
・Update a forgotten Configuration_adv.h of K8400
 2016-07-12 17:50:49 +09:00
Scott Lahteine 809da999dc Apply HOTEND_INDEX in preheat methods 2016-07-11 22:27:25 -07:00
Scott Lahteine 3d78b690e5 Single PID dataset with HOTENDS == 1 2016-07-11 22:27:24 -07:00
Scott Lahteine bf9967c65d Apply HOTEND_INDEX in MILLISECONDS_PREHEAT_TIME 2016-07-11 22:27:24 -07:00
Scott Lahteine 11dcbae7a2 Only a single E axis. Can tool-change reseed position[E_AXIS]? 2016-07-11 22:27:24 -07:00
Scott Lahteine 4865447830 Merge pull request #4276 from esenapaj/Suppress-warnings 
Suppress warnings
 2016-07-11 19:08:59 -07:00
Scott Lahteine 815df28b0b Merge pull request #4274 from esenapaj/Follow-up-the-PR-#4024 
Follow-up the PR #4024 (Greek Language by @psavva)
 2016-07-11 19:04:44 -07:00
Scott Lahteine 44f739a5eb Merge pull request #4273 from esenapaj/Fix-for-the-PR-#4256 
Fix for the PR #4256 (Additional tweaks for HOTENDS == 1)
 2016-07-11 19:02:45 -07:00
Scott Lahteine 02f711fe00 Merge pull request #4275 from AnHardt/dont-deploy 
Don't deploy/stow the probe if z-min-endstop is used for homing
 2016-07-11 18:46:23 -07:00
Scott Lahteine 6a45aad893 Merge pull request #4272 from AnHardt/m100-rep 
Repair M100
 2016-07-11 18:45:13 -07:00
Scott Lahteine 243ad4312a Merge pull request #4271 from thinkyhead/rc_X_DUAL_STEPPER_DRIVERS 
X_DUAL_STEPPER_DRIVERS
 2016-07-11 18:38:45 -07:00
Scott Lahteine 6e68dd292b Merge pull request #4243 from thinkyhead/rc_fix_static_scrolling 
Improve STATIC_ITEM implementation
 2016-07-11 18:25:00 -07:00
Scott Lahteine d17b161832 Don't draw current screen if simply changing screens 2016-07-11 18:14:04 -07:00
Scott Lahteine 096f9981d1 Scroll to the top when changing screens 2016-07-11 18:14:04 -07:00
Scott Lahteine 7ae84d768e Tweak conditionals for REPRAPWORLD_KEYPAD 2016-07-11 18:14:04 -07:00
Scott Lahteine 155af6b861 Rename vars, add comments for menu macros 2016-07-11 18:14:04 -07:00
Scott Lahteine 31f2cf5f6f Make encoderLine signed for proper compares 2016-07-11 18:14:03 -07:00
Scott Lahteine d9f75f62c0 START_ROW => START_COL 2016-07-11 18:14:03 -07:00
Scott Lahteine d2099fef0d Left-justify thermistor info 2016-07-11 18:14:03 -07:00
Scott Lahteine 85aeb02aa6 Invert headings on Graphical LCD 2016-07-11 18:14:03 -07:00