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

6275 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Lahteine
ed018c98d5 Merge pull request #4024 from thinkyhead/rc_greek_language 
Greek Language by @psavva
 2016-07-10 19:42:09 -07:00
Scott Lahteine
d1dffc7ad1 timestamp => endtime 2016-07-10 19:36:46 -07:00
Scott Lahteine
71674059c3 Two strategies to address a stuck buzzer 2016-07-10 19:25:23 -07:00
Scott Lahteine
928ff6487a Greek language pack from @psavva 2016-07-10 18:59:04 -07:00
AnHardt
e92e58df1f Adjust wait_for_cooling slope 
Adjust wait_for_cooling slope
and drop mintemp for cooling.

See
https://github.com/MarlinFirmware/Marlin/pull/4169#issuecomment-231544532
 2016-07-11 03:36:23 +02:00
Scott Lahteine
167f4aa0cc Merge pull request #4259 from clexpert/patch-3 
Update language_cz.h
 2016-07-10 18:26:23 -07:00
Scott Lahteine
8dda05e92a Merge pull request #4258 from clexpert/patch-2 
Total print time for LCD correction (hours:minutes format)
 2016-07-10 18:25:18 -07:00
Scott Lahteine
0ccc5d1dd9 Merge pull request #4244 from thinkyhead/rc_dyze_thermistor_diff 
Dyze High Temp Thermistor Support
 2016-07-10 18:08:44 -07:00
Scott Lahteine
182c8d7f8f Dyze High Temp Thermistor Support 2016-07-10 17:59:05 -07:00
Scott Lahteine
5b0e46c986 Merge pull request #4256 from thinkyhead/rc_fix_singlenozzle_temp 
Additional tweaks for HOTENDS == 1
 2016-07-10 17:57:00 -07:00
Scott Lahteine
5b87deebb6 Merge pull request #4257 from esenapaj/Follow-up-the-PR-#4253-etc 
Follow-up the PR #4253 (Runout Sensor without SD Card, Print Timer support in M104), etc
 2016-07-10 16:59:24 -07:00
Scott Lahteine
ee0983ab57 Further reduction when HOTENDS == 1 2016-07-10 16:54:30 -07:00
Scott Lahteine
3e1bbd5e27 Indentation in gcode_M100 2016-07-10 16:33:51 -07:00
Scott Lahteine
b72238f406 Invariant get_pid_output with HOTENDS < 2 2016-07-10 16:33:51 -07:00
Petr Zahradnik
66602f4af6 Update language_cz.h 
New strings:
#define MSG_HALTED
#define MSG_PLEASE_RESET
Some texts shortened for smaller displays.
 2016-07-10 13:25:50 +02:00
Petr Zahradnik
eaf9e615ce Total print time for LCD correction (hours:minutes format) 2016-07-10 13:08:05 +02:00
esenapaj
9e56d5825e Adjust spacing 2016-07-10 14:25:29 +09:00
esenapaj
5832f4b848 Follow-up the PR #4253 (Runout Sensor without SD Card, Print Timer support in M104) 
・Update forgotten example configuration files
 2016-07-10 14:24:57 +09:00
Scott Lahteine
77283f5bf0 Merge pull request #4245 from thinkyhead/rc_simpler_therm_check 
Simpler/extensible thermistor test in thermistortables.h
 2016-07-09 21:13:42 -07:00
Scott Lahteine
f9e08b1fcd Merge pull request #4254 from AnHardt/killscreen 
Add a kill-screen
 2016-07-09 20:44:42 -07:00
AnHardt
faac2bcfdb Add a kill-screen 2016-07-10 04:50:45 +02:00
Scott Lahteine
3b3e52616c Merge pull request #4253 from thinkyhead/rc_clexpert_runout 
Runout Sensor without SD Card, Print Timer support in M104
 2016-07-09 19:10:36 -07:00
Scott Lahteine
aa3ab93971 Merge pull request #4240 from AnHardt/sampler-8-7-16 
Today's fix and cleanup collection
 2016-07-09 19:09:45 -07:00
Scott Lahteine
4cd045791c Reduce code size by trusting the compiler 2016-07-09 18:17:44 -07:00
Scott Lahteine
a8538bd7ce General cleanup, code reduction in Marlin_main.cpp 2016-07-09 18:17:44 -07:00
Scott Lahteine
1026e5b071 Replace PLA/ABS preheating with generic 2016-07-09 18:06:51 -07:00
Petr Zahradnik
e282d69f63 Print job timer comment changed 2016-07-09 17:57:54 -07:00
Petr Zahradnik
a2159cfbc3 Error message change in SanityCheck.h 2016-07-09 17:57:54 -07:00
Petr Zahradník junior
315b4c2153 Runout sensor without SD Card 2016-07-09 17:57:53 -07:00
Scott Lahteine
51c9c3fe2c Indentation in MarlinSerial.cpp 2016-07-09 17:57:53 -07:00
Scott Lahteine
e03414b2dd Simpler/extensible thermistor test in thermistortables.h 2016-07-08 19:54:45 -07:00
Scott Lahteine
c23dd7eefc Merge pull request #4241 from AnHardt/adTXbuffer3 
Add TX-buffer for MarlinSerial
 2016-07-08 18:34:53 -07:00
AnHardt
4b44a23a36 Add TX-buffer for MarlinSerial 
Similar to the current Arduino HardwareSerial
but with max. 256 byte buffer-size.

Deactivated by default.

The boards with AT90USB processor (USBCON) already use a TX-buffer.
 2016-07-08 17:25:21 +02:00
AnHardt
468f7f03a2 homeaxis() can leave early 
when no known axis needs to be homed.

Most changes are only caused from altering the indentation.
```
if (axis == X_AXIS ? HOMEAXIS_DO(X) : axis == Y_AXIS ? HOMEAXIS_DO(Y) : axis == Z_AXIS ? HOMEAXIS_DO(Z) : 0) {
  ...
}

to

if (!(axis == X_AXIS ? HOMEAXIS_DO(X) : axis == Y_AXIS ? HOMEAXIS_DO(Y) : axis == Z_AXIS ? HOMEAXIS_DO(Z) : 0)) return;
...

```
 2016-07-08 15:59:33 +02:00
AnHardt
eff7912243 Ensble/disable hardware endstops in G28 globally. 
For moving away from the endstops we do not have to disable them.
They are not tested anyway.
 2016-07-08 15:49:10 +02:00
AnHardt
f69434d81c Eliminate void setup_for_endstop_move() 2016-07-08 15:23:20 +02:00
AnHardt
0ea6247fc2 Use logic in Z_SAFE_HOMING 
Use logic in Z_SAFE_HOMING

From
```
if (home_all_axis || homeZ) {
  if (home_all_axis) {
  ...
  home z
  }
  else if (homeZ) { // Don't need to Home Z twice
  home z
  }
}

```
to
```
if (home_all_axis || homeZ) {
  if (home_all_axis) {
  ...
  }
  home z
}
```
 2016-07-08 15:08:50 +02:00
AnHardt
de3a169336 Always define MIN_Z_HEIGHT_FOR_HOMING even if 0 
Always define MIN_Z_HEIGHT_FOR_HOMING even if 0
Always make a potential rise to `home_offset[Z_AXIS]` possible in G28.
Get rid of some very ugly constructs in MBL (ultralcd.cpp).
 2016-07-08 15:08:32 +02:00
AnHardt
88ed232f53 Remove HAS_BED_PROBE case in first raise in G28 
Differentiating made sense here when we could save a dozen lines of code,
but not for one line.
 2016-07-08 14:59:44 +02:00
AnHardt
653eff3b31 Clean up quick_home_xy() 
Since we do the actual homing now in the 'normal' routines `quick_home_xy()`
can be simplified to a relative simple diagonal move.
 2016-07-08 14:59:27 +02:00
Scott Lahteine
98d0167a57 Merge pull request #4226 from thinkyhead/rc_emergency_command_parser 
MarlinSerial emergency-command parser (with M108)
 2016-07-07 16:53:55 -07:00
Scott Lahteine
2ee4e4f791 Make wait_for_heatup volatile 2016-07-07 16:37:23 -07:00
Scott Lahteine
bd5a825b8b Wait for end of line before invoking action 2016-07-07 16:37:23 -07:00
Scott Lahteine
ea47803ae2 Simplify emergency parser (only parse initial command) 2016-07-07 16:37:22 -07:00
Scott Lahteine
834ad14c8d Add quickstop_stepper to update current position with stepper.quick_stop() 2016-07-07 16:37:22 -07:00
Scott Lahteine
ecffe92e20 Group EMERGENCY_PARSER commands 2016-07-07 16:37:22 -07:00
AnHardt
a129078927 Add an emergency-command parser to MarlinSerial (supporting M108) 
Add an emergency-command parser to MarlinSerial's RX interrupt.

The parser tries to find and execute M108,M112,M410 before the commands disappear in the RX-buffer.

To avoid false positives for M117, comments and commands followed by filenames (M23, M28, M30, M32, M33) are filtered.

This enables Marlin to receive and react on the Emergency command at all times - regardless of whether the buffers are full or not. It remains to convince hosts to send the commands. To inform the hosts about the new feature a new entry in the M115-report was made. "`EMERGENCY_CODES:M112,M108,M410;`".

The parser is fast. It only ever needs two switch decisions and one assignment of the new state for every character.

One problem remains. If the host has sent an incomplete line before sending an emergency command the emergency command could be omitted when the parser is in `state_IGNORE`.
In that case the host should send "\ncommand\n"

Also introduces M108 to break the waiting for the heaters in M109, M190 and M303.

Rename `cancel_heatup` to `wait_for_heatup` to better see the purpose.
 2016-07-07 16:37:22 -07:00
Scott Lahteine
9f42b1a075 Merge pull request #4235 from thinkyhead/rc_revert_quickhome_test 
Fix quick homing, tweak MIN_Z_HEIGHT_FOR_HOMING
 2016-07-07 13:37:14 -07:00
Scott Lahteine
ad968f2325 Merge pull request #4234 from thinkyhead/rc_better_position_logging 
Move XYZ in print_xyz and DEBUG_POS to the front
 2016-07-07 12:31:15 -07:00
Scott Lahteine
4036c73cdd Don't raise Z if only homing Z 2016-07-07 12:28:37 -07:00