zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
4196 commits 1 branch 0 tags 156 MiB
Commit graph

4196 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
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 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
Scott Lahteine af32a7d5d6 M120/M121 also set endstops non-homing state 2016-03-24 03:24:23 -07:00
Scott Lahteine 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
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
Scott Lahteine 041fc639d7 Merge pull request #3215 from AnHardt/fix-kickstart 
Fix Fan KICKSTART
 2016-03-23 20:54:58 -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
Scott Lahteine 97ed8abd3f Merge pull request #3213 from AnHardt/extend-gitignore 
Extend .gitignore
 2016-03-23 00:34:30 -07:00
Scott Lahteine b705ae0cb0 Merge pull request #3210 from thinkyhead/rc_cleanup_travis_ci 
Improve Travis CI test
 2016-03-23 00:32:45 -07:00
Scott Lahteine 1cd1ccbf86 Enable/disable multiple options on a single line. 2016-03-22 22:33:00 -07:00
Scott Lahteine 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
AnHardt 0c8e747f88 extend .gitignore 2016-03-22 17:05:45 +01:00
Scott Lahteine 815943ceed Merge pull request #3209 from AnHardt/call-buzz-direct 
Call buzz() directly from M428
 2016-03-22 08:04:30 -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
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 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