bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
4,419 Commits 1 Branch 4 Tags 151 MiB
2988147880
Commit Graph

3554 Commits

Author SHA1 Message Date
Scott Lahteine
545f7997ea Continue on empty lines instead of returning 2016-03-28 05:37:36 -07:00
Scott Lahteine
3dcf6d42ff Don't store escaped serial characters if comment_mode 2016-03-28 05:37:36 -07:00
Scott Lahteine
5f8e52aefb Minor cleanup to command dispatcher 2016-03-28 05:37:36 -07:00
jbrazio
0880fecbd4 Show a warning message when Arduino IDE is prior to 1.5 2016-03-28 11:55:42 +01:00
Scott Lahteine
f1ed310322 Add NUMERIC compare macros to simplify code 2016-03-28 03:52:49 -07:00
Scott Lahteine
3b2d159abd Relax the test for "Heating failed" errors 2016-03-27 07:02:10 -07:00
Scott Lahteine
2e4ddd5c22 Merge pull request #3260 from jbrazio/cleanup/standardize-comment-style 
Formatted multi-line comments
 2016-03-26 21:42:33 -07:00
jbrazio
443e6d26fe Formatted multi-line comments 2016-03-27 04:36:36 +01:00
esenapaj
7950b5268a Use SBI macro 2016-03-26 20:17:52 +09:00
Scott Lahteine
e4039a9b5b Merge pull request #3250 from esenapaj/patch-1 
Fix typo
 2016-03-26 00:41:31 -07:00
Scott Lahteine
1d987cd280 Merge pull request #3253 from thinkyhead/rc_autotune_menu_optional 
Make the Autotune option(s) in the LCD menu optional
 2016-03-26 00:32:05 -07:00
Scott Lahteine
d6f92f9efe Remove Tonokip remnant from recent PR 2016-03-25 23:50:29 -07:00
Scott Lahteine
ab412a2153 PIDTEMPBED on #endif 2016-03-25 23:50:28 -07:00
Scott Lahteine
53cc6cca46 Formalize some dependencies on PIDTEMPBED 2016-03-25 23:50:28 -07:00
Scott Lahteine
5955a3063f Sanity check PIDTEMPBED plus BED_LIMIT_SWITCHING 2016-03-25 23:50:28 -07:00
Scott Lahteine
67fabb6044 Merge pull request #3252 from thinkyhead/rc_keepalive_less 
Host Keepalive: Reduce frequency of "busy" messages
 2016-03-25 23:37:02 -07:00
Scott Lahteine
d1bdd25b84 Merge pull request #3249 from esenapaj/patch-2 
Update Japanese translation
 2016-03-25 22:53:00 -07:00
Scott Lahteine
0d554c10ac Merge pull request #3244 from ch100/RCBugFix 
Fixed backlight for PCF8575.
 2016-03-25 22:50:20 -07:00
Scott Lahteine
cd4c3e90bc Send a busy signal every 10 seconds instead of every 2 2016-03-25 22:15:40 -07:00
Scott Lahteine
8cb04816b5 Apply PID_AUTOTUNE_MENU option to ultralcd.cpp 2016-03-25 19:31:56 -07:00
Scott Lahteine
4b31c67dce Add PID_AUTOTUNE_MENU option 2016-03-25 19:31:56 -07:00
Scott Lahteine
e08915a723 Fix comments in Configuration_adv.h 2016-03-25 19:31:31 -07:00
Scott Lahteine
26168676e7 Merge pull request #3246 from thinkyhead/rc_fix_numeric_filenames 
Fix: current_command_args skips digits at the front
 2016-03-25 16:38:36 -07:00
esenapaj
f54315c728 Fix typo 
These are salvaged from closed-PR #3216.
 2016-03-26 08:37:17 +09:00
esenapaj
37a0806420 Update Japanese trasration 
Follow the PR #3242.
 2016-03-26 08:21:17 +09:00
Scott Lahteine
f423716c6a Fix: current_command_args skips digits at the front 
Closes #3245
 2016-03-25 16:12:41 -07:00
Christian Inci
627f39e1e3 Fixed backlight for PCF8575. 
Fixed backlight for PCF8575.

Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
 2016-03-25 14:49:55 +01:00
Scott Lahteine
fc0baec991 Merge pull request #3240 from esenapaj/patch-1 
Fix distribution date
 2016-03-25 06:49:42 -07:00
Scott Lahteine
18de9f55ac Merge pull request #3242 from thinkyhead/rc_epatel_mesh_fixes 
Updated Mesh Bed Leveling
 2016-03-25 06:48:12 -07:00
Scott Lahteine
3a1e6b1752 Merge pull request #3243 from AnHardt/homed 
axis_known_position -> axis_homed
 2016-03-25 06:36:46 -07:00
AnHardt
94962ee678 axis_known_position -> axis_homed 
In all these cases we want the axis to be homed. If we could have lost
some steps is secondary.

Reenables homing seperate axis with DISABLE_X / DISABLE_Y true.
 2016-03-25 14:05:20 +01:00
Edward Patel
14afe1a017 Move to Z=0 for G28 when using Manual Bed Leveling 
copy of 406992f9dd
 2016-03-25 04:58:44 -07:00
Edward Patel
c606ed447a Add "G29 S4" to fine tune Z level for Mesh Bed Leveling. 
Also add mbl.z_offset to the EEPROM, bumping the version to V23.
 2016-03-25 04:58:43 -07:00
Scott Lahteine
5d8036e554 Code cleanup around MOTOR_CURRENT_PWM options 2016-03-25 04:23:46 -07:00
esenapaj
bec112de87 Fix distribution date 2016-03-25 18:56:16 +09:00
Scott Lahteine
f394c0639e Merge pull request #3230 from jbrazio/bugfix/ultra-lcd-warning 
Fix a compiler warning in ultralcd.cpp
 2016-03-25 01:14:54 -07:00
João Brázio
f077c7abbf Fix dogm lcd error when FAN_PIN is defined as -1 2016-03-25 01:09:09 -07:00
Scott Lahteine
0da744b7b0 Further cleanup of comments, partial Doxygen-style 
Following up on #3231
 2016-03-25 00:45:56 -07:00
Scott Lahteine
4823791eb0 Merge pull request #3228 from esenapaj/patch-1 
Fix spelling
 2016-03-25 00:40:51 -07:00
jbrazio
80f221ed11 Fixed: warning: extra tokens at end of #endif directive 2016-03-24 19:33:25 +00:00
jbrazio
5e5d250832 Added gplv3 header to all Marlin files 2016-03-24 18:01:20 +00:00
esenapaj
89a845659a Fix spelling 
PROBABLE ->PROBEABLE
This is follow-up to #3069?
 2016-03-25 02:13:37 +09:00
Scott Lahteine
a6e39c1005 Release 1.1.0-RC4 2016-03-24 05:32:33 -07:00
Scott Lahteine
42ec1f39e7 Merge pull request #3207 from jbrazio/bugfix/toshiba-sdhc-flashair 
Toshiba Flash Air Wifi SD card support
 2016-03-24 05:28:48 -07:00
Scott Lahteine
b6ca86b974 Merge pull request #3197 from PheiPheiPhei/RCBugFix 
Enabling servo usage on boards with PWM current control
 2016-03-24 05:27:57 -07:00
Scott Lahteine
a6805ddf30 Merge pull request #3225 from yarda/fix-melzi-makr3d 
Fix MELZI_MAKR3D to use correct motherboard
 2016-03-24 05:24:57 -07:00
Scott Lahteine
af32a7d5d6 M120/M121 also set endstops non-homing state 2016-03-24 03:24:23 -07:00
Scott Lahteine
04fa9d4f47 Make Autotune options into Menu Edit Items 2016-03-24 02:00:08 -07:00
WPBack
e3f583a3be Fixes for PID AutoTune from menu 
Fixes for #3189

Setting a temp is still missing
 2016-03-24 01:47:30 -07:00
WPBack
3b3e8a02b5 Initial implementation of PID Autotune Menu Items 
Adds the parameter U to M303. If U1 is included , it will use the
PID-values from the auto-tune.
 2016-03-24 01:46:37 -07:00
Scott Lahteine
da9d4c4caf Merge pull request #3206 from esenapaj/patch-5 
Follow-up the PR #3082, etc
 2016-03-24 00:20:25 -07:00
Scott Lahteine
c5857f96c8 Merge pull request #3182 from thinkyhead/rcbugfix_printrboard_revf 
Add support for Printrboard RevF
 2016-03-24 00:12:06 -07:00
Scott Lahteine
f774420488 Merge pull request #3196 from thinkyhead/rc_controllerfan_bug 
Make DISABLE_INACTIVE_X, etc., true if missing
 2016-03-24 00:11:46 -07:00
Scott Lahteine
7d55d86081 Merge pull request #3219 from AnHardt/RH-pos-update 
Send position updates to RH
 2016-03-23 23:20:24 -07:00
Scott Lahteine
7ea4e095ad Merge pull request #3220 from thinkyhead/rc_tori_spelling 
Patch minor spelling error in cn, en, gl language file headings
 2016-03-23 22:43:11 -07:00
Scott Lahteine
bcbac698f2 Patch minor spelling issue in cn, en, gl language file headings 2016-03-23 22:30:07 -07:00
Scott Lahteine
49ed4696ea Merge pull request #3218 from AnHardt/lost-pin-undef 
Fix lost undef Y_MAX_PIN in pins.h
 2016-03-23 21:37:51 -07:00
Scott Lahteine
7112f2e41a Merge pull request #3204 from esenapaj/patch-3 
Change link to the document
 2016-03-23 20:56:52 -07:00
AnHardt
1c6a16d5bb Send position updates to RH 
Send position updates to RH where RH can not know the end position.

For example after G28 RepetierHost assumes to be at the homing-point,
but with a servo probe we are much higher. Now the RH-software-endstops
will prevent us from going down (if activated). With this patch the
internal position of RH is updated with `current_position[]`.
 2016-03-23 13:30:50 +01:00
AnHardt
1b336971ae Fix lost undef Y_MAX_PIN in pins.h 2016-03-23 12:48:06 +01:00
AnHardt
ba4eebad2f Fix Fan KICKSTART 
Sorting ot what else belongs to what if was not so hard.
But the static `ms = ms = millis();` was a bit surpising.
 2016-03-23 12:08:02 +01:00
Scott Lahteine
cbce025248 Merge pull request #3217 from thinkyhead/rc_updated_kana 
Patch-up to commits for Kana #3203.
Closes #3203.
 2016-03-23 02:46:26 -07:00
esenapaj
665338bb69 Update Japanese translation 2016-03-23 02:43:53 -07:00
AnHardt
6486e8b74a Call buzz() directly from M428 2016-03-22 15:05:04 +01:00
jbrazio
757661b299 Toshiba Flash Air Wifi SD card support 2016-03-22 11:42:11 +00:00
esenapaj
fc75e6f92d Follow-up the PR #3082, etc 
Follow-up the PR #3082
Follow-up the commit 143ad74: unnoticed updates
Fix for commit b0f5ba0: Z offset: -front [of the nozzle] +behind -> Y offset: -front [of the nozzle] +behind
Standardize the writing method: Z-probe, z-probe -> Z Probe
Adjust spacing
 2016-03-22 20:22:01 +09:00
esenapaj
22299c13c1 Change link to the document 
documentation/LCDLanguageFont.md moved to http://www.marlinfirmware.org/ at commit 12d0983757,
but http://www.marlinfirmware.org/ isn't working.
 2016-03-22 19:58:41 +09:00
PheiPheiPhei
adb5375a09 Enabling servo usage on boards with PWM current control 
Enabling servo usage on boards with PWM current control
timer5 is used by some boards like the Mini Rambo for controlling motor current via PWM, see stepper.cpp.
```cpp
  #ifdef MOTOR_CURRENT_PWM_XY_PIN
    pinMode(MOTOR_CURRENT_PWM_XY_PIN, OUTPUT);
    pinMode(MOTOR_CURRENT_PWM_Z_PIN, OUTPUT);
    pinMode(MOTOR_CURRENT_PWM_E_PIN, OUTPUT);
    digipot_current(0, motor_current_setting[0]);
    digipot_current(1, motor_current_setting[1]);
    digipot_current(2, motor_current_setting[2]);
    //Set timer5 to 31khz so the PWM of the motor power is as constant as possible. (removes a buzzing noise)
    TCCR5B = (TCCR5B & ~(_BV(CS50) | _BV(CS51) | _BV(CS52))) | _BV(CS50);
  #endif
}
```
Using the same timer for controlling servos results in loss of motor control. So use timer4/3 for those boards instead.
[See discussion here.](http://shop.prusa3d.com/forum/software-f13/enabling-auto-leveling-in-firmware-t416-s40.html)
 2016-03-22 00:56:31 +01:00
jbrazio
04e57e2b5e Update the Hephestos 2 default config 2016-03-21 18:20:29 +00:00
esenapaj
f260e00a72 fix spelling 
Thermister -> Thermistor
 2016-03-21 20:57:03 +09:00
Scott Lahteine
b1a3a95ad4 Tweak controllerFan to save a cycle or two 2016-03-20 22:11:09 -07:00
Scott Lahteine
04a6924633 Make DISABLE_INACTIVE_X, etc., the same as DISABLE_X (etc.) if missing 2016-03-20 22:10:52 -07: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
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
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
59483221d5 Move stepper DAC to a separate file 2016-03-19 19:24:26 -07:00
Scott Lahteine
5d0570cea0 Make digitalPotWrite depend on HAS_DIGIPOTSS 2016-03-19 19:24:26 -07:00
Scott Lahteine
f96bc03081 Add M907-M910 g-codes support for Printrbot Rev. F 2016-03-19 19:24:26 -07:00
Stephanie
6843b78f99 Add support for Printrboard RevF 
The PrintrBoard Rev F utilizes a mcp4728 DAC to set motor current. Printrbot's implementation utilizes 2 new M-codes to set and write the DAC settings to the DAC EEPROM: `M909` (Read DAC) and `M910` (Write DAC). `M907` is re-used to set value, `M908` for direct control.

The Pins file for the RevF board is included.
 2016-03-19 16:43:37 -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
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
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
esenapaj
8d580ea7e8 follow-up the PR #3114 
follow-up the commit d56c6af24e
 2016-03-19 13:17:34 +09:00
Scott Lahteine
d9e1f22682 BABYSTEPPING requires ULTRA_LCD 2016-03-18 18:22:53 -07:00
Scott Lahteine
e5fd43f343 Implement BABYSTEPPING for COREXY and COREXZ 2016-03-18 18:22:53 -07:00
Scott Lahteine
80277cc9c8 drain_queued_commands_P now returns true if there are more 2016-03-18 17:56:48 -07:00
Scott Lahteine
8fe7420310 Use a separate serial line buffer 2016-03-18 16:46:20 -07:00
Scott Lahteine
7d25c107a8 Merge pull request #3149 from esenapaj/patch-1 
suppress warnings
 2016-03-18 15:40:14 -07:00
Scott Lahteine
d56c6af24e Merge pull request #3114 from thinkyhead/rc_reverse_lcd_menu 
Option to reverse the click-wheel direction in menus
 2016-03-18 15:39:29 -07:00
Scott Lahteine
cc291aeb3c Move definition of "blink" to main ultralcd file 2016-03-17 18:19:05 -07:00
Scott Lahteine
e7e1866589 Merge pull request #3161 from Alex9779/fix_InitialExtruderDirection 
Fix initial extruder direction for second/third/fourth extruder if they run inverted to the first
 2016-03-16 12:58:10 -07:00
Scott Lahteine
57e82cacc9 Merge pull request #3156 from esenapaj/patch-3 
Fix CardReader::lsDive()
 2016-03-16 12:48:22 -07:00
Alexander Leisentritt
4338813814 save last extruder and set stepper directions too in case the extruder changed 
fixes MarlinFirmware/Marlin#3144 and MarlinFirmware/Marlin#3083
 2016-03-16 20:20:34 +01:00
Scott Lahteine
8f24475e02 Simplify limiting encoderLine in END_MENU 2016-03-16 04:05:41 -07:00
Scott Lahteine
fbef2f5b61 Implement reverse menu direction in ultralcd.cpp 2016-03-16 04:03:49 -07:00
Scott Lahteine
b8b51d8da8 Add the REVERSE_MENU_DIRECTION option 2016-03-16 04:02:40 -07:00
Scott Lahteine
999a76dbdf Merge pull request #3157 from esenapaj/patch-4 
Use variable in lcd_erase_line()
 2016-03-16 02:46:42 -07:00
Scott Lahteine
e8fa843c2d Merge pull request #3164 from epatel/epatel/RCBugFix 
Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z
 2016-03-16 02:40:54 -07:00
Scott Lahteine
fc04b587cf Merge pull request #3147 from thinkyhead/rc_stringify_macro 
Promote STRINGIFY to macros.h
 2016-03-15 17:37:03 -07:00
Scott Lahteine
d7c6fd5c2f Merge pull request #3146 from thinkyhead/rc_enabled_true_false 
Support "true" and "false" in the ENABLED macro
 2016-03-15 17:35:55 -07:00
Edward Patel
cb0dbfa3b5 Fix for #3160 MESH_BED_LEVELING broke correct G1 movement in Z 2016-03-16 01:26:00 +01:00
esenapaj
a15c5d222a Use variable in lcd_erase_line() 
lcd_erase_line() is called with argument, but the argument is ignored by lcd_erase_line().
 2016-03-16 02:59:06 +09:00
esenapaj
609c0d46d9 Fix CardReader::lsDive() 
If comparison between signed char(-128 ~ +127) and DIR_NAME_DELETED(uint8_t const 0XE5, it's +229),
it makes incorrect result.
 2016-03-16 02:47:58 +09:00
Scott Lahteine
2ef49a9d53 Wrap DEFAULT_Ki, DEFAULT_Kd, PID_dT 
Addition to #3140
 2016-03-15 03:49:44 -07:00
Scott Lahteine
eb8cf29464 Merge pull request #3151 from hydrocat/RCBugFix 
Uptades the pt-br translation
 2016-03-15 02:46:46 -07:00
Scott Lahteine
6e1bc03d3b Additional wrapping for #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine
cc9968f893 Patch spacing in #3140 2016-03-15 01:18:58 -07:00
Scott Lahteine
1c384930f3 Merge pull request #3140 from thinkyhead/rc_fix_macro_expansion 
Wrap macros to prevent bad expansions
 2016-03-15 00:25:34 -07:00
VITORIO MIGUEL PRIETO CILIA
de2cca73ac Uptades the pt-br translation 2016-03-14 21:16:57 -03:00
esenapaj
a4314c4907 Use local variable in recalc_delta_settings() 
diagonal_rod hadn't been used anywhere.
 2016-03-15 06:47:27 +09:00
esenapaj
8de7a6f9b1 suppress warnings 2016-03-15 06:34:02 +09:00
Scott Lahteine
9418b4f2f3 Promote STRINGIFY to macros.h 2016-03-13 23:15:17 -07:00
Scott Lahteine
4b648793f2 Use ENABLED with DISABLE_[INACTIVE_][XYZ] 2016-03-13 22:15:45 -07:00
Scott Lahteine
73a59a4e45 Allow ENABLED(b) to work with "true" and "false" 2016-03-13 22:15:01 -07:00
Blue-Marlin
c73f1b2471 Extend stack_overflow_protection for lcd_move_e and _lcd_level_bed 
Extend stack_overflow_protection for lcd_move_e() and _lcd_level_bed() with
a refined method of 3050.
 2016-03-13 13:59:44 +01:00
Scott Lahteine
f4a3efd35e Merge pull request #3116 from thinkyhead/rc_fix_value_edit_bug 
Fix value edit click bug
 2016-03-13 04:08:43 -07:00
Scott Lahteine
3f5fbbd398 Merge pull request #3124 from jbrazio/bugfix/update-g29-auto-level-bed-topography 
Update the bed topography output done by G29
 2016-03-13 03:51:43 -07:00
Scott Lahteine
c16c47954c Merge pull request #3141 from esenapaj2/RCBugFix 
follow-up the PR #3131
 2016-03-13 03:37:39 -07:00
Scott Lahteine
30c3a21d1f Merge pull request #3112 from thinkyhead/rc_support_MAX31855 2016-03-13 03:30:48 -07:00
Scott Lahteine
81d759efb6 Merge pull request #3138 from jbrazio/bugfix/m109-r-could-wait-forever 2016-03-13 03:26:34 -07:00
Scott Lahteine
2179f598bf Merge pull request #3122 from thinkyhead/rc_group_filament_change 2016-03-13 03:25:38 -07:00
Scott Lahteine
62a9b9902d Merge pull request #3133 from thinkyhead/rc_machine_uuid_in_m115 2016-03-13 03:23:54 -07:00
Scott Lahteine
f928894c38 Merge pull request #3132 from thinkyhead/rc_heating_failed_err 2016-03-13 03:23:14 -07:00
esenapaj2
236a44c83b follow-up the PR #3131 
follow-up the commit 7326d63ce0
update Configration_adv.h of Hephestos2
delete unnecessary spaces
 2016-03-13 19:12:39 +09:00
Scott Lahteine
f9ded2a7c4 Wrap macros to prevent bad expansions 2016-03-12 22:38:55 -08:00
jbrazio
a645860431 All print timer related activity now uses print_job_start(), print_job_timer() or print_job_stop() 2016-03-12 07:16:39 +00:00
jbrazio
1981e53d68 M109 R option if misused could cause a wait-forever situation 2016-03-12 06:24:24 +00:00
Scott Lahteine
7976e29399 Use MACHINE_UUID in M115 
Addressing #2879. The M115 report should display `MACHINE_UUID` but it
always displays `UUID`.
 2016-03-11 05:34:48 -08:00
Scott Lahteine
81aab828e2 Fix a "Heating failed" error 
Addressing #3085. If the target_temperature is set directly it never invokes or disables the timer set in `start_watching_heater`, so after _stopping a print_ or turning off _all heaters_ you could get a “Heating failed” error.
 2016-03-11 05:07:48 -08:00
Scott Lahteine
0c48eaf3de Expose motor current in more configs, disable by default 2016-03-11 02:25:36 -08:00
Elijah Snyder
e8b10d2836 Adding PWM_MOTOR_CURRENT flag to help expose PWM_MOTOR_CURRENTS in Configuration_adv.h similar to DIGIPOT_MOTOR_CURRENT 2016-03-11 02:25:36 -08:00
João Brázio
4d4a842cfb Update the bed topography output done by G29 2016-03-10 13:24:17 +00:00
Scott Lahteine
89838cdb10 Move step macros to stepper_indirection.h 2016-03-10 04:34:55 -08:00
João Brázio
793cd0ae3b Clean up the code a bit 2016-03-10 11:52:43 +00:00
Scott Lahteine
27f244ba2c Support MAX31855 as Temperature Sensor -3 2016-03-10 02:49:54 -08:00
Scott Lahteine
ce639b8b03 Group FILAMENT_SENSOR options together 2016-03-10 02:41:37 -08:00
Scott Lahteine
3fd31976c3 Reduce code in stepper.cpp with macros 2016-03-10 01:42:58 -08:00
Scott Lahteine
b45a0c4c60 Fix bugs in edit submenus so they return to origin 
Expected behavior: After editing a value the menu should return to the
previous place with the edited item selected.
Actual behavior: Either the top (back) item from the previous screen is
selected, or the menu jumps up another level.
Solution: Pass the correct arguments to `lcd_goto_menu` on click when
editing a value.
 2016-03-09 21:06:56 -08:00
jbrazio
986b508ff7 Print timer now stops when it sees the last extruder temperature being shutdown 2016-03-08 18:11:02 +00:00
AnHardt
fd5414c6ea Z_RAISE_BEFORE_HOMING -> MIN_Z_HEIGHT_FOR_HOMING 
rebased
corrected spelling
changed to #elif for error

Still with MIN_Z_HEIGHT_FOR_HOMING but con be done with (folder wide) search-replace when we have a better name.
 2016-03-08 17:50:23 +01:00
Scott Lahteine
b7928a000a Merge pull request #3108 from AnHardt/M110+ 
M110 and M29 rework
 2016-03-08 03:54:07 -08:00
Scott Lahteine
5cba0b4187 Merge pull request #3111 from thinkyhead/rc_drop_old_condition 
Drop obsolete test for leading "N"
 2016-03-08 03:07:25 -08:00
Scott Lahteine
302d1bfbc4 Drop obsolete test for leading "N" 2016-03-08 02:25:11 -08:00
AnHardt
37b857e8ec M110 ang M29 rework 
Add 'ok' output for G29 actually closing the file.
Handle M110 when received without linenumber/checksumm.
 2016-03-07 22:27:01 +01:00
esenapaj2
29e09c7c3e update example configurations 
update old comments
update or delete deprecated definitions
complement forgotten updates
adjust spacing
some cosmetic changes
 2016-03-07 22:03:33 +09:00
Scott Lahteine
fac85f6fa1 Merge pull request #3102 from jbrazio/bugfix-g28-multiple-z-movements 
Bugfix: G28 was lifting Z-axis multiple times
 2016-03-07 03:52:00 -08:00
jbrazio
642e3699ce Z-axis was being lift multiple times if Z_SAFE_HOMING was enabled and Z_RAISE_BEFORE_HOMING was greater than zero 2016-03-07 03:49:11 +00:00
Scott Lahteine
501f63802a Merge pull request #3077 from Blue-Marlin/watchdogreset-in-kill 
Add Watchdog timer reset in kill()
 2016-03-06 16:21:39 -08:00
Scott Lahteine
1002eb67c8 Update name of st_get_axis_position_mm in stepper.h 2016-03-06 15:46:39 -08:00
Jaroslav Škarvada
7dde761aa6 Fix MELZI_MAKR3D to use correct motherboard 
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
 2016-03-06 19:33:33 +01:00
Scott Lahteine
eafbc5e0cc Add AJ4P pins and fix RAMBO pins 2016-03-06 05:52:01 -08:00
Scott Lahteine
cf792fd8d8 Update configurations to use RAMPS 1.4 2016-03-06 05:52:01 -08:00
Scott Lahteine
cacf04f8a7 Base RAMPS-like boards on RAMPS 1.4 2016-03-06 05:52:00 -08:00
Scott Lahteine
50e3482e0a Handle RAMPS 1.3 as the special case 2016-03-06 05:52:00 -08:00
Scott Lahteine
679be3294f Rename RAMPS 1.3 pins for RAMPS 1.4 2016-03-06 05:52:00 -08:00
Scott Lahteine
f18d3f451a Limit LCD move_to_x/y coordinates for deltas 
Related to MarlinFirmware/MarlinDev#270
 2016-03-06 05:52:00 -08:00
Scott Lahteine
988332c67a Cosmetic tweaks from dev 2016-03-06 05:52:00 -08:00
Scott Lahteine
2690d8568e DOGLCD width/height in Conditionals.h 2016-03-06 05:51:59 -08:00
Scott Lahteine
614febaaf3 Fix acceleration limits 
See: https://github.com/Ultimaker/Marlin/pull/7
 2016-03-06 05:51:59 -08:00
Scott Lahteine
13ef12ad3f Fix power calculations 
As suggested by @max-pau in #3073 - #3074
 2016-03-06 05:51:59 -08:00
Scott Lahteine
e2b022cce2 Include #3053 2016-03-06 05:51:59 -08:00
Scott Lahteine
5cba0210f2 Small patch to Z_SAFE_HOMING comment 2016-03-06 05:51:58 -08:00
Scott Lahteine
6165fd41a5 Fix Hephestos 2 and other configs 2016-03-06 05:51:58 -08:00
Scott Lahteine
71718d888a Fix typos in check_axes_activity 2016-03-06 05:51:58 -08:00
Lukas Abfalterer
83795d3e63 deleted double used comments 2016-03-06 05:51:58 -08:00