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
9045ea3adf
Merge branch 'RCBugFix' into RC
2016-03-25 01:12:37 -07:00
f52f388bda
Merge pull request #3239 from thinkyhead/rc_jbrazio_fanerr
...
Closes #3235 . Fix dogm lcd error when FAN_PIN is defined as -1
2016-03-25 01:11:06 -07:00
f077c7abbf
Fix dogm lcd error when FAN_PIN is defined as -1
2016-03-25 01:09:09 -07:00
6f9442afca
Merge branch 'RCBugFix' into RC
2016-03-25 01:01:03 -07:00
080c85a4c9
Merge pull request #3236 from thinkyhead/rc_followup_3231
...
Further cleanup of comments, partial Doxygen-style
2016-03-25 00:53:10 -07:00
0da744b7b0
Further cleanup of comments, partial Doxygen-style
...
Following up on #3231
2016-03-25 00:45:56 -07:00
4823791eb0
Merge pull request #3228 from esenapaj/patch-1
...
Fix spelling
2016-03-25 00:40:51 -07:00
af6049c6c2
Merge pull request #3231 from jbrazio/license/add-gpl3-header
...
Added GPLv3 header to all Marlin files
2016-03-24 22:40:40 -07:00
80f221ed11
Fixed: warning: extra tokens at end of #endif directive
2016-03-24 19:33:25 +00:00
5e5d250832
Added gplv3 header to all Marlin files
2016-03-24 18:01:20 +00:00
89a845659a
Fix spelling
...
PROBABLE ->PROBEABLE
This is follow-up to #3069 ?
2016-03-25 02:13:37 +09:00
e12a481e35
Prettier summaries in README
2016-03-24 07:47:59 -07:00
c80e5aca30
New README for 1.1.0-RC4
2016-03-24 06:52:14 -07:00
dd4d860ad7
Merge branch 'Release-1.1.0-RC4' into RC
2016-03-24 05:33:32 -07:00
a6e39c1005
Release 1.1.0-RC4
2016-03-24 05:32:33 -07:00
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
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
515c8d4fe9
Merge pull request #3226 from yarda/fix-use-arduino-protocol-for-programming
...
Use arduino programming protocol by default for sanguino
2016-03-24 05:26:02 -07:00
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
d62ba3d87e
Merge pull request #3222 from thinkyhead/rc_persist_endstop_enabling
...
M120/M121 also set endstops non-homing state
2016-03-24 04:41:42 -07:00
af32a7d5d6
M120/M121 also set endstops non-homing state
2016-03-24 03:24:23 -07:00
02f466e633
Merge pull request #3202 from thinkyhead/rc_menu_item_M303_redo
...
Add Menu Items to initiate M303
2016-03-24 02:41:16 -07:00
04fa9d4f47
Make Autotune options into Menu Edit Items
2016-03-24 02:00:08 -07:00
e3f583a3be
Fixes for PID AutoTune from menu
...
Fixes for #3189
Setting a temp is still missing
2016-03-24 01:47:30 -07:00
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
da9d4c4caf
Merge pull request #3206 from esenapaj/patch-5
...
Follow-up the PR #3082 , etc
2016-03-24 00:20:25 -07:00
c5857f96c8
Merge pull request #3182 from thinkyhead/rcbugfix_printrboard_revf
...
Add support for Printrboard RevF
2016-03-24 00:12:06 -07:00
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
7d55d86081
Merge pull request #3219 from AnHardt/RH-pos-update
...
Send position updates to RH
2016-03-23 23:20:24 -07:00
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
bcbac698f2
Patch minor spelling issue in cn, en, gl language file headings
2016-03-23 22:30:07 -07:00
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
7112f2e41a
Merge pull request #3204 from esenapaj/patch-3
...
Change link to the document
2016-03-23 20:56:52 -07:00
041fc639d7
Merge pull request #3215 from AnHardt/fix-kickstart
...
Fix Fan KICKSTART
2016-03-23 20:54:58 -07:00
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
1b336971ae
Fix lost undef Y_MAX_PIN in pins.h
2016-03-23 12:48:06 +01:00
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
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
665338bb69
Update Japanese translation
2016-03-23 02:43:53 -07:00
97ed8abd3f
Merge pull request #3213 from AnHardt/extend-gitignore
...
Extend .gitignore
2016-03-23 00:34:30 -07:00
b705ae0cb0
Merge pull request #3210 from thinkyhead/rc_cleanup_travis_ci
...
Improve Travis CI test
2016-03-23 00:32:45 -07:00
1cd1ccbf86
Enable/disable multiple options on a single line.
2016-03-22 22:33:00 -07:00
ff272c7b69
Improve Travis CI test
...
- Add shell scripts to help with managing configs
- Clean up .travis.yml file by using shell scripts
- Don’t download “astyle” – not needed and delays Travis results
2016-03-22 22:23:07 -07:00
0c8e747f88
extend .gitignore
2016-03-22 17:05:45 +01:00
815943ceed
Merge pull request #3209 from AnHardt/call-buzz-direct
...
Call buzz() directly from M428
2016-03-22 08:04:30 -07:00
6486e8b74a
Call buzz() directly from M428
2016-03-22 15:05:04 +01:00
757661b299
Toshiba Flash Air Wifi SD card support
2016-03-22 11:42:11 +00:00
fc75e6f92d
Follow-up the PR #3082 , etc
...
Follow-up the PR #3082
Follow-up the commit 143ad74b0f5ba0
2016-03-22 20:22:01 +09:00
22299c13c1
Change link to the document
...
documentation/LCDLanguageFont.md moved to http://www.marlinfirmware.org/ at commit 12d0983757http://www.marlinfirmware.org/ isn't working.
2016-03-22 19:58:41 +09:00
