Scott Lahteine
32d4dd073f
Merge pull request #1487 from AnHardt/iss1485
...
Fix for #1485
10 years ago
AnHardt
c246026bda
Sorry.
10 years ago
AnHardt
07e488cfae
Fix for #1485
10 years ago
Souko
e7ecf14d0c
Update ultralcd_st7920_u8glib_rrd.h
...
Fixed delay-times during Init. REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER won't get initialized on some Boards because delay was to short.
10 years ago
Scott Lahteine
52c3cf6d34
Fix a logging error
10 years ago
Scott Lahteine
ba24a09f24
Use api.github to get Configurations
...
- Make api.github the default source for configurations
- Remove configurations from the configurator
- Continuation and enhancements
10 years ago
Natealus
f4b0a40abb
Additional fixes to temperature.cpp and found another missing line
...
Looks like INVERT_E3_DIR was missing in the configuration.h also as I
did a test compile with 4 extruders and Azteeg X3 Pro defined. So I also
added those lines too. Additional formatting to make the comments line
up better in that section.
10 years ago
AnHardt
3aac2df057
Now the oter way around.
...
Include of language_en.h now behind national language.
All "#define MSG_STR_*" now surrounded by #ifndef and #endif.
10 years ago
AnHardt
488633bf44
#include "language_en.h" before the national language in language.h
...
+ May decrease the workload for feature developers. They may omit to
update all the language files but "language_en.h". When loading _en
first, all new features give some display, but the new in English.
- May throw some additional warnings about redefinition during compile.
10 years ago
AnHardt
8e92729141
Make display language configurable in Configuration.h
10 years ago
Natealus
38a500d05c
Viki 2 Implementation
...
I've insert the define and pointer entries for the Viki 2 and miniViki
from Panucatt in all of the example configs and main config. With these
additions and with pins done in the old single pin.h style...I was able
to get the display working fine save for needing to turn Delta Segments
per Second down. But that's a common graphics lcd issue being looked
into right now.
I need assistance in understanding how the new divided pins files fit
together because my previous attempts at trying to get it to work
appropriately didn't seem successful. This originally came from trying
to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg
X3 Pro. It only comes with one set of connectors and they're Min
Endstops. My previous experience didn't turn out well trying to tell the
firmware to home to the Min Endstops so the best solution I found was to
swap the pins in the firmware. If I'm missing a conflict with a setup
other than delta please let me know, but it makes sense in my setup.
10 years ago
Natealus
697ee2dc50
Compiling errors with 4 Extruders defined
...
Here were a few changes that I had to make/add lines for the 4th hotend.
A compiling problem in the Temperature.cpp and missing lines in
configuration.h and configuration_adv.h. I added these lines in all of
the example configs too.
10 years ago
Jérémie FRANCOIS
85e5aa4011
Generalized enqueue_commands_P, and moved them to Marlin_main as they should
10 years ago
Scott Lahteine
4228758f1d
Clean up and improve tooltips, show the name
10 years ago
Scott Lahteine
0116320d2c
Strip slashes off the front of tooltips
10 years ago
Scott Lahteine
69240d41b0
Offset the timing of the pulsing animation
10 years ago
Scott Lahteine
78b9428f4e
Avoid capturing disabled items in comments
10 years ago
Scott Lahteine
5d159851e5
Fix positioning of tooltip
10 years ago
Scott Lahteine
c99f1de9f3
Fix tooltips blocking clicks
10 years ago
Scott Lahteine
1a548c1bc1
Find nearby comments and make them into tooltips
10 years ago
Scott Lahteine
90fa1345b0
Fix purge + refresh of define info
10 years ago
Scott Lahteine
aa67b38a44
Fan speed and 4th extruder on graphical LCD
...
- Display fan speed 0-1 as “—“ and 254-255 as “100%”.
- Display 4th extruder instead of the heated bed
10 years ago
Scott Lahteine
7850ae2f4f
Merge branch 'Development' into marlin_configurator
...
Merge latest Development
10 years ago
Scott Lahteine
2647402095
Use info.repl in updateDefineFromField, fix regex
10 years ago
Scott Lahteine
12a3975341
Close section tag, add String.prototype.lineCount
10 years ago
Scott Lahteine
4bb72f9480
Highlight the edited line
...
- Add a span to the edited text line to provide a highlight
- Scroll and highlight for switch checkboxes also
- Clean up initialization
- More API documentation
- Smarter handling of asynchronous file loading during init
10 years ago
Scott Lahteine
37c43a7ab3
Scroll to reveal on switches as well
10 years ago
Scott Lahteine
9c0adae3cd
Scroll to setting position in file when edited
...
- Animate scrolling to the edited item’s position
- Sanity check file drops and show warnings
- Fix form init / refresh on new configuration drop
- Document the API methods that get/set defines
10 years ago
Scott Lahteine
4d341bb758
Copy configs into subfolder
...
Browsers may not want to load files outside the folder, but they may be
okay with these relative references within the folder.
10 years ago
Scott Lahteine
72856166a9
Fix bad typo in ConfigurationStore.cpp
10 years ago
Scott Lahteine
b51204cc1c
Add fieldsets and make them into tabs
10 years ago
Scott Lahteine
56769ba4f8
Make comment/uncomment a little neater
10 years ago
Scott Lahteine
94bebf31ac
Pre-collect info about options on field init
...
- When initializing fields use the configuration to determine the format
- Cache the line for each option for fastest string compare / replace
- Add logging levels for debugging
10 years ago
Scott Lahteine
32aaadc301
Include minimized jQuery 2.1.3
10 years ago
Scott Lahteine
53f6bbdfe0
Try a stepper for the serial port
10 years ago
Scott Lahteine
ac7a4358d6
Add a responsive file uploader
...
- Specify HTML5
- Allow drag and drop for loading configurations
10 years ago
Scott Lahteine
09a385d9b0
Add "use strict" to the top.
10 years ago
Scott Lahteine
b2627200ea
Get thermistors from config, add temp sensors
10 years ago
Scott Lahteine
ef18bfdd3f
An in-place browser-based configurator utility
...
- A web form with fields for configuration values
- Reads and parses standard config files
- Modifies configurations dynamically in-place
10 years ago
Scott Lahteine
3490a19103
Merge pull request #1466 from CONSULitAS/Development_K8200_de
...
K8200: Example Configuration.h fixed
10 years ago
CONSULitAS
cfbb94a2a8
K8200: Example Configuration.h fixed
...
Example Configuration.h: fixed strange white characters preventing
compilation in lines 1 and 3 - oops
10 years ago
Scott Lahteine
b65c5d8ec6
Merge pull request #1464 from AnHardt/iss1448-Menu
...
Unified menu selection - by hilighting - made first column avilable
10 years ago
CONSULitAS
0de5083aff
K8200: Example Configurations readme.md updated
...
Example Configurations for K8200 readme.md updated
* readme.md: added description for german umlaut support on LCD
10 years ago
CONSULitAS
c421ffd520
K8200: Example Configuration_adv.h back in sync
...
Example Configuration_adv.h for K8200 back in sync
* Configuration_adv.h: rebased and added missing changes for 4th
extruder
10 years ago
CONSULitAS
0575dd10de
K8200: Example Configuration.h back in sync
...
Example Configuration.h for K8200 back in sync
* Configuration.h: rebased and added missing changes
* Configuration.h: updated comments for K8200
10 years ago
AnHardt
f708884808
Introduced new function lcd_implementation_mark_as_selected()
...
New function now drops the prechar (select character) and makes the first
column usable for text.
Marking the line is now constantly made by highlighting (reverse).
Replaced selection code in:
lcd_implementation_drawmenu_generic()
_drawmenu_setting_edit_generic()
_drawmenu_sd()
with new function.
10 years ago
Scott Lahteine
b6ca50a2cc
Merge pull request #1463 from thinkyhead/cleanup_recent_merge
...
Apply some cleanup for recent merge
10 years ago
Scott Lahteine
cc56f36870
Merge pull request #1461 from thinkyhead/issue_1453_redo
...
Apply fix for M600 filament change
10 years ago
Scott Lahteine
8663f4bbaf
Apply some cleanup for recent merge
...
Combine 1/(rows+1) with u8g.getHeight() to get rowHeight and just use
that.
10 years ago
Scott Lahteine
0cb1029311
remove extra plan_buffer_line
10 years ago
AnHardt
9381bfe7f9
Fixes issue #1447 - Overlapping of long descriptions with values.
10 years ago
Scott Lahteine
b97a950f53
Apply fix for M600 filament change
...
- Patch from #1453 for delta movement plan
- Fix: Set X with code X instead of adding to X
10 years ago
AnHardt
2abf1ad940
Distribute recent changes in Configuration.h to the examples.
10 years ago
AnHardt
33f8580255
Merge branch 'lcd-width' into b-
10 years ago
AnHardt
0c24bb6cfc
Adjust LCD_WIDTH to make better use of DOGM LCDs
10 years ago
AnHardt
b1dbd765c6
Centralise definition of fonts for DOGM displays
...
Prework for issue #1448 and #1447
Will merge in when pull request #1457 is in.
10 years ago
AnHardt
65642592ee
Added dualline version.
10 years ago
AnHardt
f9cc1df00b
Droped URL from bootsplash.
10 years ago
AnHardt
c20606b8d7
Replaced some literal constants with defines
...
Replaced calculation to centre bitmap with fixed values.
Saved 20 bytes.
10 years ago
AnHardt
3602474c25
Replace solitaire use of u8g_font_5x8 font and replace with u8g_font_6x10_marlin
...
and win another 1694 bytes.
10 years ago
AnHardt
f5fd94d62a
Kick suspicious loop an win 72 bytes.
...
No visible impact.
10 years ago
Scott Lahteine
b3973ed224
Fix HD44780 misspelled as HD44870
10 years ago
Scott Lahteine
d8b7f29fa2
Merge pull request #1452 from thinkyhead/fix_M200_bug
...
M200 cleanup, normalization of EXTRUDER loops
10 years ago
Scott Lahteine
6d81968db5
Merge pull request #1450 from docdawning/Development
...
Normalized section headers, added some headers, added help URLs for newb...
10 years ago
DocDawning
5bb3933b21
Fixed n00bsauce
10 years ago
DocDawning
d109cd940b
Normalized all configuration files to include my new section headers and the like.
10 years ago
DocDawning
055c4beaf9
Normalized section headers, added some headers, added help URLs for newbies
10 years ago
Scott Lahteine
9dc5de6166
Hide code that makes veteran geeks go "aha!"
10 years ago
Scott Lahteine
bd387068bb
Apply loops for extruders elsewhere also
10 years ago
Scott Lahteine
4a146d584b
Loop, since the pending feature can use an array
10 years ago
Scott Lahteine
bca884bf72
Realized it's not a bug, but cleanup code anyway
10 years ago
AnHardt
2dd43a82b1
Ups. #else added
10 years ago
AnHardt
26e55471f8
Update example configurations.
10 years ago
AnHardt
85385be132
Removed now automatic define of DISPLAY_CHARSET_DOGM + improved description.
10 years ago
AnHardt
0e40408ee5
Make exemplaric use of new display charsets in language_en.h and languag_de.h
10 years ago
AnHardt
8dce5a6644
Improve new charset featur.
...
Select DOGM-displays automaticly.
Give hint where to find charsets.
Add '²' and '³' characters.
10 years ago
Scott Lahteine
c009c81e65
make marlin-main the default
10 years ago
Scott Lahteine
f4ebc02555
marlin url
10 years ago
Scott Lahteine
0af9a0bf57
url to firmware downloads
10 years ago
Scott Lahteine
5f8dd92905
toss in a fix for .ru
10 years ago
Scott Lahteine
3f3ad9b3ad
typo
10 years ago
Scott Lahteine
07639053fb
Add support for BQ Prusa i3 "Hephestos"
10 years ago
Philip Schell
fb7c636ecf
Avoid compiling error
...
Only a missing ","... now it will compile again
10 years ago
alexborro
787d6fb61a
Update RUMBA pins file
...
Add FAN1_PIN and SERVO0_PIN
10 years ago
Scott Lahteine
5fd5105d44
Merge pull request #1439 from clefranc/Development
...
Fix nozzle in temperature menu
10 years ago
AnHardt
76bf93efcb
Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h"
...
This reverts commit 4d5b0e2037
.
10 years ago
AnHardt
4d5b0e2037
get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h
10 years ago
Christian Lefrançois
33408a4dfc
Update ultralcd.cpp
...
Fix number of nozzle displayed in temperature menu.
10 years ago
AnHardt
6e6e3cf443
merged https://github.com/MarlinFirmware/Marlin.git
10 years ago
AnHardt
b3ca430a20
Inducted the defined placeholders in the translation table.
10 years ago
AnHardt
e045034c3f
Included Configuration.h to read the defined charsets.
...
Defined the charsets plus a default.
10 years ago
AnHardt
27c638803e
Defined three charsets.
10 years ago
Scott Lahteine
073c59c50a
Clean up some formatting
...
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
10 years ago
AnHardt
9a4d4b3a2f
translated Deltamenu
10 years ago
AnHardt
8aa6487b4b
MSG_ENDSTOP_ABORT = 'Endstop abort' > 'Endstop Abbr. Ein'
10 years ago
AnHardt
666ad7106b
Translated redundand: define MSG_INIT_SDCARD and MSG_CNG_SDCARD
10 years ago
AnHardt
e5c45fbe8c
Infoscreen messages end with a '.' if not to long.
...
MSG_NO_MOVE = 'Kein Zug.' > 'Motoren Eingesch.' hat mich grau Haare gekostet.
Die englisch Meldung will sagen - Du kannst jetz am Extruder arbeiten, die
Achsen sind bockiert, die Motoren sperren die Achsen weil sie unter Strom
stehen, weil sie eingeschaltet sind.
10 years ago
AnHardt
1e22137e27
MSG_STOP_PRINT = 'Druck stoppen' > 'SD-Druck Abbruch'
...
to work out that this can't be resumed.
10 years ago
AnHardt
05d2ebd118
MSG_WATCH > 'Beobachten' > 'Info'
10 years ago
AnHardt
06cba91c39
eye candy 2
10 years ago
AnHardt
9352c9547f
MSG_SPEED = 'Geschw' > 'Geschw.'
10 years ago
AnHardt
0dfb0162f3
eye candy.
10 years ago
AnHardt
7222b27501
MSG_MOVE_AXIS = 'Achsen bewegen' > 'Bewegen'. Is Extruder an axis?
10 years ago
AnHardt
a6f808c9b1
remove unused #define MSG_RETRACT
10 years ago
AnHardt
152fa579f5
MSG_SWITCH_PS_OFF = 'Switch Power Off' -> 'Netzteil Aus'
10 years ago
AnHardt
7a32b742f3
MSG_SWITCH_PS_ON = 'Switch Power On' ->'Netzteil Ein'
10 years ago
AnHardt
4e176d2ce8
MSG_SET_ORIGIN = 'Setze Nullpunkt' ->'Setze Null hier'
10 years ago
AnHardt
1f8c8ad3ed
MSG_SET_HOME_OFFSETS = 'Set home offsets' ->'Setze Home hier'
10 years ago
AnHardt
0e8836ce5e
MSG_AUTO_HOME = 'Auto Nullpunkt' ->'Home'
10 years ago
AnHardt
56d3e6615d
MSG_DISABLE_STEPPERS = 'Stepper abschalt.' -> 'Motoren Aus'#
10 years ago
Scott Lahteine
1258980832
Merge pull request #1429 from bq/Development
...
Add bq Witbox 3D printer
10 years ago
Victor Andueza
766762a4dc
Change url link
10 years ago
Scott Lahteine
7df9ca051c
Merge pull request #1428 from thinkyhead/issue_1388_eeprom
...
Make EEPROM storage consistent
10 years ago
Scott Lahteine
fe3810f073
yeah, what he said
10 years ago
Scott Lahteine
6137bbd484
use eeprom read correctly
10 years ago
Scott Lahteine
9bc9051405
Flag EEPROM write errors on serial output
...
- Also adds a language string for the error.
- Also adds SERIAL_EOL as an alias for SERIAL_ECHOLN(“”)
10 years ago
Scott Lahteine
ff99ca3040
Fix alignment of Restore following PIDTEMP
...
Should be reading 4 x 4 PID values instead of 4 x 3
10 years ago
Philip Schell
6c285930cb
Fixing wrong pin to heater extruder 2 <-> 3
...
Extruder 2 and 3 was swapped
10 years ago
Victor Andueza
0d4ce27b79
Add pins_WITBOX file
10 years ago
Victor Andueza
13118cde33
Add bq Witbox 3D printer
10 years ago
Scott Lahteine
093fedfde8
Make EEPROM storage consistent
...
Update ConfigurationStore to always write dummy values for disabled
options, including FWRETRACT, DELTA, and SCARA. Update the EEPROM
version to “V15.” Also fixes a buffer overrun with axis_scaling in
Config_ResetDefault.
10 years ago
Scott Lahteine
34377ee512
Merge pull request #1427 from thinkyhead/fewer_preheat_strings
...
Remove language strings that only add a number
10 years ago
Scott Lahteine
7378a7fef4
Merge pull request #1408 from thinkyhead/cleanup_servo
...
Formatting cleanup of quiet sources
10 years ago
Scott Lahteine
5fbef6bed2
Merge pull request #1409 from thinkyhead/rename_lastnr
...
Rename lastnr to autostart_index and...
10 years ago
Scott Lahteine
53eea611b8
Fix MSG_NOZZLE
10 years ago
Scott Lahteine
d7211a5324
Changes for Portuguese too
10 years ago
Scott Lahteine
0a21727c0a
Portuguese (pt) and Brazilian Portuguese (pt-br)
10 years ago
Scott Lahteine
c90f2e77d8
Remove language strings that only add a number
...
This won’t reduce the string storage in the end, but it makes the
language files smaller. Also removed remaining unused strings.
10 years ago
Scott Lahteine
2ce4a102ee
Add support for Megatronics 3 a la #1426
10 years ago
Scott Lahteine
ae4b348d77
Make sure _Ex_PINS is defined
...
Also fix analogInputToDigitalPin so it uses proper C hex notation
10 years ago
Scott Lahteine
80be6f3f91
tweak tweak
10 years ago
Scott Lahteine
ebe78cb36f
tweak
10 years ago
Scott Lahteine
82474fef8a
Max endstop pins disabled by configuration
...
There’s no need to ask users to uncomment Max Endstop pins when they
have them. These will be set to -1 later if the endstop option is
disabled.
10 years ago
Scott Lahteine
8045e4d60d
Add support for 4th extruder
...
#1405 includes some changes to pins.h for a 4th extruder. This commit
applies those changes. It also deals with a possible problem with
SENSITIVE_PINS.
10 years ago
Scott Lahteine
df4f3e7712
cleanup
10 years ago
Scott Lahteine
b6ecbd8cc4
cleanup
10 years ago
Scott Lahteine
4e573134de
Cleanup heading
10 years ago
Scott Lahteine
574a5ab72a
Split up pins to make it more manageable
...
Hopefully this is helpful to organization and future expansion….
10 years ago
clefranc
d55c62bf9f
Update ConfigurationStore.cpp
...
Moved #endif to allow filament settings to print.
10 years ago
clefranc
e779641c73
Update ConfigurationStore.cpp
...
Added PIDTEMP dummy write to align EEPROM read/write operation.
10 years ago
Scott Lahteine
baac6e242d
Merge pull request #1419 from AnHardt/bootsplash
...
repair Bootsplash
10 years ago
AnHardt
75cf302da3
example configurations changed to meet Configuration.h
10 years ago
Philip Schell
61fd45a0c2
Add 4th extruder
10 years ago
Philip Schell
2650be4921
Add 4th extruder
10 years ago
Philip Schell
a9763d894e
Add 4th extruder
10 years ago
Philip Schell
4949088302
Add 4th extruder
10 years ago
Philip Schell
fc5204bd42
Add 4th extruder
10 years ago
Philip Schell
9834818ef7
Add 4th extruder
10 years ago
Philip Schell
8696963154
Add 4th extruder
10 years ago
Philip Schell
ee8a7419f4
Add 4th extruder
10 years ago
Philip Schell
e18403235d
Add 4th extruder
10 years ago
Philip Schell
7baee555f4
Add 4th extruder
10 years ago
Philip Schell
cebc7daf2a
Add 4th extruder
10 years ago
Philip Schell
ef4c7abb21
Update language_es.h
...
Add 4th extruder
10 years ago
Philip Schell
22e591518a
Update language_de.h
...
Add 4th extruder
10 years ago
Philip Schell
a20c35bb38
Update language_ca.h
...
Add 4th extruder
10 years ago
Jérémie FRANCOIS
dd301be52d
Added suport for multiline G-code commands in the LCD menus
10 years ago
AnHardt
aa48056c03
Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h
10 years ago
AnHardt
0d219b3e14
Make centering of STRING_SPLASH work
10 years ago
AnHardt
59315330dd
Remove definition of VERSION_STRING and replace where usend with STRING_VERSION
10 years ago
AnHardt
8c792c7b22
Make STRING_VERSION and VERSION_STRING the same
10 years ago
Scott Lahteine
865ca0ef04
Merge pull request #1405 from MagoKimbra/4th-extruders
...
All the additions look proper. I can't think of any other extruder-count-related items that you might have missed. So, with some optimism, I will merge this for testing.
10 years ago
MagoKimbra
3021f7f743
Fix PID_dT
...
Add PID_dT in temeprature.cpp
10 years ago
Scott Lahteine
a7b02975b7
No TEMP1 or TEMP2 pins for TEENSYLU || PRINTRBOARD
...
Pins 2 and 3 are probably general-use pins, since the filament sensor
uses pin 2.
10 years ago
Scott Lahteine
6723388f7f
Proposed fix to #1379 . Printrboard I2C LCD support
10 years ago
Scott Lahteine
03c9cb60e8
Rename lastnr to autostart_index and...
...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
10 years ago
MagoKimbra
ef5959a705
Fix Temperature
...
Githun insert this line when i merge with actual Branch development...
10 years ago
MagoKimbra
3d4ee6c868
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
...
Conflicts:
Marlin/temperature.cpp
10 years ago
MagoKimbra
986e723eeb
Add 4th extruder
10 years ago
Scott Lahteine
f16bdd2ff2
Borrow from Ultimaker to fix MAX6675 SPI conflict
...
Changes to temperature.cpp from Ultimaker fork, intended to address
#1226 and #1227
10 years ago
Scott Lahteine
06c3b37933
Formatting cleanup of quiet sources
...
Formatting for code-folding plus minor style changes to less active
code.
10 years ago
Scott Lahteine
23fcd1ecb2
Merge pull request #1407 from thinkyhead/cleanup_marlinserial
...
Formatting cleanup of quiet sources
10 years ago
Scott Lahteine
fd78902194
Formatting cleanup of quiet sources
10 years ago
Scott Lahteine
5c1814383a
Merge pull request #1390 from floyd871/Development
...
Show Custom M_Code for Z-Probe Offset when entering M503
10 years ago
MagoKimbra
0ebf896070
Add 4th extruder
10 years ago
Michael Neumann
a9d7ab9530
Update ConfigurationStore.cpp
...
Done
10 years ago
Scott Lahteine
3a9a3e5ed8
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
...
This define is not used.
10 years ago
Scott Lahteine
54d5b52a2e
Merge pull request #1399 from beanz/use-bed-defines-not-extruder-ones
...
Code wont compile with extruder but without bed runaway protection defined.
10 years ago
Mark Hindess
0ce252ba7a
This ifdef is for bed code so should use bed constants for testing.
...
Without this fix, the code wont compile with extruder but without bed
runaway protection defined.
10 years ago
Scott Lahteine
9040446780
Merge pull request #1395 from AnHardt/iss1394
...
removed function step_wait() from stepper.cpp
10 years ago
Scott Lahteine
25f79c5010
Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
...
Add: Board for Vellemann K8200 (derived from 3Drag)
10 years ago
Scott Lahteine
9ce75ab7de
Merge pull request #1386 from roglio/Development
...
Fixing a build error for melzi and gfx display
10 years ago
Scott Lahteine
15a00a5a7c
Add 1µs delay in other appropriate spots
10 years ago
AnHardt
23cb899c5a
removed function step_wait() from stepper.cpp
...
removed function step_wait() from stepper.cpp because its used nowhere.
10 years ago
Scott Lahteine
d9d4a78e0f
Add proper delay in stepper.cpp
...
Issue #1385 describes a delay that the compiler is optimizing out and
this solution.
10 years ago
CONSULitAS
d1322dafc9
Add: Example Configuration for Vellemann K8200 - based on new BOARD_K8200 #1391
...
# Add: Example Configuration for Vellemann K8200 - based on new
BOARD_K8200 #1391
* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag http://reprap.org/wiki/3drag , too. Please
report)
* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters form genuine Vellemann Firmware "firmware_k8200_marlinv2"
based on the recent development branch
I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows (SD library added to IDE manually) - everything works well
10 years ago
CONSULitAS
3b50a5e2e6
Add: Board for Vellemann K8200 (derived from 3Drag)
...
## Add: Board for Vellemann K8200 (derived from 3Drag)
* Boards.h: updated comment for board 3Drag - K8200 removed
* Boards.h: added `BOARD_K8200` with ID 78
* language.h.: machine name and firmware URL for new board
* pins.h: added `K8200` to any `#if` with `3Drag` and corresponding
comments
10 years ago
Michael Neumann
2d454da3af
Update ConfigurationStore.cpp
...
Show Custom M Code when entering M503
10 years ago
Scott Lahteine
4f35de991a
Merge pull request #1383 from CONSULitAS/Development
...
Update Boards.h for Vellemann K8200 - comment only
10 years ago
roglio
22571ca13d
Revert "Configuration for Aurora Z605"
...
This reverts commit 935ee968a7
.
10 years ago
roglio
935ee968a7
Configuration for Aurora Z605
...
Still not fine tuned but working.
10 years ago
roglio
ccdbeda526
Fixing a build error for melzi and gfx display
...
When a melzi board and a full gfx are both selected, the build fails
blaming for some missing defines.
This is a fix for the issue: now my configuration works.
10 years ago
CONSULitAS
e13f159343
Update Boards.h for Vellemann K8200 - comment only
...
## Update Boards.h for Vellemann K8200 - comment only
* Boards.h: updated comment for board 3Drag - K8200 uses same board
10 years ago
CONSULitAS
51c7f2fd5a
Revert "## Add: Example Configuration for Vellemann K8200"
...
This reverts commit 5333590ac2
.
10 years ago
CONSULitAS
5333590ac2
## Add: Example Configuration for Vellemann K8200
...
* K8200: new folder in example_configurations for Vellemann K8200 (3Drag
clone - should work with 3Drag too, please report)
* K8200/language.h: updated machine name and URL for K8200
* K8200/Configuration.h/Configuration_adv.h: updated manually with
parameters
form genuine Vellemann Firmware "firmware_k8200_marlinv2" based on the
recent development branch
* K8200/files by Vellemann: added folder with original files from
Vellemann homepage, since there is no GitHub fork you could link to by
them
I tested the changes on my K8200 with 20x4-LCD and Arduino 1.0.5 for
Windows - everything works well
10 years ago
Denis Chertykov
ba3ac40b9d
Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER.
...
Change default value of AVRDUDE_PROGRAMMER to 'wiring'.
10 years ago
daid
53f971095d
Revert "Reduce PROGMEM warnings"
10 years ago
PxT
67b597ad46
Update printrboard pin assignments
...
Backported from Printrbot branch, allows the fan to work correctly.
10 years ago
galexander1
d4880a9e60
Revert "Move Sd library out into library"
10 years ago
Bo Herrmannsen
ccdb086fc8
Merge pull request #1363 from PxT/patch-1
...
Fixes #1361
10 years ago
Bo Herrmannsen
5151db5c2f
Merge pull request #1349 from msutas/patch-2
...
Improvement - G29 Option for Not Retracting Servo
10 years ago
Bo Herrmannsen
1746b2582b
Merge pull request #1332 from Sniffle/Development
...
Rambo FAN_PIN documentation and servo support
10 years ago
Bo Herrmannsen
4b51b5a46d
Merge pull request #1357 from odewdney/SDlib
...
Move Sd library out into library
10 years ago
Bo Herrmannsen
f2cb4a3655
Merge pull request #1353 from thawkins/Development
...
fix avrdude upload in makefile
10 years ago
PxT
9fd4292923
Fixes #1361
10 years ago
odewdney
f84ff4ba7d
Move SD Fat library out of main src
10 years ago
Bo Herrmannsen
ab074dac17
Merge pull request #1344 from grob6000/independent_pid
...
Independent PID parameters for each extruder
10 years ago
Bo Herrmannsen
d4a665694a
Merge pull request #1350 from odewdney/Development
...
Reduce PROGMEM warnings
10 years ago
odewdney
9d9c859ac1
First move of SdFat library
10 years ago
Tim Hawkins
5045d17a39
fix avrdude upload in makefile
10 years ago
msutas
3a5a6f42fb
Corrected the ABL grid option
...
G29 E was not retracting the probe on the last probe point when used with ABL grid. Corrected.
10 years ago
odewdney
cd55a93a13
re-add blank line
10 years ago
odewdney
23bfe30036
moved include themister to temperature.c
10 years ago
odewdney
538859669d
Removing compiler warnings for progmem
10 years ago
grob6000
bf2c923db5
Make multiple PID parameters a config option
...
* Adds config parameter `PID_PARAMS_PER_EXTRUDER` - allows single PID
parameters to be used where this would be preferable (e.g. dual
identical extruders)
* When disabled, will use `float Kp, Ki, Kd, Kc;` as before.
Preprocessor macros used to switch between.
* ultralcd.cpp defines extra menus for extra parameters only where
required
* M301 reports `e:xx` only if independent pid parameters enabled
* EEPROM structure still leaves space for 3 extruders worth, when undef
will save single parameter to all extruder positions, but only read the
first
* Switching off saves approx 330 B with no LCD enabled, 2634B with LCD
(RRD) enabled: this is significant.
* LCD modifications should be tested.
10 years ago
grob6000
0877aa0fe0
Merge remote-tracking branch 'upstream/Development' into independent_pid
10 years ago
msutas
e0beb98fd3
Improvement - G29 Option for Not Retracting Servo
...
This change introduces an improvement to G29 command on Marlin.
Auto bed leveling operation's reliability is based on the repeatability of the Z-probe switch and the servo. This change introduces an option to G29 command. When the G29 command is sent with an "e" option, during auto bed levelling the servo is not retracted between probes which decreases the bias on auto bed levelling resulting from servo.
G29 command does the auto bed probing as it is.
G29 E command engages the servo on first probing point, probes all points and retracts the servo after probing the last point.
Please comment your opinions, test on your printer and check the code on a programmer's perspective. (I am not a good programmer.)
10 years ago
grob6000
7d32c7f36d
Multiple PID parameter edit for ultralcd
...
* Depending on extruder count, will add menu items for ultralcd to edit
individual PID parameters for each extruder
* Added menu items to each language_xx.h
* Builds OK, but recommend testing with typical LCD
10 years ago
Steffen Vogel
69dc411ae0
Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD
...
Conflicts:
Marlin/dogm_lcd_implementation.h
10 years ago
grob6000
3e2af67ce3
Fix R-H compatibility
...
* R-H reads incorrect M301 line from EEPROM output if more than one is
present. Reverted to original output format, using only E0 value.
10 years ago
grob6000
37c7e8300f
Independent PID parameters for each extruder
...
* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
10 years ago
Scott Lahteine
326b925557
DOGLCD and LCD_PROGRESS_BAR to coexist
...
Small changes (and formatting to confuse the diff’er) which first
allows DOGLCD and LCD_PROGRESS_BAR to be enabled in tandem, then a
#warning (rather than error) that the extra progress bar / message
options don’t apply to graphical displays at this time. This leaves
open perhaps combining the progress bar and message area in some future
(or forked custom) graphical LCD display arrangement (at which time the
relevant variables may be moved into ultralcd.cpp with externs in
ultralcd.h). I also added a conditional error that the progress bar and
the filament display may not work well together.
10 years ago
Erik van der Zalm
1aade4a8e2
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development
10 years ago
Erik van der Zalm
8a2e84e3f1
Possible fix for FWRETRACT with 0 zlift.
10 years ago
Steffen Vogel
905aab3b85
added missing #endif
10 years ago
Steffen Vogel
b9cf1465a7
updated LCD bouts with new strings and bitmaps
...
new version is pretty generic and should work in most scenarios
10 years ago
Steffen Vogel
c7632be5cc
added high and low resolutions version of splash screen logo (saving code size)
10 years ago
Steffen Vogel
8f0dba7cbf
adding string for bouts splash string to config
10 years ago
Bo Herrmannsen
d94109e886
updated logo post and ver info
10 years ago
Bo Herrmannsen
cd33b5b062
changed logo and ver info
...
logo is now 110 pixels wide and starts 9 pixels in from top left corner and also 9 pixels down from same corner... this will give a 9 pixel border all way round
ver info is placed centered and there is a 9 pixel from bottom of display to ver info
10 years ago
Bo Herrmannsen
9b6c1cfda6
removed unneeded lines in welcome msg
10 years ago
Bo Herrmannsen
ffa09f86f4
moved ver info 5 spaces to the right
10 years ago
Alex Borro
2bbb68be8a
Fix calculation of BAL grid fitting into the bed
...
The previous calc was wrong. Between N points there are only N-1 gaps,
not N.
So changing AUTO_BED_LEVELING_GRID_POINTS to
(AUTO_BED_LEVELING_GRID_POINTS-1)
10 years ago
Bo Herrmannsen
590caafa2d
changed ver info
10 years ago
Bo Herrmannsen
3bb9b31515
changed boot logo a bit to test if fat wall goes away
10 years ago
Steffen Vogel
da192c521f
Merge pull request #1333 from andrewsil1/development
...
Fix grammar/typos in new Configuration.h option
10 years ago
Erik van der Zalm
3a30d45c2e
Revert "issue 968 for dev branch"
10 years ago
andrewsil1
269ec9f87f
Fix grammar/typos in new Configuration.h option
...
(For the SLOW_PWM_HEATERS option)
10 years ago
Todd Swindoll
506353892e
Rambo Pin documentation and servo support
...
Updated pins reference and servo support.
cross referenced between Rambo 1.1, 1.2, and 1.3
10 years ago
Steffen Vogel
8d7bfd03d8
moved/renamed documentation stuff to top-level directory
10 years ago
Bo Herrmannsen
3c9e6b7b62
added link for pic to hex converter
10 years ago
Bo Herrmannsen
0e760274bd
changed reprap logo to marlin logo
10 years ago
Bo Herrmannsen
b291a422e9
added square png version of logo
...
406*406 pixels
10 years ago
Luis E Alvarado
7ae548cf34
Update Marlin Firmware URL
10 years ago
Erik van der Zalm
8f9067faa6
Added marlin logos. (Designed by Ahmet Cem TURAN)
10 years ago
Bo Herrmannsen
addf52fd4a
Merge pull request #1328 from DinoMesina/development
...
Some corrections and new features
10 years ago
Dino Del Favero
5cfe13f240
Correct some mistakes
10 years ago
Dino Del Favero
c7e2d73039
Merge branch 'development'
...
ok
10 years ago
Alex Borro
422a958a34
Fix CoreXY speed calculation
...
For cartesian bots, the X_AXIS is the real X movement and same for
Y_AXIS.
But for corexy bots, that is not true. The "X_AXIS" and "Y_AXIS" motors
(that should be named to A_AXIS
and B_AXIS) cannot be used for X and Y length, because A=X+Y and B=X-Y.
So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning
the real displacement of the Head.
Having the real displacement of the head, we can calculate the total
movement length and apply the desired speed.
10 years ago
Dino Del Favero
038fccd7a1
I have added some code in the "temperature.cpp" for have the possibility of control the time of the states with the heater drived by relays, with this feature now it is possible use PID function in conjunction with relay to control the temperature. I have made some tests and the temperature stay always in the range of +-1°C from the setted temp.
...
There is the possibility of turn on this features adding "#define SLOW_PWM_HEATERS" in Configuration.h
10 years ago