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

4740 commits

Author SHA1 Message Date
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
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
Scott Lahteine
08459a003f Undo the self-sabotage that is do_blocking_move_to_axis_pos 2016-07-23 00:59:11 -07:00
esenapaj
d32c4056ad Fix for the PR #4379 (Additional logging of do_blocking_move_to) 
・Remove unneeded PSTR()
 2016-07-23 16:38:57 +09:00
Scott Lahteine
8099ee51a5 Merge pull request #4379 from thinkyhead/rc_blocking_move_logging 
Additional logging of do_blocking_move_to
 2016-07-23 00:10:55 -07:00
Scott Lahteine
8633b644cf Merge pull request #4378 from thinkyhead/rc_debug_leveling_docs 
Document DEBUG_LEVELING_FEATURE
 2016-07-22 23:57:01 -07:00
Scott Lahteine
ad16d5019e Additional logging of do_blocking_move_to 2016-07-22 23:53:08 -07:00
Scott Lahteine
bb9da6ebdd Document DEBUG_LEVELING_FEATURE 2016-07-22 23:37:41 -07:00
Scott Lahteine
652fd8a826 Merge pull request #4362 from thinkyhead/rc_duplication_mode 
DUAL_NOZZLE_DUPLICATION_MODE
 2016-07-22 21:17:59 -07:00
Scott Lahteine
1766b990b8 Merge pull request #4376 from jbrazio/timestamp_t-short 
Adds short format to timestamp_t
 2016-07-22 21:17:17 -07:00
Scott Lahteine
6da3729531 Merge pull request #4370 from thinkyhead/rc_delta_fwd_kinematics 
Delta Forward Kinematics (and LOGICAL_POSITION)
 2016-07-22 21:16:00 -07:00
João Brázio
9e5dbf67e8 Update the stats menu to include longest job and extruded filament 2016-07-23 03:05:45 +01:00
João Brázio
86d9311495 Rework LCD implementation to use timestamp_t 2016-07-23 03:05:36 +01:00
Scott Lahteine
b3eb0c8569 Add LOGICAL_POSITION macro, apply to kinematics 2016-07-22 18:38:13 -07:00
Scott Lahteine
35a610abf9 const arg to inverse_kinematics 2016-07-22 17:42:48 -07:00
João Brázio
b4aad85c9a Rework stats menu to use timestamp_t 2016-07-23 01:42:21 +01:00
João Brázio
ecd48027fa Adds short timestamp format to timestamp_t 2016-07-23 01:41:25 +01:00
Scott Lahteine
b6afa028f4 Don't call adjust_delta on SCARA 2016-07-22 16:36:34 -07:00
Scott Lahteine
d5e2d523c7 Generalize kinematics function names 2016-07-22 16:36:34 -07:00
Scott Lahteine
9c4ad7d7ef Clean up delta declarations in Marlin_main.cpp 2016-07-22 16:36:33 -07:00
Scott Lahteine
4b1725628b Move kinematic functions to "private" scope 2016-07-22 16:36:33 -07:00
Scott Lahteine
cde068ea42 Use set_current_from_steppers in quickstop_stepper 2016-07-22 16:36:33 -07:00
Scott Lahteine
9f30cc84ce Use set_current_from_steppers for other kinematics 2016-07-22 16:36:33 -07:00
AnHardt
5db9b940ee Use forwardKinematics in DELTA run_z_probe() 2016-07-22 16:36:33 -07:00
Scott Lahteine
b5a9647fec Use ENABLED in stepper_indirection.h 2016-07-22 16:26:06 -07:00
Scott Lahteine
cbc7f22ad9 Implement DUAL_NOZZLE_DUPLICATION_MODE 2016-07-22 16:23:58 -07:00
Scott Lahteine
91777dd76c Add DUAL_NOZZLE_DUPLICATION_MODE option 2016-07-22 16:22:56 -07:00
Scott Lahteine
260bbb3109 Fix a couple of simple typos 2016-07-22 16:22:56 -07:00