bbe67fca5a
soft tab correction
12 years ago
9eeb711c96
Merged from Upstream Master
12 years ago
424101110c
Add Panelolu2 support for Melzi
12 years ago
0d4a9444c4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
86cce025f4
Added #ifdef NUM_SERVOS to servo.cpp
12 years ago
03141a5ef4
LCD: Added Deadzone at 100% Feedrate
...
This adds a deadzone at 100% Feedrate when changing it at the status
screen/main menu. Prevents from unwanted feedrate-changing when
navigating back to the main menu and makes it easier to return to 100%.
12 years ago
28ada096e2
Adding servo documentation
12 years ago
4121311b9d
Change to LCD status indicators
...
The I2C LCD status indicators now indicate when the hotends or bed are
turned on at all (rather than just when they are in their heating phase)
12 years ago
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
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
594193c908
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
1fa61c297e
Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion.
12 years ago
b27a59f41e
Added support for Elefu RA Board and Elefu Control Panel
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
a5cd582665
Support for 10 level deep SD folder hierarchy
12 years ago
fc4ab05157
Solved minor bug in controllerFan()
...
Extruder 2 was checked where extruder 1 should be checked.
12 years ago
0ef54f2f85
Make M303 silent when "S0" is sent
...
If S is left out perhaps it should be silent, but check the spec for
this M code.
12 years ago
a200521eab
Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
...
Also cosmetic comment changes and spelling corrections in printed
messages
12 years ago
1a397825f9
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
12 years ago
289c02eda4
Remove unnecessary pin initialization in stepper.cpp
...
(duplicates initialization in Marlin_main.cpp)
12 years ago
d5ad7a0814
Rework change to incorporate CONTROLLERFAN
...
Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds
12 years ago
c3cdaceab3
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
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
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
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
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
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
443aaa30bf
Removed GIT fragments
...
Seems that there was something wrong while merging
12 years ago
7f622467fc
Merge pull request #425 from kefir-/m928_logging
...
M928 logging
12 years ago
86867928ac
Merge pull request #434 from DDRBoxman/Marlin_v1
...
Add support for M300: Play beep sound
12 years ago
9a38cad6f0
Merge pull request #430 from STB3/GLCD_128x64_dots
...
Final task of the 128x64dots GLCD implementation
12 years ago
7a5c474d91
Update Configuration.h
12 years ago
4e448b700a
Merged fetched files from Marlin_v1 branch
...
Pull requests: #414 #433 #432 #428
12 years ago
9f2862ce48
Merge pull request #414 from whosawhatsis/Marlin_v1
...
regenerated thermistor table 7
12 years ago
9fb8bd5685
Merge pull request #433 from whosawhatsis/bang-mode
...
Separate PID_MAX from BANG_MAX
12 years ago
0d075378d5
Add LARGE_FLASH define and enable it for some of the beefier boards
...
The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory
12 years ago
9a1c90471f
Ignore unused beeper pins
12 years ago
1a0f889803
Add support for M300: Play beep sound
12 years ago
9322c408c6
Updated for LiquidTWI2 library version 1.2.3
...
The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel.
12 years ago
fd5b7e0cec
Separate PID_MAX from BANG_MAX
...
This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode.
12 years ago
e5a853a3d0
Added automated extruder fan function
12 years ago
72419f69a9
Added rumba
12 years ago
91bea43332
Added rumba pinout
12 years ago
d2b00fe486
Removed html and added rumba
...
Found some unwanted html at the bottom of the file which caused it to not be able to compile.
Also added rumba as machine.
12 years ago
6c66cae694
GLCD init screen cosmetics
12 years ago
f3e0e5184d
Add include selector between char. LCD and GLCD
12 years ago
5d3862f9d1
Modified u8glib logo on welcome screen
12 years ago
0b320f75e9
Removed debug code, add some comments
12 years ago
5f1cd70122
Add code to lcd_update() for GLCD
...
This code selects between the routines for the GLCD or the char.
display.
12 years ago
a49c09a776
Add variable for animated fan, add float conversion w/o sign
...
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
12 years ago
26d8863111
Add library selection between GLCD and char. LCD
12 years ago
4a141a694f
Marlin code for GLCD display
...
This contains the menues, status screen etc...
12 years ago
83c790a020
Add bitmap graphics for GLCD
...
1. Marlin welcome screen
2. Status screen symbols 3 Extruders, heated bed, animated fan logo 1
3. Status screen symbols 3 Extruders, heated bed, animated fan logo 2
12 years ago
233df9cca0
Add missing LF at the end of the file
12 years ago
bb0de75a92
Removed umwanted HTML code ath the end of the file
...
Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
12 years ago
7c47e7162d
Adding Maker's Tool Works heated bed thermistor
12 years ago
af78d0cbfa
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
9a78f321a4
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
12 years ago
5de25ccd20
Add Motherboard variant 64 - STB V1.1
...
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
d6ce63c49c
Merge pull request #411 from STB3/Marlin_w_STB_Board_support
...
Add STB board support to Marlin (next step towards graphic LCD implementation)
12 years ago
f036be7c4e
Clean up tab/whitespace from last commit
12 years ago
07e11c7cf5
Add command M928 to enable logging to file of received gcode commands
12 years ago
92782f9252
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
6a61a3c0b4
missing comma in last commit
12 years ago
f0aee4101a
regenerated thermistor table 7
...
Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate.
12 years ago
7bad72359c
Support encoder click on PANELOLU2 being read through I2C
...
This change also handles the case where the pause/stop/restart button on
the VIKI is not used. Make LCD I2C buzz sound the same as the normal
buzz (300ms is too long for quick feedback).
12 years ago
1daf2f3256
Number of extruders is not an advanced configuration - it is a basic property.
12 years ago
f1263d3f88
Further reduce code by using precompiler logic
12 years ago
xifle