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

4867 commits

Author SHA1 Message Date
Scott Lahteine f1be87a85c Move probe pin sanity checks out of ABL block 2016-08-02 20:55:17 -07:00
Scott Lahteine 9cb596e88c Define Z_MIN_PROBE_PIN always, allowing override 2016-08-02 20:31:44 -07:00
Scott Lahteine 229f70f194 Only report finished prints longer than 1 min 2016-08-02 19:58:12 -07:00
Scott Lahteine e040e00ae9 Merge pull request #4514 from thinkyhead/rc_cleanup_circularqueue 
Patch up CircularQueue
 2016-08-02 19:42:38 -07:00
Scott Lahteine 6110d57c16 Prevent the 'tone(f,d)' function from being interrupted 2016-08-02 19:37:47 -07:00
Scott Lahteine b73203a0b7 Move some includes around to uncover missing deps 2016-08-02 19:37:46 -07:00
Scott Lahteine f26d5425bf Patch up CircularQueue 
- Use `size` and `count` instead of `length` and `size`
- Fix bug: `peek` should return the item
- Clean up comments, spacing, spelling
 2016-08-02 18:57:15 -07:00
Scott Lahteine c9123adc59 Improved SCREEN / MENU macros 2016-08-02 18:05:34 -07:00
Scott Lahteine cebeb48005 Merge pull request #4511 from thinkyhead/rc_encoder_flex 
Allow encoder pulse/step override for more LCDs
 2016-08-02 16:50:50 -07:00
Scott Lahteine 3cccaa9885 Allow encoder pulse/step override for more LCDs 2016-08-02 15:57:26 -07:00
Scott Lahteine 14c5a46ee9 Use multiplication for MMM_SCALED 2016-08-02 15:05:17 -07:00
Scott Lahteine d8945e8464 Fix Z_HEAD index for COREYZ 2016-08-02 15:05:17 -07:00
Scott Lahteine 0f030aface Merge pull request #4503 from AnHardt/fix-retract 
Correct typo in retract()
 2016-08-02 15:04:55 -07:00
Scott Lahteine fbd8f06951 Merge pull request #4506 from thinkyhead/rc_buzzer_needs_beeper 
Buzzer requires BEEPER_PIN
 2016-08-02 14:40:43 -07:00
Scott Lahteine 330f82971b Buzzer requires BEEPER_PIN 2016-08-02 14:05:37 -07:00
Scott Lahteine e0d7b8bf27 Fix Azteeg X3 servo pin / Viki i2c 2016-08-02 14:05:37 -07:00
Scott Lahteine 7cceb15925 Merge pull request #4505 from thinkyhead/rc_auto_select_dplugs 
Auto-select power plugs for RAMPS derivatives
 2016-08-02 12:56:52 -07:00
Scott Lahteine 593b37519a Boards with 4 power outputs are EFBF or EFBE 2016-08-02 12:34:28 -07:00
AnHardt 9ab94bd2c1 fix-babysrepping 2016-08-02 21:06:42 +02:00
AnHardt 39c4603598 Correct typo in retract. 2016-08-02 21:06:08 +02:00
Scott Lahteine cebd2bfff0 Auto-select power plugs for RAMPS derivatives 2016-08-02 11:59:25 -07:00
Scott Lahteine 34c60f1b55 Merge pull request #4491 from thinkyhead/rc_fix_lcd_move_e 
Use a default argument in _lcd_move_e
 2016-08-01 16:45:25 -07:00
Scott Lahteine 38af251b91 Use a default argument in _lcd_move_e 2016-08-01 16:09:26 -07:00
Scott Lahteine 374ae6c099 Fix pins for RAMBO plus VIKI 2016-08-01 16:09:26 -07:00
Scott Lahteine 7594138740 Merge pull request #4493 from jbrazio/buildroot-cleanup 
Move font folder
 2016-08-01 15:57:23 -07:00
Scott Lahteine 6eed37aafb Merge pull request #4486 from thinkyhead/rc_pid_add_extrusion_rate_off 
PID_EXTRUSION_SCALING, disabled by default
 2016-07-31 18:23:51 -07:00
Scott Lahteine 4bf3526d00 Merge pull request #4463 from thinkyhead/rc_azteeg_x3_eeb 
Wrangle RAMPS variants and derivatives
 2016-07-31 18:22:49 -07:00
Scott Lahteine 1993c45759 Merge pull request #4487 from thinkyhead/rc_refresh_pos_fix 
Update refresh_positioning - no need for obj ref
 2016-07-31 18:22:38 -07:00
Scott Lahteine f83369b79c Update refresh_positioning - no need for obj ref 2016-07-31 18:01:13 -07:00
Scott Lahteine 63fd1f49a6 PID_EXTRUSION_SCALING, disabled by default 2016-07-31 17:49:34 -07:00
Scott Lahteine 49997e2e22 HI_VOLT_PIN => "RAMPS_Dn_PIN" 2016-07-31 15:42:52 -07:00
AnHardt 60ad365e21 repair-software-spi 2016-07-31 15:50:42 +02:00
Scott Lahteine f388beafa1 Merge pull request #4476 from otvald/RCBugFix 
FIX for endstop adjustemt on delta is offset
 2016-07-31 01:09:54 -07:00
Scott Lahteine 3633d4978b Merge pull request #4475 from esenapaj/Fix-for-PR-#4452 
Fix for PR #4452 (Additional heater-state output changes)
 2016-07-31 01:08:27 -07:00
Thomas Otvald Jensen fe059f1221 During homing, line_to_axis_pos will make a path which moves across the 
endstop trigger point. The move is stopped at endstop, so current_position
should also be adjusted to reflect this!

Caused error in subsequent call in endstop adjustment, since the movement
would assume a wrong starting position.
 2016-07-30 16:50:31 +02:00
esenapaj bd73e6d3c8 Fix for PR #4452 (Additional heater-state output changes) 
・Add missing ';'
 2016-07-30 22:49:30 +09:00
esenapaj cd5b03d88f Update distribution date and readme 2016-07-30 21:27:29 +09:00
Scott Lahteine f575e92f2e Merge pull request #4473 from esenapaj/Follow-up-the-PR-#4408-etc 
Follow-up the PR #4408 (Add support for reprapworld LCD), etc
 2016-07-30 04:45:27 -07:00
esenapaj 657ef8aded Follow-up the PR #4408 (Add support for reprapworld LCD), etc 
・Put #define REPRAPWORLD_GRAPHICAL_LCD into all the example
configuration files
・Adjust spacing
 2016-07-30 20:32:57 +09:00
Scott Lahteine 83d341c394 Make Conditionals.h a catch-all for old configs 2016-07-30 04:25:30 -07:00
Scott Lahteine de951c64f1 Make pins for EFF a consistent order 2016-07-30 04:17:21 -07:00
Scott Lahteine 49f75b7891 pins_RAMPS_14.h => pins_RAMPS.h 2016-07-30 04:17:21 -07:00
Scott Lahteine d3b713cebc Set flags for RAMPS "type" in pins.h 2016-07-30 04:17:21 -07:00
Scott Lahteine 223b7e473f RAMPS assignment for derivatives 2016-07-30 04:17:21 -07:00
Scott Lahteine 3865843283 Consolidate setting of RAMPS High Voltage PWM outputs 2016-07-30 04:17:21 -07:00
Scott Lahteine bdac2eb13a Don't set non-existent SLED_PIN 2016-07-30 04:17:21 -07:00
Scott Lahteine bfbd01e29a Merge pull request #4470 from thinkyhead/rc_fix_manual_move 
Followup to #4468
 2016-07-30 04:17:05 -07:00
Scott Lahteine 802d873fc1 Merge pull request #4469 from esenapaj/Fix-for-PR-#4453 
Fix for PR #4453 (Improved MANUAL_[XYZ]_HOME_POS)
 2016-07-30 04:08:54 -07:00
Scott Lahteine 8e2f095dde Merge pull request #4456 from jbrazio/speaker-type3 
Improvement to non-blocking speaker
 2016-07-30 04:07:08 -07:00
Scott Lahteine ad68b4cb8b Followup to #4468 2016-07-30 03:49:42 -07:00
esenapaj b8c112c490 Fix for PR #4453 (Improved MANUAL_[XYZ]_HOME_POS) 2016-07-30 19:37:43 +09:00
Scott Lahteine 2f76138645 Merge pull request #4468 from thinkyhead/rc_fix_manual_move 
Specify manual-movable E axes by extruder type
 2016-07-30 03:21:43 -07:00
Scott Lahteine 696b63e300 Specify manual-movable E axes by extruder type 2016-07-30 00:36:48 -07:00
Scott Lahteine 46c33f1cfa Merge pull request #4467 from jbrazio/safe_delay-millis_t 
Makes safe_delay() to be fully compatible with delay()
 2016-07-29 20:23:44 -07:00
Scott Lahteine 9e21b2e51d Merge pull request #4455 from AnHardt/double-bump-feature 
double bump probing as a feature
 2016-07-29 20:00:10 -07:00
Scott Lahteine db4d03bc81 Merge pull request #4452 from thinkyhead/rc_fix_heaterstates_part_2 
Additional heater-state output changes
 2016-07-29 19:58:00 -07:00
Scott Lahteine c68ca95345 Merge pull request #4464 from thinkyhead/rc_fix_steps_per_mm_handling 
Account for DELTA in Planner::refresh_positioning
 2016-07-29 19:34:59 -07:00
João Brázio 226e74a438 Fixes safe_delay() to be fully compatible with delay() 2016-07-30 02:56:26 +01:00
João Brázio 8e79e8cdb3 Adds types.h 2016-07-30 02:55:52 +01:00
Scott Lahteine 844a4e799e Account for DELTA in Planner::refresh_positioning 2016-07-29 18:41:11 -07:00
AnHardt 7188ce0ad6 double bump probing as a feature 
Why double touch probing is not a good thing.

It's widely believed we can get better __probing__ results when using a double touch when probing.

Let's compare to double touch __homing__.
Or better let's begin with single touch __homing__.
We home to find out out position, so our position is unknown.
To find the endstop we have to move into the direction of the endstop.
The maximum way we have to move is a bit longer than the axis length.
When we arrive at the endstop - when it triggers, the stepper pulses are stopped immediately.
It's a sudden stop. No smooth deacceleration is possible.
Depending on the speed and the moving mass we lose steps here.
Only if we approached slow enough (below jerk speed?) we will not lose steps.

Moving a complete axis length, that slow, takes for ever.
To speed up homing, we now make the first approach faster, get a guess about our position,
back up a bit and make a second slower approach to get a exact result without losing steps.

What we do in double touch probing is the same. But the difference here is:
a. we already know where we are
b. if the first approach is to fast we will lose steps here to.
But this time there is no second approach to set the position to 0. We are measuring only.
The lost steps are permanent until we home the next time.

So if you experienced permanently rising values in M48 you now know why. (Too fast, suddenly stopped, first approach)

What can we do to improve probing?
We can use the information about our current position.
We can make a really fast, but deaccelerated, move to a place we know it is a bit before the trigger point.
And then move the rest of the way really slow.
 2016-07-30 03:00:49 +02:00
Scott Lahteine c31f56a38c Deprecate EXTRUDER_WATTS and BED_WATTS 2016-07-29 17:34:14 -07:00
Scott Lahteine e1970b4b28 Show power output in same order as temp output 2016-07-29 14:55:22 -07:00
Scott Lahteine 74df828acc Show ADC values inline rather than after 2016-07-29 14:55:18 -07:00
João Brázio 2b5faa61e2 Consolidates Buzzer and Speaker into a single object 2016-07-29 19:25:39 +01:00
João Brázio 8093c5f534 Non-blocking speaker now uses arduino's tone() 2016-07-29 18:45:50 +01:00
João Brázio 8896f08074 Fixes a compilation error introduced by #4448 2016-07-29 18:33:42 +01:00
Scott Lahteine ea5ac94804 Improved MANUAL_[XYZ]_HOME_POS 
No need for `MANUAL_HOME_POSITIONS`. Just set each one as-needed to
override the automatic behavior.
 2016-07-28 19:51:48 -07:00
Scott Lahteine b40661cb18 Fix output of heater states 2016-07-28 17:40:01 -07:00
Scott Lahteine 9083e5420a Merge pull request #4419 from AnHardt/sd2pinmap 
Switch Sd2CardLib to fastio
 2016-07-28 17:38:46 -07:00
Scott Lahteine 6f59560526 Merge pull request #4448 from jbrazio/speaker-followup 
A little cleanup at speaker.h
 2016-07-28 17:37:36 -07:00
Scott Lahteine c94b6dd3e7 Revert to SanityCheck on every .cpp file 2016-07-28 17:17:50 -07:00
Scott Lahteine 256b03598d Merge pull request #4450 from thinkyhead/rc_fix_delta_optimization 
Fix DELTA speed calculation
 2016-07-28 16:50:04 -07:00
Scott Lahteine 753283e020 inverse_second => inverse_mm_s 2016-07-28 16:35:18 -07:00
Scott Lahteine 83e1d90ca3 Undo errant optimization of block->millimeters 2016-07-28 16:26:52 -07:00
João Brázio 909e98b1af A little cleanup at speaker.h 2016-07-29 00:03:25 +01:00
Scott Lahteine ae1c7bca1b Merge pull request #4445 from thinkyhead/rc_fix_rdfgsc_mega3 
Fix for R.D.F.G.S.C. with MEGATRONICS 3 board
 2016-07-28 15:55:30 -07:00
Scott Lahteine 03fdb26cd2 Wrangle encoder bits, LCD_CLICKED 2016-07-28 14:44:37 -07:00
Scott Lahteine 155def24c6 BLEN_A, B, C are defined in ultralcd headers 2016-07-28 14:38:50 -07:00
Scott Lahteine 42dcc3bf50 Remove "the click" comments 2016-07-28 14:38:50 -07:00
Scott Lahteine 0eba65f96b Fix for R.D.F.G.S.C. with MINITRONICS board 2016-07-28 14:38:50 -07:00
fabtopia 83d0d59303 Fix for R.D.F.G.S.C. with MEGATRONICS 3 board 
The support for reprapworld LCD boke the code for the REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER. See Full Grapics Display does not work any more after #4408  #4439
 2016-07-28 13:12:19 -07:00
João Brázio 4f191a384b
Moves the font folder into the buildroot 2016-07-28 19:56:41 +01:00
Scott Lahteine 5367d56f87 Merge pull request #4434 from thinkyhead/rc_delta_safe_homing 
DELTA should ignore Z_SAFE_HOMING
 2016-07-27 23:41:52 -07:00
Scott Lahteine 2525528fb2 DELTA should ignore Z_SAFE_HOMING 2016-07-27 23:25:56 -07:00
Scott Lahteine ab4b2a66ff Allow zero Z_RAISE_BETWEEN_PROBINGS 2016-07-27 05:00:58 -07:00
Scott Lahteine 8953e3e984 Allow Z_SAFE_HOMING without a probe 2016-07-27 04:33:56 -07:00
AnHardt e4942d2163 Switch SD2cadrLib to fastio 
Replace all fastDigitalRead/Write() with READ/WRITE()

Define SCK_PIN, MISO_PIN, MOSI_PIN in pins.h if not already defined in the pins_*.h files.

Remove these conditional pin definitions from the pin-files. They are now always defined.

Define separate sets of SPI-pins for AT90USB with and without Teensy support in fastio.h.
Likely this was the main reason for all that confusion about the AT90USB-SPI pins.
 2016-07-27 12:40:44 +02:00
Scott Lahteine 21e744c454 Allow zero raise for deploy/stow 2016-07-26 17:19:25 -07:00
Scott Lahteine 54084612fd Merge pull request #4415 from petrzjunior/transl 
[LANGUAGE] Update Czech (Info screen strings)
 2016-07-26 13:20:20 -07:00
Scott Lahteine 5597400cda Merge pull request #4414 from thinkyhead/rc_split_conditionals 
Split up Conditionals.h into two files
 2016-07-26 13:16:52 -07:00
Scott Lahteine 4be635ec6e Remove MSG_PRINT_TIME from languages 2016-07-26 12:47:45 -07:00
Scott Lahteine 3be49881c0 Make SanityCheck.h a catch-all for obsolete configs 2016-07-26 12:41:40 -07:00
Scott Lahteine fa647cca23 Do the sanity check just once per build 2016-07-26 12:37:14 -07:00
Scott Lahteine 24a1a16e5d Move versioning to MarlinConfig.h 2016-07-26 12:37:14 -07:00
Scott Lahteine 7e70a0b05d Move pins / Arduino includes to MarlinConfig.h 2016-07-26 12:37:14 -07:00
Scott Lahteine d9f7ed9a3c Move some macros from Marlin.h to macros.h 2016-07-26 12:37:13 -07:00
Scott Lahteine 277899c175 Move include _Bootscreen.h where needed 2016-07-26 12:37:13 -07:00
Scott Lahteine 83c4653c71 Include boards and macros ahead of configs 2016-07-26 12:19:50 -07:00
Scott Lahteine 5f4702ecb2 Make Conditionals.h a catch-all for old configs 2016-07-26 12:19:50 -07:00
Scott Lahteine 8a44928df3 Make Conditionals.h a catch-all for old configs 2016-07-26 12:19:50 -07:00
Petr Zahradník junior 3d9b878cf0 Czech update 2016-07-26 13:48:27 +02:00
Scott Lahteine c6226bb0aa Unify config in a single include without nested includes 2016-07-25 23:04:19 -07:00
Scott Lahteine 2d378fac1b No need to include thermistortables.h in Configuration.h 2016-07-25 22:43:50 -07:00
Scott Lahteine df27d01cd9 Arrange needed includes in Marlin.h 2016-07-25 20:53:36 -07:00
Scott Lahteine 93ea281061 Split up Conditionals.h into two files 
Rather than include twice, which is tricky but may confuse
 2016-07-25 20:30:45 -07:00
Scott Lahteine 8684570f68 Merge pull request #4412 from thinkyhead/rc_followup_4402 
Followup #4402 fixing 3-point leveling
 2016-07-25 16:10:50 -07:00
Scott Lahteine c55b7d0750 Merge pull request #4405 from thinkyhead/rc_theres_always_something 
Move HAS_DIGIPOTSS to Conditionals.h
 2016-07-25 15:58:42 -07:00
Scott Lahteine 42eebcd518 Merge pull request #4409 from thinkyhead/rc_cleanup_comment 
Clean up Transfer Buffer Size comment
 2016-07-25 15:58:34 -07:00
Scott Lahteine 5272147f7c Followup #4402 fixing 3-point leveling 2016-07-25 15:56:34 -07:00
Scott Lahteine fcc39e2b5f Clean up Transfer Buffer Size comment 2016-07-25 12:54:55 -07:00
Scott Lahteine 0c0a63322b Patches to prepare REPRAPWORLD_GRAPHICAL_LCD 2016-07-25 12:10:25 -07:00
brupje a60a668f6b Support for REPRAPWORLD_GRAPHICAL_LCD 2016-07-25 12:10:25 -07:00
Scott Lahteine 4f2ff46ab9 Move HAS_DIGIPOTSS to conditionals 2016-07-25 00:10:46 -07:00
Scott Lahteine 54f4f80077 Merge pull request #4404 from thinkyhead/rc_better_stepper_indirection 
Arrange stepper_indirection by axis
 2016-07-24 19:26:39 -07:00
Scott Lahteine 169c21b477 Merge pull request #4402 from thinkyhead/rc_consistent_positioning 
Account for coordinate space offsets
 2016-07-24 19:23:20 -07:00
Scott Lahteine 750a1e5116 Arrange stepper_indirection by axis 2016-07-24 19:00:51 -07:00
Scott Lahteine 7c27f34996 Merge pull request #4397 from thinkyhead/rc_tweak_eeprom 
Neaten up EEPROM read/write functions
 2016-07-24 18:45:54 -07:00
Scott Lahteine 2595a40a61 Account for coordinate space more in G28 / G29 / M48 2016-07-24 18:34:05 -07:00
Scott Lahteine 060dc6d95a Neaten up EEPROM read/write functions 2016-07-24 18:19:39 -07:00
Scott Lahteine b7b7c90477 Merge pull request #4389 from thinkyhead/rc_optimize_planner 
Optimize planner with precalculation, etc.
 2016-07-24 17:48:23 -07:00
Scott Lahteine 6900bb2286 Merge pull request #4395 from tnw513/italian_fix 
Update Italian translations. Remove trailing spaces.
 2016-07-24 17:47:48 -07:00
Scott Lahteine e4816293a8 serial_echopair_P for uint16_t 2016-07-24 17:46:37 -07:00
Scott Lahteine d8e5af6834 Use RAW_POSITION for MBL in planner.set_position_mm 2016-07-24 17:20:36 -07:00
Scott Lahteine b183442c61 Fix inactive_extruder_x_pos for coordinate space 2016-07-24 17:20:36 -07:00
Scott Lahteine f75b0c2ee1 Make POSITION macros global 2016-07-24 17:20:36 -07:00
Scott Lahteine 101b60ef42 Tweak Dual X Carriage data spacing 2016-07-24 17:20:35 -07:00
Scott Lahteine 1fe60b723f Merge pull request #4400 from thinkyhead/rc_sanity_check_temp_sensor 
Sanity check for too many temp sensors
 2016-07-24 15:38:41 -07:00
Scott Lahteine bedda3be61 Patch generic delta error caught by sanity check 2016-07-24 15:24:40 -07:00
Scott Lahteine a5212bf277 Sanity check for too many temp sensors 2016-07-24 13:47:27 -07:00
Scott Lahteine d8f2876753 Replace some float division with multiplication 2016-07-24 13:27:50 -07:00
Scott Lahteine ddde785b37 Code formatting in planner.cpp 2016-07-24 13:27:50 -07:00
Scott Lahteine f8b5749235 Replace division in planner with multiplication 2016-07-24 13:27:49 -07:00
Scott Lahteine b921f6b69d Optimize calculation of block->millimeters for DELTA 2016-07-24 13:27:49 -07:00
Scott Lahteine db5df9500b Move sync_plan_position closer to the top 2016-07-24 13:27:49 -07:00
Scott Lahteine 2839c56f5a Merge pull request #4390 from jbrazio/duration_t 
Renamed timestamp_t to duration_t
 2016-07-24 13:24:05 -07:00
Scott Lahteine d6c50671d3 Sanitycheck: Z_SAFE_HOMING points are reachable 2016-07-24 10:54:47 -07:00
Scott Lahteine a6203366b6 Sanitycheck: Z_SAFE_HOMING requires a probe 2016-07-24 10:54:25 -07:00
Scott Lahteine bbe5b80492 Always define probe limits if there is a probe 2016-07-24 10:53:58 -07:00
Silvio Didonna 950397f2a0 Added missing translations. Removed trailing spaces for consistency (#4376) 2016-07-24 17:22:30 +02:00
João Brázio 50fb0f7cec M31 serial output is now always in EN 2016-07-24 15:52:03 +01:00
João Brázio 62d96d72f3 Renamed timestamp_t to duration_t 2016-07-24 03:16:02 +01:00
Scott Lahteine 3e2b3353b0 Fix axis indices for COREYZ 2016-07-23 19:02:14 -07:00
Scott Lahteine c287846f46 Merge pull request #4387 from thinkyhead/rc_anhardt_more_4370 
Update Z in a unified way in run_z_probe
 2016-07-23 16:47:10 -07:00
Scott Lahteine 22d0654fe6 Merge pull request #4382 from esenapaj/Update-Japanese-translation 
Update Japanese translation
 2016-07-23 16:31:38 -07:00
Scott Lahteine bb93b6822a Use set_current_from_steppers_for_axis 2016-07-23 15:25:54 -07:00
AnHardt 96a162beda Use implications from #4370 in run_z_probe() 
See also https://github.com/MarlinFirmware/Marlin/pull/4370#issuecomment-234713680
 2016-07-23 13:09:28 -07:00
Scott Lahteine 4e67a85a5d Macros to loop over axes 2016-07-23 13:09:28 -07:00
esenapaj 784be56e99 Follow-up the PR #4353 (General cleanup: enum) 
・Update description of M111
 2016-07-24 00:53:35 +09:00
esenapaj 3c11977558 Update Japanese translation 
・Add translation
・Change translation
・Remove translation
 2016-07-23 22:07:20 +09:00