Commit graph

870 commits

Author SHA1 Message Date
Erik van der Zalm
86cce025f4 Added #ifdef NUM_SERVOS to servo.cpp 2013-05-18 23:12:28 +02:00
xifle
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%.
2013-05-18 19:53:46 +02:00
Gord Christmas
28ada096e2 Adding servo documentation 2013-05-18 06:01:58 -07:00
Robert F-C
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)
2013-05-18 22:30:42 +10:00
Robert F-C
dfa549f268 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-18 21:59:39 +10:00
ErikZalm
64360164ad Merge pull request #482 from codexmas/Marlin_v1
servosupport
2013-05-16 10:19:00 -07:00
ErikZalm
86405cdd11 Merge pull request #479 from MStohn/thermocouple
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
2013-05-16 10:06:59 -07:00
Erik van der Zalm
6c45c3f4e7 BariCUDA changes 2013-05-16 19:01:12 +02:00
Gord Christmas
96624f0f31 Forgot to include reference to Servo in makefile 2013-05-16 08:25:20 -07:00
Gord Christmas
dc59f07d24 First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple. 2013-05-16 07:03:01 -07:00
Gord Christmas
b668cb0516 Adding in clean copies of Servo library from Arduino 1.0.4 2013-05-16 06:47:42 -07:00
MaikStohn
95dff34b73 fixed wrong compare for min temp check of heater 1 and heater 2 2013-05-16 01:17:38 +02:00
MaikStohn
4cc6f9f6de fixed wrong pin initialization when using temperature 2 pin input 2013-05-16 01:17:08 +02:00
MaikStohn
61a48cc662 Add support for RUMBA thermocouple add on 2013-05-16 01:16:33 +02:00
MaikStohn
9cc15876be Add support for RUMBA thermocouple add on 2013-05-16 01:16:08 +02:00
ErikZalm
c9cf2174dd Merge pull request #474 from xifle/Marlin_v1
Fixed "Cooldown" Selection not reseting bed temp
2013-05-14 14:58:53 -07:00
Erik van der Zalm
bd2cd4903e Added #ifdef BARICUDA around the BariCUDA changes 2013-05-14 23:56:32 +02:00
Jordan Miller
37f3199df3 fixed problems in planner with solenoids for BariCUDA when set to 0 2013-05-14 23:35:01 +02:00
Jordan Miller
fbd899a37d Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129. 2013-05-14 23:34:45 +02:00
xifle
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)
2013-05-14 16:56:19 +02:00
Robert F-C
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.
2013-05-12 07:51:28 +10:00
gregor
2739c26c4f changes:
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
2013-05-10 22:20:02 +02:00
gregor
6fb9573157 added support for the reprapworld keypad 2013-05-10 21:57:17 +02:00
Tim Anderson
594193c908 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-05-06 23:29:38 -06:00
Tim Anderson
1fa61c297e Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion. 2013-05-06 23:23:54 -06:00
kiyoshigawa
b27a59f41e Added support for Elefu RA Board and Elefu Control Panel 2013-05-06 08:44:38 -06:00
midopple
a65a26d6b4 If CORE_XY is in use X and Y Axis had to be activated at the same time 2013-05-05 19:23:59 +02:00
midopple
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
2013-05-05 19:19:55 +02:00
Scott Lahteine
a5cd582665 Support for 10 level deep SD folder hierarchy 2013-05-04 04:18:02 -07:00
Arnoud
fc4ab05157 Solved minor bug in controllerFan()
Extruder 2 was checked where extruder 1 should be checked.
2013-05-03 21:32:34 +02:00
Scott Lahteine
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.
2013-05-02 09:55:15 -07:00
Scott Lahteine
a200521eab Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
Also cosmetic comment changes and spelling corrections in printed
messages
2013-05-02 09:22:58 -07:00
Martin Renold
1a397825f9 fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error 2013-05-01 08:30:24 +02:00
Robert F-C
289c02eda4 Remove unnecessary pin initialization in stepper.cpp
(duplicates initialization in Marlin_main.cpp)
2013-04-30 01:11:23 +10:00
Robert F-C
d5ad7a0814 Rework change to incorporate CONTROLLERFAN
Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds
2013-04-30 01:08:29 +10:00
Robert F-C
c3cdaceab3 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1 2013-04-29 22:13:55 +10:00
Robert F-C
1c127217df Make DOGLCD merge neater. 2013-04-29 22:03:37 +10:00
Robert F-C
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.
2013-04-29 21:50:52 +10:00
Robert F-C
788d62bcc4 Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
Conflicts:
	Marlin/Marlin.pde
	Marlin/ultralcd.cpp
	Marlin/ultralcd_implementation_hitachi_HD44780.h
2013-04-29 21:13:46 +10:00
Lukasz Stefanowicz
d71f1e9bf6 Add (as an option) slower SD transfer mode 2013-04-24 10:50:57 +02:00
ErikZalm
db5bb8546d Merge pull request #452 from MStohn/Marlin_v1
128x64 RepRapDiscount Full Graphic Smart Controller support
2013-04-23 09:43:37 -07:00
daid
4b2ece159b Merge pull request #453 from brackendawson/Marlin_v1
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
2013-04-16 10:12:25 -07:00
Bracken Dawson
d5ee2a5a62 Make Gen7 1.4 heater pins match silkscreen 2013-04-16 17:37:38 +01:00
MaikStohn
7ac6d7f78e FIX: Speedup - no explicit display clear needed in u8glib 2013-04-16 14:22:24 +02:00
MaikStohn
13596e8722 Added RepRapDiscount FULL GRAPHIC Smart Controller 2013-04-16 14:21:39 +02:00
MaikStohn
3a6abe1d6e Removed STB custom font hack from u8glib library and moved to marlin project 2013-04-16 13:54:39 +02:00
MaikStohn
16afbf9bfa FIX: adopted latest changes from hitachi implementation 2013-04-16 13:51:48 +02:00
daid303
34bca48b98 Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1 2013-04-15 15:11:38 +02:00
daid303
ac52dcc174 Updated the card menu and watch messages to make it more informative. 2013-04-15 15:11:22 +02:00
Stefanowicz
31bb3fb297 Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined 2013-04-12 18:04:32 +02:00
daid303
c80a78bb70 Lower the default max E feedrate a bit. With the stepper fix this is much to high. 2013-04-12 13:54:38 +02:00
Simon Oliver
5d5909fc25 Fix failure to compile with heated bed: remove call to non-existant scaleBedPID(). 2013-04-12 13:32:47 +02:00
Simon Oliver
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
2013-04-12 13:31:30 +02:00
Bart K
4fa2260a59 Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file) 2013-03-31 19:59:16 -04:00
Erik van der Zalm
038d405254 Corrected #endif in language.h 2013-03-31 20:28:29 +02:00
Dirk Eichel
443aaa30bf Removed GIT fragments
Seems that there was something wrong while merging
2013-03-30 23:26:42 +01:00
ErikZalm
7f622467fc Merge pull request #425 from kefir-/m928_logging
M928 logging
2013-03-30 08:50:34 -07:00
ErikZalm
86867928ac Merge pull request #434 from DDRBoxman/Marlin_v1
Add support for M300: Play beep sound
2013-03-30 08:49:54 -07:00
ErikZalm
9a38cad6f0 Merge pull request #430 from STB3/GLCD_128x64_dots
Final task of the 128x64dots GLCD implementation
2013-03-30 08:49:14 -07:00
ErikZalm
7a5c474d91 Update Configuration.h 2013-03-28 21:27:50 +01:00
Dirk Eichel
4e448b700a Merged fetched files from Marlin_v1 branch
Pull requests: #414 #433 #432 #428
2013-03-26 21:43:04 +01:00
ErikZalm
9f2862ce48 Merge pull request #414 from whosawhatsis/Marlin_v1
regenerated thermistor table 7
2013-03-25 13:14:49 -07:00
ErikZalm
9fb8bd5685 Merge pull request #433 from whosawhatsis/bang-mode
Separate PID_MAX from BANG_MAX
2013-03-25 13:11:34 -07:00
Colin Edwards
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
2013-03-25 10:42:27 -05:00
Colin Edwards
9a1c90471f Ignore unused beeper pins 2013-03-25 10:28:15 -05:00
Colin Edwards
1a0f889803 Add support for M300: Play beep sound 2013-03-24 23:35:05 -05:00
Robert F-C
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.
2013-03-24 18:19:58 +11:00
whosawhatsis
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.
2013-03-22 18:16:26 -07:00
blddk
e5a853a3d0 Added automated extruder fan function 2013-03-22 18:49:05 +01:00
blddk
72419f69a9 Added rumba 2013-03-22 18:41:54 +01:00
blddk
91bea43332 Added rumba pinout 2013-03-22 18:29:47 +01:00
blddk
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.
2013-03-22 18:28:16 +01:00
Dirk Eichel
6c66cae694 GLCD init screen cosmetics 2013-03-19 21:25:11 +01:00
Dirk Eichel
f3e0e5184d Add include selector between char. LCD and GLCD 2013-03-19 20:59:21 +01:00
Dirk Eichel
5d3862f9d1 Modified u8glib logo on welcome screen 2013-03-19 20:32:23 +01:00
Dirk Eichel
0b320f75e9 Removed debug code, add some comments 2013-03-19 20:29:25 +01:00
Dirk Eichel
5f1cd70122 Add code to lcd_update() for GLCD
This code selects between the routines for the GLCD or the char.
display.
2013-03-19 20:19:16 +01:00
Dirk Eichel
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.
2013-03-19 20:13:23 +01:00
Dirk Eichel
26d8863111 Add library selection between GLCD and char. LCD 2013-03-19 20:03:47 +01:00
Dirk Eichel
4a141a694f Marlin code for GLCD display
This contains the menues, status screen etc...
2013-03-19 19:59:56 +01:00
Dirk Eichel
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
2013-03-19 19:57:35 +01:00
Dirk Eichel
233df9cca0 Add missing LF at the end of the file 2013-03-19 19:12:33 +01:00
Dirk Eichel
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.
2013-03-19 06:46:05 +01:00
Ryan Turner
7c47e7162d Adding Maker's Tool Works heated bed thermistor 2013-03-18 22:53:37 -05:00
daid
af78d0cbfa Merge pull request #1 from illuminarti/Fix_E_Speed
Fix step rate bug (especially for retraction)
2013-03-18 23:36:11 +01:00
Dirk Eichel
9a78f321a4 Add pins for Motherboard variant 64
These definition contain also the definition for the graphics LCD.
2013-03-18 23:36:11 +01:00
Dirk Eichel
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
2013-03-18 23:36:10 +01:00
daid
d6ce63c49c Merge pull request #411 from STB3/Marlin_w_STB_Board_support
Add STB board support to Marlin (next step towards graphic LCD implementation)
2013-03-18 07:57:39 -07:00
Ketil Froyn
f036be7c4e Clean up tab/whitespace from last commit 2013-03-16 23:11:58 +01:00
Ketil Froyn
07e11c7cf5 Add command M928 to enable logging to file of received gcode commands 2013-03-16 23:02:57 +01:00
daid
92782f9252 Merge pull request #1 from illuminarti/Fix_E_Speed
Fix step rate bug (especially for retraction)
2013-03-15 09:07:34 +01:00
whosawhatsis
6a61a3c0b4 missing comma in last commit 2013-03-08 16:15:49 -08:00
whosawhatsis
f0aee4101a regenerated thermistor table 7
Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate.
2013-03-08 13:41:49 -08:00
Robert F-C
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).
2013-03-03 18:47:50 +11:00
Robert F-C
1daf2f3256 Number of extruders is not an advanced configuration - it is a basic property. 2013-03-02 16:14:19 +11:00
Robert F-C
f1263d3f88 Further reduce code by using precompiler logic 2013-03-02 16:12:11 +11:00
Dirk Eichel
140e095c6e Add pins for Motherboard variant 64
These definition contain also the definition for the graphics LCD.
2013-03-01 17:47:32 +01:00
Dirk Eichel
b2c1c64fb1 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
2013-03-01 17:39:54 +01:00
Dirk Eichel
ceb5ee38af Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin 2013-03-01 17:27:57 +01:00
Dirk Eichel
8efd4cfd73 fixed merge conflict 2013-03-01 16:27:35 +01:00