dfa549f268
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
64360164ad
Merge pull request #482 from codexmas/Marlin_v1
...
servosupport
12 years ago
86405cdd11
Merge pull request #479 from MStohn/thermocouple
...
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
12 years ago
6c45c3f4e7
BariCUDA changes
12 years ago
96624f0f31
Forgot to include reference to Servo in makefile
12 years ago
dc59f07d24
First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
12 years ago
b668cb0516
Adding in clean copies of Servo library from Arduino 1.0.4
12 years ago
95dff34b73
fixed wrong compare for min temp check of heater 1 and heater 2
12 years ago
4cc6f9f6de
fixed wrong pin initialization when using temperature 2 pin input
12 years ago
61a48cc662
Add support for RUMBA thermocouple add on
12 years ago
9cc15876be
Add support for RUMBA thermocouple add on
12 years ago
c9cf2174dd
Merge pull request #474 from xifle/Marlin_v1
...
Fixed "Cooldown" Selection not reseting bed temp
12 years ago
bd2cd4903e
Added #ifdef BARICUDA around the BariCUDA changes
12 years ago
37f3199df3
fixed problems in planner with solenoids for BariCUDA when set to 0
12 years ago
fbd899a37d
Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
12 years ago
29bb8d7d4f
Fixed "Cooldown" Selection not reseting bed temp
...
- enquecommand with multiple lines "\n" doesn't work -> M140 S0 didn't
get processed. So I wrote a new func for the cooldown which uses
setTargetHotend. In addition this does return to status page after
selection.
- Added setWatch() to preheat-functions (Temperatur sanity check
would never have worked when preheating from the lcd panel)
12 years ago
015d0594b0
Optimize menu selection for Viki rotary encoder.
...
The Viki LCD rotary encoder uses a different number of steps per
rotation. This fixes the seeming "missed" steps when selecting a menu.
12 years ago
90664d20a4
Merge pull request #472 from gregor2005/Marlin_v1
...
added support for the reprapworld keypad
12 years ago
2739c26c4f
changes:
...
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
12 years ago
6fb9573157
added support for the reprapworld keypad
12 years ago
2c0fa34c9e
Merge pull request #466 from midopple/Marlin_v1
...
BUG Fix in Commands M907,M350 and M351
12 years ago
a65a26d6b4
If CORE_XY is in use X and Y Axis had to be activated at the same time
12 years ago
db2f157a22
Replace the <= to < in the Command M907, M350 and M351.
...
The for loop for Axis count over the Array.
Add a break after M907
12 years ago
e3bc420daa
Merge pull request #464 from arnoudja/Marlin_v1
...
Solved minor bug in controllerFan()
12 years ago
fc4ab05157
Solved minor bug in controllerFan()
...
Extruder 2 was checked where extruder 1 should be checked.
12 years ago
727aa2a051
Merge pull request #459 from martinxyz/fix-rounding-error
...
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
12 years ago
1a397825f9
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
12 years ago
1c127217df
Make DOGLCD merge neater.
12 years ago
7f57f28ccc
Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer.
...
Argument order of lcd_buzz was set to mirror that on tone(). Change
default M300 frequency to something audible.
12 years ago
788d62bcc4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
4f96ad5621
Merge pull request #456 from Stefanowicz/Marlin_v1
...
Add (as an option) slower SD transfer mode
12 years ago
d71f1e9bf6
Add (as an option) slower SD transfer mode
12 years ago
db5bb8546d
Merge pull request #452 from MStohn/Marlin_v1
...
128x64 RepRapDiscount Full Graphic Smart Controller support
12 years ago
4b2ece159b
Merge pull request #453 from brackendawson/Marlin_v1
...
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
12 years ago
d5ee2a5a62
Make Gen7 1.4 heater pins match silkscreen
12 years ago
7ac6d7f78e
FIX: Speedup - no explicit display clear needed in u8glib
12 years ago
13596e8722
Added RepRapDiscount FULL GRAPHIC Smart Controller
12 years ago
3a6abe1d6e
Removed STB custom font hack from u8glib library and moved to marlin project
12 years ago
16afbf9bfa
FIX: adopted latest changes from hitachi implementation
12 years ago
c83863d5d6
add U8glib library to Arduino1.x includes
12 years ago
34bca48b98
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
ac52dcc174
Updated the card menu and watch messages to make it more informative.
12 years ago
84920e9c58
Merge pull request #449 from Stefanowicz/Marlin_v1
...
Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined
12 years ago
31bb3fb297
Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined
12 years ago
c80a78bb70
Lower the default max E feedrate a bit. With the stepper fix this is much to high.
12 years ago
5d5909fc25
Fix failure to compile with heated bed: remove call to non-existant scaleBedPID().
12 years ago
93f0463b21
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
...
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).
Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.
Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.
Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.
Conflicts:
Marlin/language.h
12 years ago
1f74ef4157
Merge pull request #441 from bkpsu/Marlin_v1
...
Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file)
12 years ago
4fa2260a59
Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file)
12 years ago
038d405254
Corrected #endif in language.h
12 years ago
Robert F-C