melch
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,249 Commits
2 Branches
0 Tags
2.0 GiB
x301
2.0.x
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '545f7997ea'
${ noResults }
Commit Graph

4249 Commits (545f7997eacb3018e956cc6235eb3c8cf937ba9a)
 

Author SHA1 Message Date
Scott Lahteine dd4d860ad7 Merge branch 'Release-1.1.0-RC4' into RC 9 years ago
Scott Lahteine a6e39c1005 Release 1.1.0-RC4 9 years ago
Scott Lahteine 42ec1f39e7 Merge pull request #3207 from jbrazio/bugfix/toshiba-sdhc-flashair 
Toshiba Flash Air Wifi SD card support
 9 years ago
Scott Lahteine b6ca86b974 Merge pull request #3197 from PheiPheiPhei/RCBugFix 
Enabling servo usage on boards with PWM current control
 9 years ago
Scott Lahteine 515c8d4fe9 Merge pull request #3226 from yarda/fix-use-arduino-protocol-for-programming 
Use arduino programming protocol by default for sanguino
 9 years ago
Scott Lahteine a6805ddf30 Merge pull request #3225 from yarda/fix-melzi-makr3d 
Fix MELZI_MAKR3D to use correct motherboard
 9 years ago
Scott Lahteine d62ba3d87e Merge pull request #3222 from thinkyhead/rc_persist_endstop_enabling 
M120/M121 also set endstops non-homing state
 9 years ago
Scott Lahteine af32a7d5d6 M120/M121 also set endstops non-homing state 9 years ago
Scott Lahteine 02f466e633 Merge pull request #3202 from thinkyhead/rc_menu_item_M303_redo 
Add Menu Items to initiate M303
 9 years ago
Scott Lahteine 04fa9d4f47 Make Autotune options into Menu Edit Items 9 years ago
WPBack e3f583a3be Fixes for PID AutoTune from menu 
Fixes for #3189

Setting a temp is still missing
 9 years ago
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.
 9 years ago
Scott Lahteine da9d4c4caf Merge pull request #3206 from esenapaj/patch-5 
Follow-up the PR #3082, etc
 9 years ago
Scott Lahteine c5857f96c8 Merge pull request #3182 from thinkyhead/rcbugfix_printrboard_revf 
Add support for Printrboard RevF
 9 years ago
Scott Lahteine f774420488 Merge pull request #3196 from thinkyhead/rc_controllerfan_bug 
Make DISABLE_INACTIVE_X, etc., true if missing
 9 years ago
Scott Lahteine 7d55d86081 Merge pull request #3219 from AnHardt/RH-pos-update 
Send position updates to RH
 9 years ago
Scott Lahteine 7ea4e095ad Merge pull request #3220 from thinkyhead/rc_tori_spelling 
Patch minor spelling error in cn, en, gl language file headings
 9 years ago
Scott Lahteine bcbac698f2 Patch minor spelling issue in cn, en, gl language file headings 9 years ago
Scott Lahteine 49ed4696ea Merge pull request #3218 from AnHardt/lost-pin-undef 
Fix lost undef Y_MAX_PIN in pins.h
 9 years ago
Scott Lahteine 7112f2e41a Merge pull request #3204 from esenapaj/patch-3 
Change link to the document
 9 years ago
Scott Lahteine 041fc639d7 Merge pull request #3215 from AnHardt/fix-kickstart 
Fix Fan KICKSTART
 9 years ago
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[]`.
 9 years ago
AnHardt 1b336971ae Fix lost undef Y_MAX_PIN in pins.h 9 years ago
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.
 9 years ago
Scott Lahteine cbce025248 Merge pull request #3217 from thinkyhead/rc_updated_kana 
Patch-up to commits for Kana #3203.
Closes #3203.
 9 years ago
esenapaj 665338bb69 Update Japanese translation 9 years ago
Scott Lahteine 97ed8abd3f Merge pull request #3213 from AnHardt/extend-gitignore 
Extend .gitignore
 9 years ago
Scott Lahteine b705ae0cb0 Merge pull request #3210 from thinkyhead/rc_cleanup_travis_ci 
Improve Travis CI test
 9 years ago
Scott Lahteine 1cd1ccbf86 Enable/disable multiple options on a single line. 9 years ago
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
 9 years ago
AnHardt 0c8e747f88 extend .gitignore 9 years ago
Scott Lahteine 815943ceed Merge pull request #3209 from AnHardt/call-buzz-direct 
Call buzz() directly from M428
 9 years ago
AnHardt 6486e8b74a Call buzz() directly from M428 9 years ago
jbrazio 757661b299 Toshiba Flash Air Wifi SD card support 9 years ago
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
 9 years ago
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.
 9 years ago
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)
 9 years ago
Scott Lahteine cadded1e21 Merge pull request #3201 from jbrazio/feature/update-hephestos2-default-config 
Update the Hephestos 2 default config
 9 years ago
jbrazio 04e57e2b5e Update the Hephestos 2 default config 9 years ago
Scott Lahteine 40c7e5d4e7 Merge pull request #3199 from esenapaj/patch-2 
fix spelling
 9 years ago
esenapaj f260e00a72 fix spelling 
Thermister -> Thermistor
 9 years ago
Scott Lahteine b1a3a95ad4 Tweak controllerFan to save a cycle or two 9 years ago
Scott Lahteine 04a6924633 Make DISABLE_INACTIVE_X, etc., the same as DISABLE_X (etc.) if missing 9 years ago
Scott Lahteine 15fccd43ee Fix spacing of an #endif 9 years ago
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
 9 years ago
Scott Lahteine d1ff7959b7 Merge pull request #3188 from esenapaj/patch-1 
follow-up the commit b82d91e
 9 years ago
Scott Lahteine 10caee2b7c Merge pull request #3187 from AnHardt/target_extruder_number 
Fix extrudernum in MSG_INVALID_EXTRUDER
 9 years ago
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.
 9 years ago
Scott Lahteine 7bf5d117e7 Merge pull request #3069 from thinkyhead/rc_delta_compat_m48 
Delta-compatible extensions to M48
 9 years ago
Scott Lahteine db8ab50c66 Merge pull request #3192 from tnw513/fix_lang 
Added missing translations.
 9 years ago