9381bfe7f9
Fixes issue #1447 - Overlapping of long descriptions with values.
10 years ago
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
2abf1ad940
Distribute recent changes in Configuration.h to the examples.
10 years ago
33f8580255
Merge branch 'lcd-width' into b-
10 years ago
0c24bb6cfc
Adjust LCD_WIDTH to make better use of DOGM LCDs
10 years ago
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
65642592ee
Added dualline version.
10 years ago
f9cc1df00b
Droped URL from bootsplash.
10 years ago
c20606b8d7
Replaced some literal constants with defines
...
Replaced calculation to centre bitmap with fixed values.
Saved 20 bytes.
10 years ago
3602474c25
Replace solitaire use of u8g_font_5x8 font and replace with u8g_font_6x10_marlin
...
and win another 1694 bytes.
10 years ago
f5fd94d62a
Kick suspicious loop an win 72 bytes.
...
No visible impact.
10 years ago
b3973ed224
Fix HD44780 misspelled as HD44870
10 years ago
d8b7f29fa2
Merge pull request #1452 from thinkyhead/fix_M200_bug
...
M200 cleanup, normalization of EXTRUDER loops
10 years ago
6d81968db5
Merge pull request #1450 from docdawning/Development
...
Normalized section headers, added some headers, added help URLs for newb...
10 years ago
5bb3933b21
Fixed n00bsauce
10 years ago
d109cd940b
Normalized all configuration files to include my new section headers and the like.
10 years ago
055c4beaf9
Normalized section headers, added some headers, added help URLs for newbies
10 years ago
9dc5de6166
Hide code that makes veteran geeks go "aha!"
10 years ago
bd387068bb
Apply loops for extruders elsewhere also
10 years ago
4a146d584b
Loop, since the pending feature can use an array
10 years ago
bca884bf72
Realized it's not a bug, but cleanup code anyway
10 years ago
2dd43a82b1
Ups. #else added
10 years ago
26e55471f8
Update example configurations.
10 years ago
85385be132
Removed now automatic define of DISPLAY_CHARSET_DOGM + improved description.
10 years ago
0e40408ee5
Make exemplaric use of new display charsets in language_en.h and languag_de.h
10 years ago
8dce5a6644
Improve new charset featur.
...
Select DOGM-displays automaticly.
Give hint where to find charsets.
Add '²' and '³' characters.
10 years ago
c009c81e65
make marlin-main the default
10 years ago
f4ebc02555
marlin url
10 years ago
0af9a0bf57
url to firmware downloads
10 years ago
5f8dd92905
toss in a fix for .ru
10 years ago
3f3ad9b3ad
typo
10 years ago
07639053fb
Add support for BQ Prusa i3 "Hephestos"
10 years ago
fb7c636ecf
Avoid compiling error
...
Only a missing ","... now it will compile again
10 years ago
787d6fb61a
Update RUMBA pins file
...
Add FAN1_PIN and SERVO0_PIN
10 years ago
5fd5105d44
Merge pull request #1439 from clefranc/Development
...
Fix nozzle in temperature menu
10 years ago
76bf93efcb
Revert "get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h"
...
This reverts commit 4d5b0e2037
10 years ago
4d5b0e2037
get STR_THERMOMETER from ultralcd_implementation_hitachi_HD44780.h
10 years ago
33408a4dfc
Update ultralcd.cpp
...
Fix number of nozzle displayed in temperature menu.
10 years ago
6e6e3cf443
merged https://github.com/MarlinFirmware/Marlin.git
10 years ago
b3ca430a20
Inducted the defined placeholders in the translation table.
10 years ago
e045034c3f
Included Configuration.h to read the defined charsets.
...
Defined the charsets plus a default.
10 years ago
27c638803e
Defined three charsets.
10 years ago
073c59c50a
Clean up some formatting
...
- Also partial cleanup of Marlin_main.cpp with a smidgen of Doxygen.
10 years ago
9a4d4b3a2f
translated Deltamenu
10 years ago
8aa6487b4b
MSG_ENDSTOP_ABORT = 'Endstop abort' > 'Endstop Abbr. Ein'
10 years ago
666ad7106b
Translated redundand: define MSG_INIT_SDCARD and MSG_CNG_SDCARD
10 years ago
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
1e22137e27
MSG_STOP_PRINT = 'Druck stoppen' > 'SD-Druck Abbruch'
...
to work out that this can't be resumed.
10 years ago
05d2ebd118
MSG_WATCH > 'Beobachten' > 'Info'
10 years ago
06cba91c39
eye candy 2
10 years ago
9352c9547f
MSG_SPEED = 'Geschw' > 'Geschw.'
10 years ago
0dfb0162f3
eye candy.
10 years ago
7222b27501
MSG_MOVE_AXIS = 'Achsen bewegen' > 'Bewegen'. Is Extruder an axis?
10 years ago
a6f808c9b1
remove unused #define MSG_RETRACT
10 years ago
152fa579f5
MSG_SWITCH_PS_OFF = 'Switch Power Off' -> 'Netzteil Aus'
10 years ago
7a32b742f3
MSG_SWITCH_PS_ON = 'Switch Power On' ->'Netzteil Ein'
10 years ago
4e176d2ce8
MSG_SET_ORIGIN = 'Setze Nullpunkt' ->'Setze Null hier'
10 years ago
1f8c8ad3ed
MSG_SET_HOME_OFFSETS = 'Set home offsets' ->'Setze Home hier'
10 years ago
0e8836ce5e
MSG_AUTO_HOME = 'Auto Nullpunkt' ->'Home'
10 years ago
56d3e6615d
MSG_DISABLE_STEPPERS = 'Stepper abschalt.' -> 'Motoren Aus'#
10 years ago
1258980832
Merge pull request #1429 from bq/Development
...
Add bq Witbox 3D printer
10 years ago
766762a4dc
Change url link
10 years ago
7df9ca051c
Merge pull request #1428 from thinkyhead/issue_1388_eeprom
...
Make EEPROM storage consistent
10 years ago
fe3810f073
yeah, what he said
10 years ago
6137bbd484
use eeprom read correctly
10 years ago
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
ff99ca3040
Fix alignment of Restore following PIDTEMP
...
Should be reading 4 x 4 PID values instead of 4 x 3
10 years ago
6c285930cb
Fixing wrong pin to heater extruder 2 <-> 3
...
Extruder 2 and 3 was swapped
10 years ago
0d4ce27b79
Add pins_WITBOX file
10 years ago
13118cde33
Add bq Witbox 3D printer
10 years ago
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
34377ee512
Merge pull request #1427 from thinkyhead/fewer_preheat_strings
...
Remove language strings that only add a number
10 years ago
7378a7fef4
Merge pull request #1408 from thinkyhead/cleanup_servo
...
Formatting cleanup of quiet sources
10 years ago
5fbef6bed2
Merge pull request #1409 from thinkyhead/rename_lastnr
...
Rename lastnr to autostart_index and...
10 years ago
53eea611b8
Fix MSG_NOZZLE
10 years ago
d7211a5324
Changes for Portuguese too
10 years ago
0a21727c0a
Portuguese (pt) and Brazilian Portuguese (pt-br)
10 years ago
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
2ce4a102ee
Add support for Megatronics 3 a la #1426
10 years ago
ae4b348d77
Make sure _Ex_PINS is defined
...
Also fix analogInputToDigitalPin so it uses proper C hex notation
10 years ago
80be6f3f91
tweak tweak
10 years ago
ebe78cb36f
tweak
10 years ago
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
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
df4f3e7712
cleanup
10 years ago
b6ecbd8cc4
cleanup
10 years ago
4e573134de
Cleanup heading
10 years ago
574a5ab72a
Split up pins to make it more manageable
...
Hopefully this is helpful to organization and future expansion….
10 years ago
d55c62bf9f
Update ConfigurationStore.cpp
...
Moved #endif to allow filament settings to print.
10 years ago
e779641c73
Update ConfigurationStore.cpp
...
Added PIDTEMP dummy write to align EEPROM read/write operation.
10 years ago
baac6e242d
Merge pull request #1419 from AnHardt/bootsplash
...
repair Bootsplash
10 years ago
75cf302da3
example configurations changed to meet Configuration.h
10 years ago
61fd45a0c2
Add 4th extruder
10 years ago
2650be4921
Add 4th extruder
10 years ago
a9763d894e
Add 4th extruder
10 years ago
4949088302
Add 4th extruder
10 years ago
fc5204bd42
Add 4th extruder
10 years ago
9834818ef7
Add 4th extruder
10 years ago
8696963154
Add 4th extruder
10 years ago
ee8a7419f4
Add 4th extruder
10 years ago
e18403235d
Add 4th extruder
10 years ago
7baee555f4
Add 4th extruder
10 years ago
cebc7daf2a
Add 4th extruder
10 years ago
ef4c7abb21
Update language_es.h
...
Add 4th extruder
10 years ago
22e591518a
Update language_de.h
...
Add 4th extruder
10 years ago
a20c35bb38
Update language_ca.h
...
Add 4th extruder
10 years ago
dd301be52d
Added suport for multiline G-code commands in the LCD menus
10 years ago
aa48056c03
Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h
10 years ago
0d219b3e14
Make centering of STRING_SPLASH work
10 years ago
59315330dd
Remove definition of VERSION_STRING and replace where usend with STRING_VERSION
10 years ago
8c792c7b22
Make STRING_VERSION and VERSION_STRING the same
10 years ago
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
3021f7f743
Fix PID_dT
...
Add PID_dT in temeprature.cpp
10 years ago
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
6723388f7f
Proposed fix to #1379 . Printrboard I2C LCD support
10 years ago
03c9cb60e8
Rename lastnr to autostart_index and...
...
Replace instances of the number 13 with FILENAME_LENGTH where
appropriate.
10 years ago
ef5959a705
Fix Temperature
...
Githun insert this line when i merge with actual Branch development...
10 years ago
3d4ee6c868
Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders
...
Conflicts:
Marlin/temperature.cpp
10 years ago
986e723eeb
Add 4th extruder
10 years ago
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
06c3b37933
Formatting cleanup of quiet sources
...
Formatting for code-folding plus minor style changes to less active
code.
10 years ago
23fcd1ecb2
Merge pull request #1407 from thinkyhead/cleanup_marlinserial
...
Formatting cleanup of quiet sources
10 years ago
fd78902194
Formatting cleanup of quiet sources
10 years ago
5c1814383a
Merge pull request #1390 from floyd871/Development
...
Show Custom M_Code for Z-Probe Offset when entering M503
10 years ago
0ebf896070
Add 4th extruder
10 years ago
a9d7ab9530
Update ConfigurationStore.cpp
...
Done
10 years ago
3a9a3e5ed8
Fix Issue #1356 – remove EXTRUDER1_Z_OFFSET
...
This define is not used.
10 years ago
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
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
9040446780
Merge pull request #1395 from AnHardt/iss1394
...
removed function step_wait() from stepper.cpp
10 years ago
25f79c5010
Merge pull request #1391 from CONSULitAS/Development-newBoard_K8200
...
Add: Board for Vellemann K8200 (derived from 3Drag)
10 years ago
9ce75ab7de
Merge pull request #1386 from roglio/Development
...
Fixing a build error for melzi and gfx display
10 years ago
15a00a5a7c
Add 1µs delay in other appropriate spots
10 years ago
23cb899c5a
removed function step_wait() from stepper.cpp
...
removed function step_wait() from stepper.cpp because its used nowhere.
10 years ago
d9d4a78e0f
Add proper delay in stepper.cpp
...
Issue #1385 describes a delay that the compiler is optimizing out and
this solution.
10 years ago
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
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
2d454da3af
Update ConfigurationStore.cpp
...
Show Custom M Code when entering M503
10 years ago
4f35de991a
Merge pull request #1383 from CONSULitAS/Development
...
Update Boards.h for Vellemann K8200 - comment only
10 years ago
22571ca13d
Revert "Configuration for Aurora Z605"
...
This reverts commit 935ee968a7
10 years ago
935ee968a7
Configuration for Aurora Z605
...
Still not fine tuned but working.
10 years ago
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
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
51c7f2fd5a
Revert "## Add: Example Configuration for Vellemann K8200"
...
This reverts commit 5333590ac2
10 years ago
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
ba3ac40b9d
Remove hardcoded programmer option (-cwiring). Use variable AVRDUDE_PROGRAMMER.
...
Change default value of AVRDUDE_PROGRAMMER to 'wiring'.
10 years ago
53f971095d
Revert "Reduce PROGMEM warnings"
10 years ago
67b597ad46
Update printrboard pin assignments
...
Backported from Printrbot branch, allows the fan to work correctly.
10 years ago
d4880a9e60
Revert "Move Sd library out into library"
10 years ago
ccdb086fc8
Merge pull request #1363 from PxT/patch-1
...
Fixes #1361
10 years ago
5151db5c2f
Merge pull request #1349 from msutas/patch-2
...
Improvement - G29 Option for Not Retracting Servo
10 years ago
1746b2582b
Merge pull request #1332 from Sniffle/Development
...
Rambo FAN_PIN documentation and servo support
10 years ago
4b51b5a46d
Merge pull request #1357 from odewdney/SDlib
...
Move Sd library out into library
10 years ago
f2cb4a3655
Merge pull request #1353 from thawkins/Development
...
fix avrdude upload in makefile
10 years ago
9fd4292923
Fixes #1361
10 years ago
f84ff4ba7d
Move SD Fat library out of main src
10 years ago
ab074dac17
Merge pull request #1344 from grob6000/independent_pid
...
Independent PID parameters for each extruder
10 years ago
d4a665694a
Merge pull request #1350 from odewdney/Development
...
Reduce PROGMEM warnings
10 years ago
9d9c859ac1
First move of SdFat library
10 years ago
5045d17a39
fix avrdude upload in makefile
10 years ago
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
cd55a93a13
re-add blank line
10 years ago
23bfe30036
moved include themister to temperature.c
10 years ago
538859669d
Removing compiler warnings for progmem
10 years ago
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
0877aa0fe0
Merge remote-tracking branch 'upstream/Development' into independent_pid
10 years ago
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
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
69dc411ae0
Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD
...
Conflicts:
Marlin/dogm_lcd_implementation.h
10 years ago
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
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
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
1aade4a8e2
Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development
10 years ago
8a2e84e3f1
Possible fix for FWRETRACT with 0 zlift.
10 years ago
905aab3b85
added missing #endif
10 years ago
b9cf1465a7
updated LCD bouts with new strings and bitmaps
...
new version is pretty generic and should work in most scenarios
10 years ago
c7632be5cc
added high and low resolutions version of splash screen logo (saving code size)
10 years ago
8f0dba7cbf
adding string for bouts splash string to config
10 years ago
d94109e886
updated logo post and ver info
10 years ago
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
9b6c1cfda6
removed unneeded lines in welcome msg
10 years ago
ffa09f86f4
moved ver info 5 spaces to the right
10 years ago
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
590caafa2d
changed ver info
10 years ago
3bb9b31515
changed boot logo a bit to test if fat wall goes away
10 years ago
da192c521f
Merge pull request #1333 from andrewsil1/development
...
Fix grammar/typos in new Configuration.h option
10 years ago
3a30d45c2e
Revert "issue 968 for dev branch"
10 years ago
269ec9f87f
Fix grammar/typos in new Configuration.h option
...
(For the SLOW_PWM_HEATERS option)
10 years ago
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
8d7bfd03d8
moved/renamed documentation stuff to top-level directory
10 years ago
3c9e6b7b62
added link for pic to hex converter
10 years ago
0e760274bd
changed reprap logo to marlin logo
10 years ago
b291a422e9
added square png version of logo
...
406*406 pixels
10 years ago
7ae548cf34
Update Marlin Firmware URL
10 years ago
8f9067faa6
Added marlin logos. (Designed by Ahmet Cem TURAN)
10 years ago
addf52fd4a
Merge pull request #1328 from DinoMesina/development
...
Some corrections and new features
10 years ago
5cfe13f240
Correct some mistakes
10 years ago
c7e2d73039
Merge branch 'development'
...
ok
10 years ago
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
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
6730335657
Update Configuration.h
10 years ago
4ffecdbf7d
Merge pull request #1313 from wgm4321/Development
...
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
672f764b4d
replaced ASCII GPL v3 license by markdown version
...
moved new COPYING file to top-level directory to make it more visible and remove clutter from Marlin subduer
10 years ago
f25e793cff
rename stepper lookup table scipt to be consistent with termistor lookup table script
10 years ago
df17a6a1b4
fix #1305 by proposed workaround (thanks gaby64)
10 years ago
f7e65935fb
make use of power operator
10 years ago
4e02aff9b5
automatically determine min/max temp for terminator
10 years ago
81363bc441
more cleanups
10 years ago
95f4a55820
refactored termistor table calculation to be in line with wikipedia's article about Steinhart-Hart coefficients
10 years ago
21205cc3d8
more cleanups in the termistorTable generation script
10 years ago
fb0996b5db
improved output aligment and precision
10 years ago
538231edfd
cosmetic whitespace cleanup and comments added/updated
10 years ago
067b509479
Re-enable filament menu with recalc fix when enabling/disabling mm3
10 years ago
a19f2f8ae7
Disable volumetric menu item due to missing recalc of of multipliers when enabled/disabled
10 years ago
f24dda9700
Revert "Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3"
...
This reverts commit dd7e4ee97f
10 years ago
ec4681ab6b
Revert "Add "Detailed Z Probe" menu item with ABL is defined."
...
This reverts commit 2b9722f387
10 years ago
dd7e4ee97f
Make sure volumetric multipliers are recalc'ed during menu enable/disable of mm3
10 years ago
2b9722f387
Add "Detailed Z Probe" menu item with ABL is defined.
10 years ago
9472bbe51d
issue 968 for dev branch
...
try, try again.
If 'OK' is garbled on sending PC won't receive it. Both machines will
wait on each other forever. This resends OK if nothing is heard from PC
for a while to avoid this bad case.
10 years ago
d2b6e62996
Merge pull request #1309 from philfifi/fix_temp_runaway
...
temp runaway: proper cast to prevent any overflow.
10 years ago
30248214c7
temp runaway: proper cast to prevent any overflow.
10 years ago
c5f138ea07
Merge pull request #1291 from alhirzel/Development
...
Define analogInputToDigitalPin only if needed
10 years ago
652895d656
try different proproc for CI failure
10 years ago
3d9f4ac757
Merge pull request #1303 from wgm4321/Development
...
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER ...
10 years ago
04fb34c7ff
Add English defines for filament menu to non-English to prevent compile errors until translated
10 years ago
f8aa5ff771
Fix for cant compile when REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER defined
10 years ago
39fae9e3a3
Fix progmem warning
...
Borrow code from https://github.com/arduino/Arduino/issues/1793
10 years ago
f36fd3ddec
Merge branch 'Development' of https://github.com/ErikZalm/Marlin into Development
10 years ago
b5e50cdd4e
Move scripts and documentation to subfolders
10 years ago
eed451e034
rework analogInputToDigitalPin definition
10 years ago
1f520a5a8c
Due to the fix for #1248 , X and Y probe offsets must not be floats.
...
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
10 years ago
b32be2dc64
Fix syntax error caused by previous changes.
10 years ago
edac64e7d2
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
ecda6cdc0a
Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
f3e503e725
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
1d5d853c9a
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
63da6900b0
Merge pull request #1282 from vandarin/Development
...
Due to the fix for #1248 , X and Y probe offsets must not be floats.
10 years ago
a18b625534
Merge pull request #1261 from wgm4321/Development
...
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
ae12ad0d6c
Fix typo, PID_BED_POWER -> MAX_BED_POWER
10 years ago
80b17ab573
Merge pull request #1285 from drf5n/PID_CI_v2
...
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
625860f086
temperature.cpp: Fix typo of PID_MAX to MAX_BED_POWER for the bed.
10 years ago
6583bb781d
temperature.cpp: Fix typo of MAX_BED_PID to MAX_BED_POWER.
10 years ago
2701dd8a17
Due to the fix for #1248 , X and Y probe offsets must not be floats.
...
The compiler does not support comparing float values: "error: floating constant in preprocessor expression"
The loss in X/Y precision shouldn't matter for Z probes, as most microswitches or inductive sensors are larger than 1mm square anyway.
10 years ago
6b82415c81
Update pins.h
...
Somehow the pin definitions for the MAX6675 Slave Select/Chip Select got changed back to the hardware SPI SS/CS.
Pin 49 cannot be used as that is used by the SD card socket to detect if an SD card is present.
Pin 53 is the Hardware SPI SS, which is dedicated, nicely, to the SD card SS and therefore cannot be used as the MAX6675 SS
Pin 66 is in Aux2 port adjacent to the Hardware SPI interface port on RAMPS 1.4, and is currently not used for anything.
10 years ago
692a01b1c7
Merge pull request #1277 from thinkyhead/fix_regressions
...
Fix regressions affecting compilation
10 years ago
2ec2bf1564
Fix regressions affecting compilation
...
This fixes two regressions, caused by #1167 and #1191 .
10 years ago
e7db8ee9e5
ftostr32np > ftostr32sp
...
sp=space-padded, similar to: ns=no-sign
10 years ago
10e1b6ef8b
Least stack-usage self-contained ftostr32np()
...
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
10 years ago
d1f21d1189
As it should be
10 years ago
449dad71f2
Least stack-usage self-contained ftostr32np()
...
This is the optimal code for a self-contained formatter, although the
original code is crafty in being smaller and simpler, and can be
evaluated as using the original output as a scratch pad for state,
making the final formatter more straightforward. While this code is
longer, all code-paths are minimal.
10 years ago
a2109cb492
Patch to make Z look more like X and Y on UltraLCD
10 years ago
3d1da45f3e
Update Marlin.h
10 years ago
d02daec08f
fixed compilation
10 years ago
991a74b75b
Move delta calibration menu to sample delta configuration.
...
Turn off by default.
10 years ago
67fd8f0727
Merge pull request #1267 from RobotCaleb/LanguageFix
...
Language Fix - Using the new language implementation wasn't behaving as expected.
10 years ago
236db44669
Fix spacing
10 years ago
e6774fb7d2
Using the new language implementation wasn't behaving as expected.
...
No matter what LANGUAGE_CHOICE was set to it would always take the en branch.
I revamped it a bit to use a macro to create the language include file name. This required a slight tweak to the RU declaration since it's special-cased in a couple places in code.
This is an attempt to pull my changes from #1222 over.
10 years ago
cb047e9070
Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently)
10 years ago
5b336a4cdb
Delta calibration menu based on http://minow.blogspot.com/index.html#4918805519571907051
...
To test/enable, uncomment the #define DELTA_CALIBRATION_MENU in Configuration.h
10 years ago
10ad9f1062
Addes servo0 pin ultimaker
10 years ago
f24c5d82e3
Update Marlin_main.cpp
...
fixed minor typo
10 years ago
8a6f098cc6
Expand manage_inactivity #1264
...
void manage_inactivity(bool ignore_stepper_queue=false)
standard is false so it is not necessary to change additional code. this
change should be better, hopefully nophead like this :)
10 years ago
d1995aec7a
Rename ignore_blocks_queued
...
more speaking name
10 years ago
4122de9d17
change filament issue
...
make a more general solution
10 years ago
d60efc3b5d
Fix syntax error caused by previous changes.
10 years ago
cb12161191
Add Filament menu and add Filament/Retract settings to config store.
10 years ago
ec33df0554
Merge branch 'SAV-MkI_merge' into Development
...
Tested for SAV MKI and SAV 3D LCD on lewihe.
10 years ago
0468f81950
Update for pull request #837
10 years ago
6e42c9e305
Add fwretract settings to M503 output
10 years ago
3afe66bb0c
Fix issues #1248 , #1240
...
- Fixed issue when BAL area probing is shorter than it should be for
grid probing
- Warning when BAL activated with Delta Kinematics
- Fix XY_TRAVEL_SPEED when homing Z axis
10 years ago
9eb6df17a7
Consider negative Z Offsets when auto bed leveling is active
10 years ago
c9f60183a9
Merge pull request #1233 from NarimaanV/Development
...
Fixed BABYSTEPPING feature
10 years ago
0d957872a0
Merge pull request #1234 from gregrebholz/issue_1069
...
Fixes #1069 . Added "auto fan" checks to PID_autotune.
10 years ago
9c07d28bd6
Merge pull request #1249 from drf5n/PID_CI_v2
...
temperature.cpp: Add Conditional Integration to prevent excessive integral windup
10 years ago
23e768dffa
Merge pull request #1250 from chertykov/Development
...
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
2f467e2797
LCD Progress Bar
10 years ago
050ca9ca13
Move initialization of errormagic[] and echomagic[] to Marlin_main.cpp
10 years ago
cf52c48d19
Configuration.m: Set PID_INTEGRAL_DRIVE_MAX from PID_MAX from BANG_MAX.
...
Current defaults are all 255. If it makes sense to reduce them, they should come down together, and
be in a PID_INTEGRAL_DRIVE_MAX <= PID_MAX <- BANG_MAX relationship.
10 years ago
984177c40c
temperature.cpp:Add PID Conditional integration on heated bed.
10 years ago
c9b8435749
heater.c: Limit PID I term with conditional integration.
10 years ago
7ecb7cbd46
Added "auto fan" checks to PID_autotune
10 years ago
7667949aca
Fixed BABYSTEPPING feature
...
Moved PSTR() macro to correct place which was causing the " initializer fails to determine size of '__c' " when attempting to compile with BABYSTEPPING enabled.
10 years ago
d74aabf259
Revert "Change Auto_Bed_Leveling to Auto_Bed_Compensation"
10 years ago
60628864ca
Merge pull request #1167 from thinkyhead/sd_freemem
...
Use SdFatUtil::FreeRam() for freeMemory() if there
10 years ago
889d7ba218
Merge pull request #1177 from martin-pr/probing_z_speed
...
Split do_blocking_move() to XY and Z sections
10 years ago
5e7bd2dc87
Merge pull request #1200 from chertykov/Marlin_v1
...
Fix syntax errors in #ifdef
10 years ago
b086394178
Fix syntax errors in #ifdef.
10 years ago
39d28a9bbf
Update qr_solve.h
...
Changed level to compensation
10 years ago
6325968a39
Update qr_solve.cpp
...
Changed leveling to compensation
10 years ago
e99f24ff2f
Update planner.h
...
Changed level and leveling to compensation.
10 years ago
ac204028e7
Update planner.cpp
...
Changed level and leveling to compensation
10 years ago
4315c2547a
Update Marlin_main.cpp
...
Changed level and leveling to compensation (except with "verbose_level" and "lcd_reset_alert_level").
10 years ago
f21c65918f
Update Servo.h
...
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
10 years ago
58c4473bea
Update Servo.cpp
...
Changed AUTO_BED_LEVELING to AUTO_BED_COMPENSATION
10 years ago
825c46024d
Update vector_3.cpp
...
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
10 years ago
cfe80e1def
Update vector_3.h
10 years ago
7464d3c96a
Update ConfigurationStore.cpp
...
Changed AUTO_BED_LEVEL to AUTO_BED_COMPENSATION
10 years ago
81568c3c6d
Update Configuration.h
...
Changed Auto Bed Level to Auto Bed Compensation
10 years ago
03e489aaad
Merge pull request #1197 from foosel/fix/issue_1147
...
Fixes commands not being acknowledged in the same order they are received in
10 years ago
acc0e75279
Fixes commands not being acknowledged in the same order they are received
...
in
G0 to G3 were previously acknowledged in the get_command method, causing
them to be possibly acknowledged before commands coming after them that
were acknowledged in process_commands.
This patch fixes this, moving the acknowledgement of G0 to G3 to the
process_commands method as well. These commands are therefore no
longer acknowledged when the enter the cmd_buffer but instead only
acknowledged when the enter the plan_buffer.
Guaranteeing that commands are acknowledged in the same order in which
they were received by the firmware allows host software to be able to
track the life cycle of commands and such a better management of the
firmware's serial buffers as well as better internal command processing
and response parsing without having to depend on throwing an epic
amount of regular expressions against each line received back from the
firmware.
Fixes ErikZalm/Marlin#1147
10 years ago
AnHardt