MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
4,152 Commits 1 Branch 0 Tags 129 MiB
cadded1e21
Commit Graph

4152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Lahteine
cadded1e21 Merge pull request #3201 from jbrazio/feature/update-hephestos2-default-config 
Update the Hephestos 2 default config
 2016-03-21 14:35:00 -07:00
jbrazio
04e57e2b5e Update the Hephestos 2 default config 2016-03-21 18:20:29 +00:00
Scott Lahteine
40c7e5d4e7 Merge pull request #3199 from esenapaj/patch-2 
fix spelling
 2016-03-21 05:49:59 -07:00
esenapaj
f260e00a72 fix spelling 
Thermister -> Thermistor
 2016-03-21 20:57:03 +09:00
Scott Lahteine
15fccd43ee Fix spacing of an #endif 2016-03-20 20:32:55 -07:00
Scott Lahteine
be08eb6153 Merge pull request #3194 from jbrazio/feature/add-pt_pt-utf8 
Add pt_pt-utf8 language pack and fix some minor compiler warnings
 2016-03-20 17:42:45 -07:00
Scott Lahteine
d1ff7959b7 Merge pull request #3188 from esenapaj/patch-1 
follow-up the commit b82d91e
 2016-03-20 17:39:52 -07:00
Scott Lahteine
10caee2b7c Merge pull request #3187 from AnHardt/target_extruder_number 
Fix extrudernum in MSG_INVALID_EXTRUDER
 2016-03-20 17:15:22 -07:00
Scott Lahteine
1cc316f1fd Merge pull request #3082 from thinkyhead/updated_2820 
This is quite comprehensive. If probes are disabled in any case when they shouldn't be, I'm sure we will hear about it soon.
 2016-03-20 17:10:38 -07:00
Scott Lahteine
7bf5d117e7 Merge pull request #3069 from thinkyhead/rc_delta_compat_m48 
Delta-compatible extensions to M48
 2016-03-20 17:09:18 -07:00
Scott Lahteine
db8ab50c66 Merge pull request #3192 from tnw513/fix_lang 
Added missing translations.
 2016-03-20 17:07:00 -07:00
Scott Lahteine
06332f20be Merge pull request #3113 from jbrazio/bugfix/3061-stop-print-time-counter 
Stop print timer with M105/M109
 2016-03-20 17:05:07 -07:00
Scott Lahteine
ac4e461901 Merge pull request #3186 from AnHardt/Fix-KEEPALIVE_STATE 
Fix KEEPALIVE_STATE
 2016-03-20 16:29:19 -07:00
jbrazio
92a7d4515a Missing coma comment correction for the default cofig file 2016-03-20 23:23:11 +00:00
jbrazio
1aa531a3db Missing coma comment correction for all config files 2016-03-20 23:21:45 +00:00
jbrazio
68dda08fff Added pt_pt-utf8 language pack; Fixed some minor compiler warnings; Harmonize file suffix for the current existing UTF8 language packs; Updated all configuration files to reflect the new language packs 2016-03-20 23:14:24 +00:00
Silvio Didonna
f8c10d6b0e Added missing translations. 2016-03-20 22:34:00 +01:00
esenapaj
468df96b0f follow-up the commit b82d91e 
follow-up the commit b82d91eca6
 2016-03-20 20:57:14 +09:00
AnHardt
338b69c24b Fix extrudernum in MSG_INVALID_EXTRUDER 
SERIAL_ECHO is not very good in printing uint8_t - so cast. to int.
 2016-03-20 11:39:06 +01:00
AnHardt
b39b54031b Fix KEEPALIVE_STATE 
Add return to NOT_BUSY for M105
Replace WAIT_FOR_USER with PAUSED_FOR_USER

Add Travis test for FILAMENTCHANGEENABLE
 2016-03-20 10:41:56 +01:00
Scott Lahteine
32f75749e4 Merge pull request #3117 from Blue-Marlin/thermal-protection 
Improve the descriptions for THERMAL_PROTECTION
 2016-03-19 23:41:05 -07:00
Scott Lahteine
7aafee3003 Merge pull request #3185 from esenapaj/patch-1 
follow-up the PR #3180, #3183
 2016-03-19 23:36:55 -07:00
esenapaj
37eaa1406b follow-up the PR #3180 2016-03-20 15:33:02 +09:00
esenapaj
198d5d56fd follow-up the PR #3183 2016-03-20 13:58:05 +09:00
Scott Lahteine
4119cef32f Merge pull request #3180 from clexpert/RCBugFix 
Czech language specific changes
 2016-03-19 20:18:05 -07:00
Scott Lahteine
da94bcfebb Merge pull request #3184 from thinkyhead/fix_command_injection 
Patch drain_queued_commands_P
 2016-03-19 20:12:16 -07:00
Scott Lahteine
41145e6e81 Patch drain_queued_commands_P 
Fix a SNAFU that should have been caught in #3012
 2016-03-19 20:10:41 -07:00
Scott Lahteine
3ce0c5063f Merge pull request #3183 from thinkyhead/rc_lcm1602_support 
Also closes #3181.
 2016-03-19 19:28:50 -07:00
CoderSquirrel
eda95d8bed Add support for LCM1602 16x2 I2C LCD adapter 2016-03-19 19:26:44 -07:00
Scott Lahteine
8d9cf72db0 Merge pull request #3177 from thinkyhead/rc_finish_M665 
Include M665 "ABC" parameters in EEPROM
 2016-03-19 18:08:33 -07:00
Petr Zahradnik
98392782ea Update Configuration.h 2016-03-19 20:45:13 +01:00
Petr Zahradnik
daa52124b0 Update language_cz.h 2016-03-19 20:43:28 +01:00
Blue-Marlin
3166aed087 Improve the descriptions for THERMAL_PROTECTION 2016-03-19 14:08:59 +01:00
Scott Lahteine
a02ae36ae8 Include M65 "ABC" parameters in EEPROM 
Addressing #2773
 2016-03-19 05:52:20 -07:00
Scott Lahteine
7f2375ab46 Merge pull request #3176 from thinkyhead/rc_patch_3149_part_ii 
Use const parameters in lcd_implementation_drawedit (etc.)
 2016-03-19 05:18:25 -07:00
Scott Lahteine
cf7c444aff Apply unknown_position_error elsewhere 2016-03-19 05:13:40 -07:00
Scott Lahteine
eda5190581 Check for known position in M48 2016-03-19 05:13:40 -07:00
Scott Lahteine
68085ca855 Updated M48 friendly for DELTA 
Partial implementation with reference to MarlinFirmware/Marlin#3011
 2016-03-19 05:13:40 -07:00
Scott Lahteine
6a3529247f "Homing" as a translatable string 2016-03-19 04:41:03 -07:00
Scott Lahteine
c97c2dcaf7 Use const parameters instead of static casting 
Alternative fix to #3149
 2016-03-19 03:36:53 -07:00
Scott Lahteine
09ef955191 Merge pull request #3086 from thinkyhead/rc_two_fans 
Support for multiple PWM fans
 2016-03-19 03:19:18 -07:00
Scott Lahteine
38b0082bf2 Additional tweaks to M42 exit conditions 2016-03-19 03:10:18 -07:00
Scott Lahteine
4bbea5124d Support for multiple PWM fans 2016-03-19 03:10:18 -07:00
Scott Lahteine
637cc03686 Fix M109 so it won't wait for cooling 
Addressing issue #2767
 2016-03-19 03:00:58 -07:00
AnHardt
3f45a1acf9 Check probes only when deployed 
Aim: Test probes in update_endstops only when activated

Changes:
Configurations
 Add define for FIX_MOUNTED_PROBE to handle the situation where formerly ENDSTOPS_ONLY_FOR_HOMING had to be set, or lowering the nozzle below Z_PROBE_OFFSET_FROM_EXTRUDER could give an "endstop hit" message.
 Add define for Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN to indicate a common situation, that we have a probe but it is connected to an endstop pin
 Add some comments
 Shift some entries to have related things together.

Conditionals.h
 We have a probe (HAS_Z_MIN_PROBE) if one of the pins is defined AND one of the probes is defined.

SanityCheck.h
 Add some tests if the probe is connected and if we have defined a probe.

stepper.cpp
 Changes to test the probe only when it is deployed (z_probe_is_active).
 Test update_endstops() when the probe is deployed.

MarlinMain.cpp
 a. set and reset z_probe_is_active in deploy_z_probe(), stow_z_probe() and dock_sled()
 b. set and reset z_probe_is_active in the case a z-servo is moved to a defined position. The only remaining unhandled servo move is in M280 where we do not end in a defined position. If you want to handle a probe use M401/402
 c. skip deploying/stowing when already deployed/stowed in the dedicated deploy/stow functions.
 d. Handle the new FIX_MOUNTED_PROBE in parallel to a servo driven probe/endstop.

 To do: In another PR. handle all probes in deploy/stow_z_probe.
 Sort out SERVO_LEVELING vs. HAS_SERVO_ENDSTOPS.
 2016-03-19 02:00:08 -07:00
Scott Lahteine
4634feaeab Merge pull request #3012 from thinkyhead/fix_command_injection 
Use a serial line buffer to prevent queue corruption
 2016-03-19 01:43:54 -07:00
Scott Lahteine
9bf87aac6a Merge pull request #3127 from thinkyhead/rc_core_babystepping 
Implement BABYSTEPPING for COREXY and COREXZ
 2016-03-18 23:25:26 -07:00
Scott Lahteine
4ae03df5c2 Merge pull request #3109 from thinkyhead/rc_host_keepalive 
Provide feedback to hosts when busy
 2016-03-18 23:22:29 -07:00
Scott Lahteine
963a92ceda Patch idle forevermore 2016-03-18 22:38:35 -07:00
Scott Lahteine
7ec7bb31c4 Send a Busy signal to hosts during long processes, wait for input, etc 
If Marlin is blocking the serial input or command queue for any length
of time (for example more than 2 seconds), it needs to send a message
to serial out to inform the host that it is busy. Marlin should only
send these messages out when busy, and preferably not when trying to
print formatted output.
 2016-03-18 22:38:35 -07:00