c7fb1b70f2
Initial Configuration.h for Felix 2.0/3.0
10 years ago
2e172f38bd
Added support for Felix 2.0/3.0 printers
10 years ago
f994729999
Parse and use dependent groups
...
- Parse #if, #ifdef, etc. for rules to enable fields
10 years ago
9b50ec6512
Panel One encoder pins
10 years ago
838a22de64
Fix switch value method, make app global
10 years ago
8d5839151b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
443e7edef4
- Add support for L6470 Drivers.
...
- Both TMC, L6470 and pin-driven drivers work.
- All can be mixed and matched as needed.
10 years ago
1db02c2891
Merge branch 'Development' into fixup_temperature
...
Merge upstream changes
10 years ago
a99470fbb0
Merge pull request #1527 from maverikou/panel_one
...
Added support for PanelOne from T3P3.
10 years ago
5727cb3ed4
Cleanup TMC Stepper a bit.
10 years ago
a5bbd402bf
Merge pull request #1539 from AnHardt/dummysensor
...
Extend the idea of dummy temperature sensors.
10 years ago
1a7b0d9a37
Redo HAS_* macros to fix define error
10 years ago
864dddc878
Macros to the top, a few HAS_* macros
10 years ago
227ab8c665
Merge pull request #1503 from MarcelMo/patch-2
...
Support for simple customisable AutoZProbing area
10 years ago
fd1ea9d56f
Move literal strings to language files
10 years ago
8742b6bd56
Merge branch 'Development' into panel_one
10 years ago
aa9c1f1bed
Better name for ADC macro
10 years ago
9c9726d469
Cleanup of temperature code
...
- Reduce calls to millis()
- General cleanup of manage_heaters
- General cleanup of pid autotune
- Formatting here & there
- Macros to clean up and shrink ISR code (reduced by ~364 lines)
10 years ago
c6d2ebe452
Extend the idea of dummy temperature sensors.
...
Added a second sensor and made them configurable.
10 years ago
c9a3eb0c1a
Spacing in calculate_volumetric_multiplier(s)
10 years ago
2af559cca3
Shared function for menu_edit_* and menu_edit_callback_*
10 years ago
df8c51528f
Merge branch 'Development' into cleanup_ultralcd
...
Latest upstream changes
10 years ago
517f411999
Spacing adjustment to menu_edit* macro
10 years ago
4938ae5caf
Add required backslash for macro expansion
10 years ago
e182cdebf9
Add required backslash for macro expansion
10 years ago
fa4c36df68
Fix menu callback issue wrt LCD_CLICKED
10 years ago
0cf0c20532
Optimize calculate_volumetric_multiplier
10 years ago
38500165ea
First attempt at adding TMC Driver support. May need some cleanup.
10 years ago
b55995aae8
Introduce a layer of macro indirection to all stepper pins. This allows other stepper drivers to redefine them, so they can use SPI/I2C instead of direct pin manipulation.
10 years ago
8ccdac9898
Enable PID debugging for heated bed
10 years ago
29097b0ab2
Enable PID debugging for heated bed
10 years ago
21bd4fd6db
Enable PID debugging for heated bed
10 years ago
fb56aad898
Enable PID debugging for heated bed
10 years ago
08c543f8fb
Enable PID debugging for heated bed
10 years ago
c89413db1e
Enable PID debugging for heated bed
10 years ago
1c71e4751a
Enable PID debugging for heated bed
10 years ago
a9e15aa503
Updated example configurations
10 years ago
3ba47ea277
Remove test/demo multi=line code menu items
10 years ago
c1240f23dd
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
a57869ba49
Dummy Thermistor Table for testing purposes
...
Am I the only one who always need to change the thermistortable.h to add
a dummy table??
Ok, it is done. Just set the thermistor to 999 and it will always read
25C. Great for Testing or Development purposes.
10 years ago
2e166f5337
Added support for PanelOne from T3P3.
10 years ago
40ef472a25
Merge in encoder multiplier
10 years ago
1c13cd604b
Formatting in babysteps defines
10 years ago
3a26804d80
Adapt to latest PID code and fix typos
10 years ago
422582da71
Prep formatting for upcoming PR
10 years ago
27ac3e985d
Add options to example_configurations
10 years ago
0d6a7a2df0
Merge with latest upstream changes
10 years ago
c7a97e18b7
Merge branch 'Development' into cleanup_ultralcd
...
Latest upstream changes
10 years ago
6d5c13df74
Merge pull request #1520 from thinkyhead/fixup_temperature
...
Fix typos in checkExtruderAutoFans
10 years ago
5b9e341222
Merge pull request #1516 from thinkyhead/fixup_ramps
...
Cleanup ramps boards
10 years ago
57bc28b42c
Cleanup and fix ultralcd.cpp
...
- Fix bug in lcd_control_temperature_menu
- Remove test menu-item left in from multi-line command feature
- Replace literals with translatable strings
- Reduce lcd_preheat code redundancy
- Reduce menu macro redundancy
- Clean up formatting
10 years ago
4fcd4b444e
Merge pull request #1519 from thinkyhead/fix_recent_issues
...
Fix implementation of PID menu items
10 years ago
9c35ed149d
Merge pull request #1508 from AnHardt/iss1492
...
Fix iss#1492
10 years ago
430c4b6538
Replace missing backslash
10 years ago
3aa5f98b64
Download all as ZIP, adjust layout on resize
10 years ago
a8939eec28
Readability of MENU_MULTIPLIER_ITEM
...
Last commit before bed.
10 years ago
09e09b308e
Tweaky spacing adjustments
10 years ago
e3fd3e8fa4
Fix typos in checkExtruderAutoFans
10 years ago
c610471b0c
Add PID_PARAMS_PER_EXTRUDER conditional
10 years ago
2d6fa9ce80
Proper implementation of PID menu items
...
- Make this work per #1344
10 years ago
b8e79dce89
Fix compilation errors when encoder multiplier is disabled
10 years ago
65e1fc71be
Add encoder rate multiplier
10 years ago
859c8d3fef
Azteeg X3 overrides too
10 years ago
7891eacf21
Merge branch 'Development' into fixup_ramps_boards
...
- Also apply cleanup for #1514
10 years ago
1600506545
Merge remote-tracking branch 'upstream/Development' into marlin_configurator
10 years ago
5d0c93ae10
Keep config boxes in view on wide screen
10 years ago
335b7680c9
Tooltip code, widescreen layout, hide auto-expands
...
Slightly better layout for wide screens.
10 years ago
15b73386b5
Add pin definitions for the Boards BAM&DICE + BAM&DICE Due
10 years ago
08c236059e
Merge pull request #1505 from thinkyhead/issue_1499
...
Bed leveling probe behavior issue?
10 years ago
f238c7428d
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
da275c72ab
Cleanup Github reply.data.content before atob()
10 years ago
159196d1e9
Reset Alert message when finish M600 command
10 years ago
266ff227cf
Merge pull request #1510 from docdawning/Development
...
Trivial spelling correction
10 years ago
dfd4e74a5c
Trivial spelling correction
10 years ago
6cdcd6c6d1
Fix iss#1492
...
Introduced lcd_strlen() and lcd_strlen_P().
Replaced the old functions where necessary.
Reworked language_ru.h.
Speeded up test for zero length string in cardreader.cpp
10 years ago
c033904693
Updated config file section markers
10 years ago
84a87a5b1c
Fix up configs a little
10 years ago
63a5ff7ab9
Merge pull request #1489 from tommil/Development
...
Updated Finnish language file
10 years ago
efb0491d40
Merge branch 'Development' into issue_1499
...
Merging latest upstream changes
10 years ago
8309b4f408
Merge branch 'Development' into marlin_configurator
...
Merging latest upstream changes
10 years ago
961998cf91
Merge pull request #1496 from thinkyhead/issue_1493
...
Megatronics 3 servo pins
10 years ago
b71322e793
Issue #1504 – K8200 Z_ENABLE_PIN
...
- K8200 uses a non-standard RAMPS with Z_ENABLE=63 ??
- Assuming from previous input that 3DRAG is the same.
10 years ago
978d114c73
Bed leveling probe behavior issue?
...
The `float` keyword should not be on these vars because they conceal
the outer vars, preventing them from obtaining known values before
being passed in `set_bed_level_equation_3pts`. Possibly related to
`Z_RAISE_BETWEEN_PROBING` not functioning.
10 years ago
7c6236761a
Merge branch 'Development' into issue_1493
...
Merging latest upstream changes
10 years ago
9875352dd8
Merge branch 'Development' into marlin_configurator
...
Merging latest upstream changes
10 years ago
d28f5b9e82
Support for simple customisable AutoZProbing area
...
When probing PCB´s I had the problem that i needed auto-leveling for specific areas (it´s never the same size).
Not much code, but very useful.
Now I use simply G29 L5 R55 F5 B35 P3 to probe a 4x6cm PCB before milling.
I used int for values... might be wrong...
I hope this time I got the right development tree. (tried first with https://github.com/MarlinFirmware/Marlin/pull/1130/commits )
10 years ago
513ff94b89
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
83cb702e72
Config sections, multi-field values, toggles, etc
...
- Auto-detect “switchable” items where possible
- Handle switchable multi-value fields
- Add standard sections to config form
- Add section markers to configurations
- Add value options to configurations
- Remove and re-add fields for loaded configs
- Preserve sections across configs
- Preserve non-added fields
- Style added fields wider & newline by default
10 years ago
afc737ca0c
Fix CoreXY Homing Routine.
...
Fixed how stepper ISR figure it out when the head (extruder) is going to
Min or Max direction.
Added Homing to Max Endstops.
10 years ago
ec53c6309a
More fields, options in config, fix tooltips
10 years ago
68184af57b
Merge branch 'Development' into marlin_configurator
...
Latest upstream commits
10 years ago
7866fa161f
Merge pull request #1476 from Natealus/Development
...
Compiling errors with 4 Extruders defined and Viki 2 Implementation
10 years ago
ea9e49b20d
ARRAY_BY_EXTRUDERS 4th hotend PID parameters
10 years ago
d0ad8a978c
Megatronics 3 servo pins
...
- Naive implementation, assuming the data sheet pin numbers correspond
to Arduino pin numbers.
10 years ago
e74138b2be
More robust fetch code, download buttons
...
- Fetch code now handles github, local, or http: access
- Download button creates a time-stamped inline download
- More complete error messages
- Show warnings when approaching the hourly fetch quota (limit
reloading!)
- Added my test domain (where the _htaccess is deployed)
- `_htaccess` file added to set Access-Control-Allow-Origin “*”
- Marlin logo with css
- Limit selectable areas to avoid annoying selections
- Messages now persist until dismissed
- Default repo for files set to thinkyhead, ‘marlin_configurator’ branch
- Cosmetic changes
10 years ago
622a531d9c
Fixed error in translation
10 years ago
290ab42d22
Updated Finnish translations
10 years ago
22a7985445
reverted to upstream
10 years ago
b3bda57ca2
reverted to upstream
10 years ago
9d75a56b56
Merge remote-tracking branch 'upstream/Development' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
0a59fee763
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
eb5889b3da
Merge pull request #1479 from AnHardt/en_first
...
#include "language_en.h" before the national language in language.h
10 years ago
b9ed873827
Enable PID debugging for heated bed
10 years ago
0a19109476
Enable PID debugging for heated bed
10 years ago
a4f939cc27
Updated Finnish language file
10 years ago
32d4dd073f
Merge pull request #1487 from AnHardt/iss1485
...
Fix for #1485
10 years ago
c246026bda
Sorry.
10 years ago
07e488cfae
Fix for #1485
10 years ago
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
52c3cf6d34
Fix a logging error
10 years ago
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
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
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
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
8e92729141
Make display language configurable in Configuration.h
10 years ago
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
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
85e5aa4011
Generalized enqueue_commands_P, and moved them to Marlin_main as they should
10 years ago
4228758f1d
Clean up and improve tooltips, show the name
10 years ago
0116320d2c
Strip slashes off the front of tooltips
10 years ago
69240d41b0
Offset the timing of the pulsing animation
10 years ago
78b9428f4e
Avoid capturing disabled items in comments
10 years ago
5d159851e5
Fix positioning of tooltip
10 years ago
c99f1de9f3
Fix tooltips blocking clicks
10 years ago
1a548c1bc1
Find nearby comments and make them into tooltips
10 years ago
90fa1345b0
Fix purge + refresh of define info
10 years ago
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
7850ae2f4f
Merge branch 'Development' into marlin_configurator
...
Merge latest Development
10 years ago
2647402095
Use info.repl in updateDefineFromField, fix regex
10 years ago
12a3975341
Close section tag, add String.prototype.lineCount
10 years ago
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
37c43a7ab3
Scroll to reveal on switches as well
10 years ago
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
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
72856166a9
Fix bad typo in ConfigurationStore.cpp
10 years ago
b51204cc1c
Add fieldsets and make them into tabs
10 years ago
56769ba4f8
Make comment/uncomment a little neater
10 years ago
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
32aaadc301
Include minimized jQuery 2.1.3
10 years ago
53f6bbdfe0
Try a stepper for the serial port
10 years ago
ac7a4358d6
Add a responsive file uploader
...
- Specify HTML5
- Allow drag and drop for loading configurations
10 years ago
09a385d9b0
Add "use strict" to the top.
10 years ago
b2627200ea
Get thermistors from config, add temp sensors
10 years ago
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
3490a19103
Merge pull request #1466 from CONSULitAS/Development_K8200_de
...
K8200: Example Configuration.h fixed
10 years ago
cfbb94a2a8
K8200: Example Configuration.h fixed
...
Example Configuration.h: fixed strange white characters preventing
compilation in lines 1 and 3 - oops
10 years ago
b65c5d8ec6
Merge pull request #1464 from AnHardt/iss1448-Menu
...
Unified menu selection - by hilighting - made first column avilable
10 years ago
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
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
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
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
b6ca50a2cc
Merge pull request #1463 from thinkyhead/cleanup_recent_merge
...
Apply some cleanup for recent merge
10 years ago
cc56f36870
Merge pull request #1461 from thinkyhead/issue_1453_redo
...
Apply fix for M600 filament change
10 years ago
8663f4bbaf
Apply some cleanup for recent merge
...
Combine 1/(rows+1) with u8g.getHeight() to get rowHeight and just use
that.
10 years ago
0cb1029311
remove extra plan_buffer_line
10 years ago
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
17de96ace7
Merge branch 'Marlin_v1' into revert-1154-sd_sorting
...
Conflicts:
Marlin/cardreader.cpp
Marlin/cardreader.h
10 years ago
6880e93b75
Happy configs
10 years ago
3b1f186c0c
Clean up configs
10 years ago
f83d0f2a68
Defines for electronics boards
...
Added boards.h which contains defines for all the board numbers, plus
some shorthand macros for less typing.
10 years ago
bd25e7393b
Merge pull request #1192 from thinkyhead/split_language
...
Split up languages.h. Use ISO language codes.
10 years ago
174f8d3631
Added example configs for printers from http://tvrrug.org.uk/
10 years ago
e970461adb
Clean up, move unused to the bottom, add headings
10 years ago
0c06e97e98
Split up languages.h, use ISO codes
...
Breaking up languages.h makes it easier to translate. Using language
codes makes it easier to select a language and sets the naming standard.
10 years ago
a9c334e8bc
Merge pull request #1191 from thinkyhead/code_shrink
...
Shrink and Optimize
10 years ago
842da54e68
Merge pull request #1187 from thinkyhead/fix_constants
...
A few constants where they belong
10 years ago
07c6b5ab71
Using axis constants
10 years ago
1857e611d3
Other small tweaks
10 years ago
63e1665fa9
Reduce ultralcd.cpp redundancies
10 years ago
e69313fc2b
Reduce dogm lcd code
10 years ago
bd22405412
Merge pull request #1190 from thinkyhead/sd_sorting
...
Wrap call to flush_presort
10 years ago
49791949af
Wrap call to flush_presort
10 years ago
0450e83fa5
Use SdFatUtil::FreeRam() for freeMemory() if there
10 years ago
f21cce0b28
Rebase to Marlin_v1
10 years ago
e4b98011cf
And one more...
10 years ago
60598b4cdd
A few constants where they belong
10 years ago
280504e2e0
Merge pull request #908 from alromh87/Marlin_v1
...
Support for Gen3 Monolithic electronics
10 years ago
31ca3de72f
Merge pull request #819 from neildarlow/Marlin_v1
...
Activate LiquidTWI2 device detection and space-pad LCD status line.
10 years ago
e83cfc0a62
Merge pull request #1163 from thinkyhead/lcd_abort_message
...
LCD "Abort" Message
10 years ago
0b310ab6c5
Merge pull request #1153 from xinfab/negative_values_in_menu
...
Negative values in menu
10 years ago
91d740e128
Merge pull request #1141 from filipmu/Filament-Sensor
...
Display filament sensor data on a 20x4 LCD or Graphical LCD
10 years ago
ab355a90d3
Revert "SD Sort and Buffer"
10 years ago
d088b5f30f
Remove debug echo
10 years ago
1fad8e6a81
Proper long file name var
10 years ago
29e854c535
Disable SDCARD_SORT_ALPHA by default
...
For legacy boards it’s better if this option is disabled.
10 years ago
6599adc184
Polish up a little...
10 years ago
a12eec33e2
Completed SORT_USES_MORE_RAM implementation
...
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
10 years ago
c9486ebb85
Improvements, more SORT_USES_MORE_RAM
...
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
10 years ago
b6ffea612a
Expand on More RAM concept, address minor bugs
10 years ago
8196b36ad9
SD Card Alpha Sorting
...
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
10 years ago
cf749dbeda
Completed SORT_USES_MORE_RAM implementation
...
For the MORE_RAM option we need to buffer both the short and long
names, even though long names are sometimes redundant. Worst case, all
the names are max length. We can save some RAM by not storing these. We
could save more RAM by only storing the visible part of the long name.
10 years ago
ae081d0fe0
Improvements, more SORT_USES_MORE_RAM
...
With this option, always keeps the dir in RAM, doubling as a cache for
getfilename. A board with only 8K of SRAM is cutting it very close.
10 years ago
785143a013
Expand on More RAM concept, address minor bugs
10 years ago
0cbbba08bd
SD Card Alpha Sorting
...
First iteration of alphabetical sorting for SD cards, both
slow+efficient and fast+rammy. Option for folders to sort first, last,
or not at all.
10 years ago
3ebfd29312
Print a message when printing is aborted
...
Messages in gcode files like “M117 Printing…” were not being cleared on
Stop Print.
10 years ago
2ef0669b19
Split do_blocking_move() to XY and Z sections to make sure that the Z homing feedrate is not exceeded
10 years ago
64139f5e5a
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
edfcf3b527
Toshiba Stepper Driver support
...
Tosh stepper drivers need to be driven slower, so the stepper code
was interleaved to separate the pin HIGH from the pin LOW. This adds
enough instructions to make it work, without needing nops.
10 years ago
c429a4b3ec
Toshiba Stepper Driver support
...
Tosh stepper drivers need to be driven slower, so the stepper code
was interleaved to separate the pin HIGH from the pin LOW. This adds
enough instructions to make it work, without needing nops.
10 years ago
1977b4490f
Merge pull request #1159 from thinkyhead/lcd_wait_better
...
M0/M1 Message Fix
10 years ago
7562183efc
Skip over spaces first
10 years ago
5a8b3a84ae
Merge pull request #1155 from thinkyhead/lcd_wait_better
...
M0-M1 Enhancements
10 years ago
433ac29d31
Updated a bit of spanish language
10 years ago
12b51d6060
Ignore S and P if no value >0 is included.
10 years ago
d12b24758a
Clear LCD to welcome_msg if not printing
...
The welcome message is more appropriate than “resuming print” if
nothing is printing.
10 years ago
3f54c9ba33
Relocate click ignore code into info screen
10 years ago
92e21d3ee2
M0-M1 Enhancements
...
Allow M0 and M1 to include a message string. Ignore clicks on “Wait for
user” so that the Info Screen stays up.
10 years ago
0d35b1d0b8
Allow negative values in menus
10 years ago
0d97dec434
Adaption of LCD info screen
...
Here comes a compile-time operation to match the extruder symbols on the
info screen to the set number of extruders in configuration.h.
When only one extruder is selected, the "1" on the symbol will not be
displayed.
10 years ago
3b1ab84536
Display Filament Sensor data on graphic LCD
...
Added support to show the filament width on the status line of the
graphic LCD. The status will show for 5 sec and then switch over to
data. Status can be seen by clicking the button.
10 years ago
d84934d8c5
Display Filament Sensor data on 20x4 LCD
...
Changes to support displaying the real-time filament width and the
volume factor on a 20x4 LCD. The data is displayed on the 4th line.
First the status message is displayed for 5 seconds, and then the
filament data is displayed. The status message can be seen by
re-selecting the info screen in the menu.
10 years ago
5c8107bcdd
Commented out FILAMENT_SENSOR #define
...
Commented out the FILAMENT_SENSOR define so that it is not enabled by
default. Code does not work on all hardware variants.
10 years ago
377dfb182f
Updated example configurations for Delta printers
10 years ago
b81021f475
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
724197454c
Merge pull request #1104 from ch100/Marlin_v1
...
Fixed typo.
10 years ago
058e446531
Merge pull request #1037 from filipmu/Filament-Sensor
...
Support for a filament diameter sensor
10 years ago
110c5dcf23
Fixed typo.
...
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
10 years ago
ca30aee903
Fix "add_homeing" to "add_homing" to match changes
10 years ago
0733825fb1
Merge pull request #1099 from Fourmi/Marlin_v1
...
Update line 627 ,wrong number on thermistortables
10 years ago
af3e4d7510
Update line 627 ,wrong number on thermistortables
...
Wrong number on line 627 > i change number "12" by the correct number "13"
Soory
10 years ago
aaaf8fe8dd
Merge pull request #1068 from darkjavi/Marlin_v1
...
Added profile for RAMPS with 2 extruders and 1 fan, no heated bed
10 years ago
b360306881
Merge pull request #1073 from WingTangWong/wing-fix-float-delta
...
Wing fix float delta
10 years ago
ce85515428
Merge pull request #1082 from Fourmi/Marlin_v1
...
Add thermistor table
10 years ago
764921bdbf
Merge pull request #1091 from Aldert/patch-1
...
Update motion_control.cpp
10 years ago
c40c7b589b
Merge pull request #1095 from thinkyhead/codeclean
...
Simple code cleanup. Rename "homeing" to homing.
10 years ago
0f2e0525df
Merge pull request #1096 from thinkyhead/set-home
...
Proposed feature: Set Home Offsets
10 years ago
5ae02a361b
Merge pull request #1097 from thinkyhead/round-up-xyz
...
Adjust the Z display to hide float rounding errors
10 years ago
fb34265d75
Make hotend optional when compiling with lcd support
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
10 years ago
6e343ef2f0
Adjust the Z display to hide float rounding errors
10 years ago
2f6c57eadc
Proposed feature: Set Home Offsets
...
Add an item to the LCD menu that applies the current axis position to
the “add_homeing” offset.
10 years ago
f989bd5435
Simple code cleanup. Rename "homeing" to homing.
10 years ago
6c5a460e65
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
d1e4237e1d
Update motion_control.cpp
...
G03 Full circle did not work (G02 is working correct)
10 years ago
a664763e6f
Update thermistortables.h
...
Add another thermistor table (13),it's a cartridge thermistor up to +300°C,use with Hotend "Simple ONE" & "All In ONE"
Thx
10 years ago
b5dc228a7a
Update configuration.h
...
Add another comment for thermistor 13 ,use with Hotend "Simple ONE & All In ONE"
10 years ago
3cbb2f56c6
Update configuration.h
...
Add another comment on configuration.h for the value of thermistor.
I make a pull request on thermistortables.h with my thermistor (12),but y see there is a comment on configuration with number 12 but it's not present on thermistortables.h ?
Thx
10 years ago
c35736a140
Update thermistortables.h
...
Add another thermistor table,use with hotend "Simple ONE" & "All in ONE"
10 years ago
cb4a6dd2dc
Merge pull request #1065 from oliasmage/Marlin_v1
...
Corrected retract() call for use of auto probe without sled enabled.
10 years ago
01e9b536cb
Fix build for non-sled bed auto levelling
...
This function should only be used with sled, not all bed auto
levelling.
10 years ago
58eabd21fb
Added ifndef
10 years ago
88d12a762a
Added #ifndef DELTA wrapper to float delta
10 years ago
bf0ecedf60
Merge pull request #1051 from fsantini/EZ_fix935
...
Fix issue 935: error in matrix calculation
10 years ago
40ba644bb4
Added profile for RAMPS with 2 extruders and 1 fan.
...
modified: Marlin/Configuration.h
modified: Marlin/pins.h
10 years ago
3b8216bdd1
Corrected #endif and ifdef for Z_PROBE_SLED code.
10 years ago
37799f70ba
Corrected retract() call for use of auto probe without sled enabled.
10 years ago
1632e5e38a
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
fe3a09bbcf
Correct analog sampling time for additional A to D sample
...
Adjusted the #define PID_dT to reflect 10 A to D sample steps, vs
original 8.
10 years ago
1e9dc85148
Do not use translations for the serial console messages
...
The serial protocol has to stay machine readable, without having
to cope with a ton of different human language variants. So
just leave it at the original english version.
Should fix ErikZalm/Marlin#1052
10 years ago
cf325ba240
Fix issue 935: error in matrix calculation
10 years ago
018b68a5c4
Merge pull request #976 from cocktailyogi/SCARA_by_Yogi
...
Implemented SCARA-Maths
10 years ago
dde61d8886
Merge pull request #977 from OskarLinde/Marlin_v1
...
Fix lcd itostr3() to handle negative numbers
10 years ago
0fbfb1bf82
Merge pull request #991 from bonm014/patch-1
...
Leapfrog controller board support
10 years ago
8340ca6e05
Merge pull request #992 from Grogyan/patch-1
...
temperature.cpp fixes for SD card and MAX6675
10 years ago
9887555192
Merge pull request #998 from darconeous/pull-requests/fwretract
...
FWRETRACT fixes
10 years ago
105571ec68
Merge pull request #1005 from midopple/Marlin_v1
...
With option DISABLE_INACTIVE_EXTRUDER the extruder is disable to early
10 years ago
68dd5e635e
Merge pull request #1024 from oliasmage/Marlin_v1
...
Adding Z Probe via sled mounted endstop
10 years ago
25069ed4e9
Merge pull request #1031 from Roxy-3DPrintBoard/Z_PROBE_REPEATABILITY-with-correct-Defaults
...
Z probe repeatability with correct defaults
10 years ago
75b3a68b65
Revert "Change pinMode to SET_INPUT or SET_OUTPUT"
...
This reverts commit 1d0fe035f3
10 years ago
e3c88a5120
Filament sensor changes to config file
...
Update the config file for improvements and clarifying what diameter to
use in the slicer software.
10 years ago
62db9848d3
Improvements and bug fixes in sensor delay buffer for filament sensor code
...
Improvement to avoid reinitializing delay buffer with every print. Fixed
issues in buffer indexing and memory out of bounds due to floating point
imprecision. Simplified the code by avoiding conversion to standard
diameter and 1cu mm extrusion, which caused complications in determining
mm extruded.
10 years ago
5908fd5cec
Fix reseting CHDK pin to LOW
...
chdkActive was set to false regardless of (millis() - chdkHigh) being bigger than the CHDK_DELAY or not. So if (millis() - chdkHigh) wasn't bigger than the delay the first time, the CHDK would never be set back to LOW.
Also, don't return from the function, as there might be other stuff to do, after the CHDK check.
10 years ago
0adbc79571
Fix Default Configuration so Auto Bed Leveling is off
...
This snapshot has the Auto Bed Leveling turned off because most Marlin
users do not have that feature.
10 years ago
0091865583
Z_PROBE_REPEATABILITY test
...
Z_PROBE_REPEATABILITY test for Auto Bed Leveling.
Implemented as M48 with extra user specified options.
Full support at
http://3dprintboard.com/showthread.php?2802-Auto_Bed_Leveling-Z-Probe-Repeatability-code
10 years ago
85649a4549
Real-time filament diameter measurement and control
...
This feature allows the printer to read the filament diameter
automatically and adjust the printer in real time. Added code to read
an analog voltage that represents a filament diameter measurement. This
measurement is delayed in a ring buffer to compensate for sensors that
are a distance away from the extruder. The measurement is used to
adjust the volumetric_multiplier for the extruder. Some additional g
codes (M404, M405, M406, M407) are used to set parameters and turn
on/off the control. g code M221 is updated. Pins for RAMPS1.4, RAMBO,
and Printrboard are identified for analog input. The configuration file
is updated with relevant user parameters.
10 years ago
1d0fe035f3
Change pinMode to SET_INPUT or SET_OUTPUT
...
Original code is using WRITE from fastio, but original used pinMode to
set pin direction and did not use the fastio SET_INPUT or SET_OUTPUT.
This caused an issue with the rotary encoder interface to boards based
on teensyduino, since for teensyduino pin numbers for fastio and the
usual Arduino IO are different.
10 years ago
e7707aedbc
Commented out new #defines in Configuration.h.
10 years ago
0a8dc0e96b
Added documentation to the README.md for the sled Z probe option. CAB
10 years ago
d2fcb3ee56
CAB: Added code for Z-probe with Z endstop mounted on a sled.
10 years ago
3cd7dbcc45
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
10 years ago
c13a831ea1
Merge pull request #1017 from foosel/fix/checksum_truncation_bug
...
Fix for a wrong checksum truncation for certain commands
10 years ago
2d22902d08
Fix for a wrong checksum truncation for certain commands
...
Positioning of string terminator to truncate checksum from the commands
M23, M28, M30, M32, M928 and M117 was off by one, causing the last
letter of the actual command to be truncated instead of just the
checksum.
In case of the SD commands this caused checksummed commands targeting
existing files to fail since the last letter of the filename was
truncated.
In case of M117 this caused the last given letter not to be displayed.
This patch fixes the off-by-one error and sets the null terminator
on the exact position of the * starting the checksum instead of the
character before that.
10 years ago
ad3b770c1a
updated examples
10 years ago
2f4a20257c
imported last Marlin changes
10 years ago
aacff0d361
Merge pull request #948 from Dim3nsioneer/Marlin_v1
...
Implementation of FW extruder change retract
10 years ago
17aa67e4ea
If the option DISABLE_INACTIVE_EXTRUDER ist active the extruder switch to early to inactive because there are some moves in the buffer. So the planner wait 32 moves to disable the unused extruder.
10 years ago
1fd9a7d476
Fix for FWRETRACT on DELTA printers.
...
Fixes #817
11 years ago
3f2c771d90
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
bcd039aa81
Update pins.h
11 years ago
82606354dd
Update temperature.cpp
...
Enables both SD card and MAX6675 to talk with each other
Fixes also issue #750
11 years ago
32a6451ad8
Add leapfrog and dual Y/Z
...
I have added the pin set for the leapfrog and the support of dual Y and Z
11 years ago
b5417be109
Update Configuration.h
...
Leapfrog added to the board list
11 years ago
f244045245
Update pins.h
...
Leapfrog board added to the pin list
11 years ago
2242a84218
Changed the declaration of the variable to Marlin_main.cpp to fix issue on commit #965
11 years ago
6e3406d228
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
43c298a7a9
Add "Thermal Runaway Protection" feature
...
This is a feature to protect your printer from burn up in flames if it
has a thermistor coming off place (this happened to a friend of mine
recently and motivated me writing this feature).
The issue: If a thermistor come off, it will read a lower temperature
than actual. The system will turn the heater on forever, burning up the
filament and anything
else around.
After the temperature reaches the target for the first time, this
feature will start measuring for how long the current temperature stays
below the target minus _HYSTERESIS (set_temperature -
THERMAL_RUNAWAY_PROTECTION_HYSTERESIS).
If it stays longer than _PERIOD, it means the thermistor temperature
cannot catch up with the target, so something *may be* wrong. Then, to
be on the safe side, the system will he halt.
Bear in mind the count down will just start AFTER the first time the
thermistor temperature is over the target, so you will have no problem
if your extruder heater takes 2 minutes to hit the target on heating.
11 years ago
d86c3cf43c
Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.
11 years ago
f0cab611db
optimised some math-code
11 years ago
269a068032
Fix lcd itostr3() to handle negative numbers
11 years ago
fae7d08698
fixed wrong compiler-option
11 years ago
512f2a3136
restore Branch from Backup
...
sorry for that
11 years ago
cd3220d055
Inverted state logic for forced_heating_stop variable
11 years ago
86b4b805d2
Fixed stop print LCD function on M104
11 years ago
6e6e4e2143
Added thermistor table for the 500C thermistor shipped with the Pico hot end.
11 years ago
9d11b70436
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
0de826160e
M30 response is missing linefeed, "ok" therefore not on own line
...
This leads to the command not being acknowledged properly
by the firmware, leading to consecutive issues in host software
waiting for an acknowledgement.
11 years ago
3c927901a4
Implementation of FW extruder change retract
...
FW retraction is extended onto swap retraction invoked by 'G10 S1'.
Bookkeeping of the retract state of all extruders allows for having one
extruder fw standard retracted while another extruder is swap retracted.
An LCD menu item for the swap retract and recover length was added.
11 years ago
8a32c5395b
renaming the disable inactive extruder feature
11 years ago
29e7639933
Add switch unused feeder(s) off
...
Having the non-active feeder motors powered on all the time is not
necessary. A feature to deactivate the unused feeder motors has been
implemented. The feature is enabled on default but can be switched off
in the configuration.
11 years ago
07c0eeee99
Fixed a comment in the planner
11 years ago
09b84faa00
Configuration.h, pins.h: Add MOTHERBOARD 84 for Teensy++2.0
11 years ago
efb6d61413
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
38192cb5f3
Add M112 description to Marlin_main
11 years ago
aed5ec008a
Merge pull request #851 from DanNixon/estop
...
Implemented M112
11 years ago
cfb98ef682
More coverity fixes
11 years ago
92e14298b0
Fixes typo for lcd backlighting on I2C PCF8575
...
When using LCD_I2C_TYPE_PCF8575T (like Sainsmart I2C), the backlight
won't come on; the incorrect ifdef blocks the evocation of the backlight
functions.
11 years ago
9db9842aea
Fixed error found by the free coverity tool ( https://scan.coverity.com/ )
...
===================================================
Hi,
Please find the latest report on new defect(s) introduced to ErikZalm/Marlin found with Coverity Scan.
Defect(s) Reported-by: Coverity Scan
Showing 15 of 15 defect(s)
** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
________________________________________________________________________________________________________
*** CID 59629: Unchecked return value (CHECKED_RETURN)
/Marlin_main.cpp: 2154 in process_commands()()
2148 }
2149 #endif
2150 }
2151 }
2152 break;
2153 case 85: // M85
CID 59629: Unchecked return value (CHECKED_RETURN)
Calling "code_seen" without checking return value (as is done elsewhere 66 out of 67 times).
2154 code_seen('S');
2155 max_inactive_time = code_value() * 1000;
2156 break;
2157 case 92: // M92
2158 for(int8_t i=0; i < NUM_AXIS; i++)
2159 {
________________________________________________________________________________________________________
*** CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/cores/arduino/Tone.cpp: 319 in tone(unsigned char, unsigned int, unsigned long)()
313 else
314 {
315 // two choices for the 16 bit timers: ck/1 or ck/64
316 ocr = F_CPU / frequency / 2 - 1;
317
318 prescalarbits = 0b001;
CID 59630: Operands don't affect result (CONSTANT_EXPRESSION_RESULT)
"ocr > 65535U" is always false regardless of the values of its operands. This occurs as the logical operand of if.
319 if (ocr > 0xffff)
320 {
321 ocr = F_CPU / frequency / 2 / 64 - 1;
322 prescalarbits = 0b011;
323 }
324
________________________________________________________________________________________________________
*** CID 59631: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1187 in process_commands()()
1181 case 2: // G2 - CW ARC
1182 if(Stopped == false) {
1183 get_arc_coordinates();
1184 prepare_arc_move(true);
1185 return;
1186 }
CID 59631: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
________________________________________________________________________________________________________
*** CID 59632: Missing break in switch (MISSING_BREAK)
/Marlin_main.cpp: 1193 in process_commands()()
1187 case 3: // G3 - CCW ARC
1188 if(Stopped == false) {
1189 get_arc_coordinates();
1190 prepare_arc_move(false);
1191 return;
1192 }
CID 59632: Missing break in switch (MISSING_BREAK)
The above case falls through to this one.
1193 case 4: // G4 dwell
1194 LCD_MESSAGEPGM(MSG_DWELL);
1195 codenum = 0;
1196 if(code_seen('P')) codenum = code_value(); // milliseconds to wait
1197 if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
1198
________________________________________________________________________________________________________
*** CID 59633: Out-of-bounds write (OVERRUN)
/temperature.cpp: 914 in disable_heater()()
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
913 target_temperature[1]=0;
CID 59633: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "1".
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
919
________________________________________________________________________________________________________
*** CID 59634: Out-of-bounds write (OVERRUN)
/temperature.cpp: 913 in disable_heater()()
907 #if defined(HEATER_0_PIN) && HEATER_0_PIN > -1
908 WRITE(HEATER_0_PIN,LOW);
909 #endif
910 #endif
911
912 #if defined(TEMP_1_PIN) && TEMP_1_PIN > -1
CID 59634: Out-of-bounds write (OVERRUN)
Overrunning array "target_temperature" of 1 2-byte elements at element index 1 (byte offset 2) using index "1".
913 target_temperature[1]=0;
914 soft_pwm[1]=0;
915 #if defined(HEATER_1_PIN) && HEATER_1_PIN > -1
916 WRITE(HEATER_1_PIN,LOW);
917 #endif
918 #endif
________________________________________________________________________________________________________
*** CID 59635: Out-of-bounds read (OVERRUN)
/temperature.cpp: 626 in analog2temp(int, unsigned char)()
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
CID 59635: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbllen_map" of 1 bytes at byte offset 1 using index "e" (which evaluates to 1).
626 for (i=1; i<heater_ttbllen_map[e]; i++)
627 {
628 if (PGM_RD_W((*tt)[i][0]) > raw)
629 {
630 celsius = PGM_RD_W((*tt)[i-1][1]) +
631 (raw - PGM_RD_W((*tt)[i-1][0])) *
________________________________________________________________________________________________________
*** CID 59636: Out-of-bounds read (OVERRUN)
/temperature.cpp: 620 in analog2temp(int, unsigned char)()
614 if (e == 0)
615 {
616 return 0.25 * raw;
617 }
618 #endif
619
CID 59636: Out-of-bounds read (OVERRUN)
Overrunning array "heater_ttbl_map" of 1 2-byte elements at element index 1 (byte offset 2) using index "e" (which evaluates to 1).
620 if(heater_ttbl_map[e] != NULL)
621 {
622 float celsius = 0;
623 uint8_t i;
624 short (*tt)[][2] = (short (*)[][2])(heater_ttbl_map[e]);
625
________________________________________________________________________________________________________
*** CID 59637: Out-of-bounds write (OVERRUN)
/temperature.cpp: 202 in PID_autotune(float, int, int)()
196 {
197 soft_pwm_bed = (MAX_BED_POWER)/2;
198 bias = d = (MAX_BED_POWER)/2;
199 }
200 else
201 {
CID 59637: Out-of-bounds write (OVERRUN)
Overrunning array "soft_pwm" of 1 bytes at byte offset 1 using index "extruder" (which evaluates to 1).
202 soft_pwm[extruder] = (PID_MAX)/2;
203 bias = d = (PID_MAX)/2;
204 }
205
206
207
________________________________________________________________________________________________________
*** CID 59638: Out-of-bounds read (OVERRUN)
/temperature.cpp: 214 in PID_autotune(float, int, int)()
208
209 for(;;) {
210
211 if(temp_meas_ready == true) { // temp sample ready
212 updateTemperaturesFromRawValues();
213
CID 59638: Out-of-bounds read (OVERRUN)
Overrunning array "current_temperature" of 1 4-byte elements at element index 1 (byte offset 4) using index "extruder" (which evaluates to 1).
214 input = (extruder<0)?current_temperature_bed:current_temperature[extruder];
215
216 max=max(max,input);
217 min=min(min,input);
218 if(heating == true && input > temp) {
219 if(millis() - t2 > 5000) {
________________________________________________________________________________________________________
*** CID 59639: Out-of-bounds write (OVERRUN)
/Marlin_main.cpp: 2278 in process_commands()()
2272 tmp_extruder = code_value();
2273 if(tmp_extruder >= EXTRUDERS) {
2274 SERIAL_ECHO_START;
2275 SERIAL_ECHO(MSG_M200_INVALID_EXTRUDER);
2276 }
2277 }
CID 59639: Out-of-bounds write (OVERRUN)
Overrunning array "volumetric_multiplier" of 1 4-byte elements at element index 1 (byte offset 4) using index "tmp_extruder" (which evaluates to 1).
2278 volumetric_multiplier[tmp_extruder] = 1 / area;
2279 }
2280 break;
2281 case 201: // M201
2282 for(int8_t i=0; i < NUM_AXIS; i++)
2283 {
________________________________________________________________________________________________________
*** CID 59640: Out-of-bounds read (OVERRUN)
/Marlin_main.cpp: 1802 in process_commands()()
1796 int pin_status = code_value();
1797 int pin_number = LED_PIN;
1798 if (code_seen('P') && pin_status >= 0 && pin_status <= 255)
1799 pin_number = code_value();
1800 for(int8_t i = 0; i < (int8_t)sizeof(sensitive_pins); i++)
1801 {
CID 59640: Out-of-bounds read (OVERRUN)
Overrunning array "sensitive_pins" of 28 2-byte elements at element index 55 (byte offset 110) using index "i" (which evaluates to 55).
1802 if (sensitive_pins[i] == pin_number)
1803 {
1804 pin_number = -1;
1805 break;
1806 }
1807 }
________________________________________________________________________________________________________
*** CID 59641: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 51 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59641: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
51 }
52
53 void LiquidCrystal::init(uint8_t fourbitmode, uint8_t rs, uint8_t rw, uint8_t enable,
54 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
55 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
56 {
________________________________________________________________________________________________________
*** CID 59642: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 45 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
39 }
40
41 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
42 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
43 {
44 init(1, rs, rw, enable, d0, d1, d2, d3, 0, 0, 0, 0);
CID 59642: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
45 }
46
47 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
48 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3)
49 {
50 init(1, rs, 255, enable, d0, d1, d2, d3, 0, 0, 0, 0);
________________________________________________________________________________________________________
*** CID 59643: Uninitialized scalar field (UNINIT_CTOR)
/Applications/Arduino.app/Contents/Resources/Java/libraries/LiquidCrystal/LiquidCrystal.cpp: 32 in LiquidCrystal::LiquidCrystal(unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char)()
26
27 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t rw, uint8_t enable,
28 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
29 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
30 {
31 init(0, rs, rw, enable, d0, d1, d2, d3, d4, d5, d6, d7);
CID 59643: Uninitialized scalar field (UNINIT_CTOR)
Non-static class member "_initialized" is not initialized in this constructor nor in any functions that it calls.
32 }
33
34 LiquidCrystal::LiquidCrystal(uint8_t rs, uint8_t enable,
35 uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
36 uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
37 {
________________________________________________________________________________________________________
To view the defects in Coverity Scan visit, http://scan.coverity.com/projects/2224?tab=overview
11 years ago
e541323741
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
1c9a70cee9
Support for Gen3 Monolithic electronics
...
Techzone Monotronics support, ignoring the tip manager and using fan connector as on Sprinter FW
TODO: Add support for tipmanager
11 years ago
2acd3792fc
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
11 years ago
8b4c4aa5c3
Add feature to check&retry CRC read errors on SD.
11 years ago
ce76843dc3
Merge pull request #897 from Makible/5DPrint_D8_Board_Support
...
5DPrint D8 Controller Board Support
11 years ago
ad5c8cbba9
Add safety limit for hot bed power in example configuration
11 years ago
6460709d92
Fix bug in PID Autotune report
11 years ago
105bebb466
Fix for pin mapping for SDSS pin and Fan pin, so Arduino library can be used
11 years ago
97ead2eccb
Fix for microstepping pin mapping, not using Teensy pin mapping, but Arduino's default pin mapping so Arduino library can be used
11 years ago
d85411f13a
Revert "Fix for stepper microstepping"
...
This reverts commit eea3ba5588
11 years ago
7c7f2d094e
Revert "Fix for reading microstepping resolution"
...
This reverts commit 2715f6ddbf
11 years ago
e2d703377a
Enable EEPROM by default for 5DPrint D8 Controller Board in example configuration
11 years ago
2715f6ddbf
Fix for reading microstepping resolution
11 years ago
39e9b133f3
Add example configuration for Makibox printer, which uses the 5DPrint D8 Driver Board
11 years ago
da6b536182
Add 5DPrint D8 Driver Board info and temperature table for Makibox hot bed
11 years ago
3a8e36f19e
Add Digipot config for 5DPrint D8 Driver Board
11 years ago
eea3ba5588
Fix for stepper microstepping
11 years ago
1cbcbb0971
Add makibox machine information
11 years ago
2fa514e88a
Add port for 5DPrint D8 Driver board
11 years ago
b9126ab497
Merge pull request #894 from MyMakibox/Marlin_v1
...
Update Marlin_main.cpp
11 years ago
21ec6b88c3
Update Marlin_main.cpp
...
Added description of autotemp flags to M109
11 years ago
e4dc80d3d3
Update Configuration_adv.h
...
Corrected error in AUTOTEMP instructions
11 years ago
6adbdf42e0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
27d544ac25
Speed up QUICK_HOME feedrate for diagonal move
...
Speed up the diagonal move while still keeping each individual axis at
or below its homing feedrate.
11 years ago
013793bbe9
Merge pull request #878 from koldoartola/Marlin_v1
...
Added new language (Basque-Euskera)
11 years ago
e5b70237c7
Added new language (Basque-Euskera)
...
Added:
* new language (Basque-Euskera)
* some minor corrections for Spanish
* added 2 new constants for every language (required for a minor change
I am preparing to ultralcd.cpp)
11 years ago
ed6f4a71c5
fix wrong temptable index
11 years ago
3161740df9
This table is made for thermistor 3950 (can be found on ebay for cheap)
...
it's caracteristics are :
R25℃ ;100KΩ±1%
B Value(R25/50℃)：3990K 1%
Dissipation Factor(mW/℃)：1.1~1.6 In still Air
Thermal Time Constant(S)：10~17 In Still Air
Operating temperature range： (-50~+260°C)
Dimension： 1.8mm Dia X4.1mm
Lead Length ：30mm
This table was found on the following blogs:
http://cae2100.wordpress.com/2014/03/08/beta3950-thermistor-table-for-marlin/
and
http://microfabricator.com/articles/view/id/531ad7e59aad9d3131000000/beta-3950-thermistor-table-for-marlin
11 years ago
086ff1644f
Merge pull request #852 from pixatintes/patch-1
...
Update language.h
11 years ago
3ffc9651b1
Merge pull request #845 from DerSchultze/Sanguinololu-servo
...
Added servo pin assignments to Sanguinololu
11 years ago
357b87b498
Merge pull request #826 from paciotti/patch-1
...
Configuration_adv.h
11 years ago
95ad6ec9a1
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
27a7cf9fcf
use existing strings
11 years ago
d3f305332a
Allowable range now includes default value
11 years ago
b0aeac117f
Adjustable Z probe offset, via custom M-code
11 years ago
73b380d8d2
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
c23376f2e7
Merge pull request #837 from whosawhatsis/fwretract
...
FWRETRACT in mm/s
11 years ago
dfb98101e4
Change CONTROLLERFAN_PIN for board 35 to -1, as it would conflict with board's 33 extruder pin, causing burnout (it's the same board, just different number of fans/extruders, therefore should be pin-compatible)
11 years ago
f1501317ca
Merge pull request #860 from drf5n/therm3950
...
thermistortables.h: Add comments that table 60 uses beta=3950.
11 years ago
9a5d23d96f
Merge pull request #866 from sakunamary/Marlin_v1
...
fix bug for dual extruders not working
11 years ago
303ee67896
Merge pull request #864 from whosawhatsis/M200
...
fix bug in M200 with multiple extruders
11 years ago
8759508319
fix bug for dual extruders not working
...
some guy find that marlin not working good for dual extruders delta .
when type T0 or T1 to active extruder and E0 or E1 move causing XYZ
motion . so i locales the bugs and fix it , I have dry run the fix.
11 years ago
a65564eef6
fix bug in M200 with multiple extruders
11 years ago
aeaf9b9312
fix bug in M200 with multiple extruders
11 years ago
89f78b0b80
Allow use of either SD Card slot when LCD Panel is configured.
...
Preference is for Controller SD slot before LCD Panel slot when both are occupied.
11 years ago
b0093a1513
thermistortables.h: Add comments that table 60 uses beta=3950.
11 years ago
a3530d1141
Update language.h
...
Updated to latest version.
11 years ago
990e770e15
Update language.h
...
Added catalan language
11 years ago
f643f4d674
Test and refactor
11 years ago
bbe8fbe13d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
c8cdd1fc6f
Bugfixes for language option 6 (russian)
11 years ago
7395dafc1e
semantic changes in language.h
11 years ago
fad2a60ce6
Corrections for preheat extension in language.h
11 years ago
eecda434fb
Sanguinololu servo pins set default disabled
11 years ago
944ced87c5
Extended Preheat options
...
Preheat LCD menus base on code by D-Base
11 years ago
06709ad60e
Added servo pin assignments to Sanguinololu
11 years ago
3906f27c46
Individual extruder flow rate
...
Extension of M221, Tune menu
11 years ago
a38c90ee84
Added estop handling
11 years ago
a00cec8b71
Merge pull request #833 from mattsch/optional_feedrate_multiplier
...
Add support for disabling encoder control for feedrate multiplier
11 years ago
af8be9013b
Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1
11 years ago
0ddee3c7db
Prevent SD card insertion from causing a hang when using LiquidTWI2 device detection
11 years ago
272072fa20
Added M112
11 years ago
aab61e63c3
FWRETRACT in mm/s
...
Firmware retraction now stores the retract and recover speeds in mm/s
instead of mm/min. This makes it match the units of the maximum
feedrate, and fixes problems with modifying the value via LCD control
panel. From gcode, the values are still taken in mm/min to match the
units of G1 and similar, and they are converted to mm/s before they are
stored.
I also lowered the default retract feedrate to make it less likely to
cause problems for geared extruders when the user hasn’t bothered to
set a reasonable maximum feedrate, though users should be setting both
of these values to suit their hardware.
11 years ago
6cd85e6008
Add support for disabling encoder control for feedrate multiplier
...
Signed-off-by: Matthew Schick <matthew.schick@gmail.com>
11 years ago
09af1b90b8
Added CHDK support
...
Added CHDK support to take pictures instead of doing an IR command, see more about how to use it here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
11 years ago
765b2da3d4
Added CHDK support
...
Added so M240 can be used to trigger CHDK instead of sending an IR signal, see more about CHDK here http://captain-slow.dk/2014/03/09/3d-printing-timelapses/
11 years ago
881e348eed
Update Configuration_adv.h
...
Increase Z_HOME_RETRACT_MM to 2mm default to avoid end stop not switching during retract.
11 years ago
5a332df47e
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
15d1b8d719
Fixed finnish translation
...
- Fixed Few finnish transalations
- Removed duplicate contrast define
11 years ago
7325d7102e
Activate LiquidTWI2 device detection and space-pad LCD status line.
11 years ago
7f76a0e064
Merge pull request #813 from drf5n/PID_DEBUG
...
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
fcd8524b6e
Only increase EEPROM version for DELTA printers.
11 years ago
8ea5665ee2
Merge remote-tracking branch 'origin/Marlin_v1' into add/M665-set-delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
8c4377dd63
temperature.cpp: Fix PID_DEBUG compile error.
11 years ago
fde8c2c310
Merge pull request #807 from Cylindric3D/typofixes_upstream5
...
Various typo fixes #5 - only in comments, no code changes.
11 years ago
fdce91192e
Various typo fixes - only in comments, no code changes.
11 years ago
d819c55395
Various typo fixes - only in comments, no code changes.
11 years ago
fd4542f33a
Merge pull request #805 from whosawhatsis/M200
...
autretract fix
11 years ago
e8291ed728
Merge pull request #802 from Makers-Tool-Works/Marlin_v1
...
Clarify which PID values to enter
11 years ago
465b654d24
Merge pull request #797 from Cylindric3D/update_menu_plan
...
Update menu plan
11 years ago
88506a80c3
Merge pull request #789 from smiler/Marlin_v1
...
Fixed typo.
11 years ago
b514d3c87f
Merge pull request #781 from Cylindric3D/typofixes_upstream
...
Various typo fixes #3 - only in comments, no code changes.
11 years ago
77df0d689a
autretract fix
...
I made these changes previously, but I can’t find the commit now. This
reapplies the changes to get auto retract working again.
Conflicts:
Marlin/Configuration_adv.h
Marlin/Marlin_main.cpp
11 years ago
cc5f1d475c
Merge pull request #772 from ellensp/Marlin_v1
...
Updated gen3+ board pins names to current convention
11 years ago
91759dede6
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
557217fc05
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
11 years ago
aee63afccd
Clarify which PID values to enter
...
Users can be confused as to which values to enter after a PID tune. Updating the message to help clarity it.
New message: "PID Autotune finished! Put the last Kp, Ki and Kd constants from above into Configuration.h"
Old message: "PID Autotune finished! Put the Kp, Ki and Kd constants into Configuration.h"
11 years ago
99f6326544
Remove unnecessary dependency on time.h from qr_solve.cpp
...
Fixed compiler errors on Ubuntu using arduino-core
11 years ago
ea669cb504
Fix some extra and some missing tabs, to make the file consistent.
11 years ago
b46a1b6360
Update the menu plan document with the current menu as per ultralcd.cpp.
11 years ago
3cc7626d1f
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
11 years ago
174b8d99d5
Simplify 3-point probing using new code only
11 years ago
3b718b816c
better documentation
11 years ago
34fd59c370
ABL at any points
11 years ago
541155ea87
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
9fa328e5c8
Merge pull request #793 from MissionSt/use_axis_enums
...
Use constants instead of numeric literals
11 years ago
f308a8af91
update comment
11 years ago
357e31270a
Prevent G29 without first homing in X and Y
...
If position is unknown, then G29 can be dangerous.
11 years ago
d2d7d186b5
Use descriptive constants, more
11 years ago
2ccdf4f36d
Use descriptive constants instead of numeric literals
11 years ago
c00383f286
Fixed typo.
11 years ago
60f72a78a9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
abba7a0003
Merge pull request #782 from marcovannoord/Marlin_v1
...
Added dutch to language.h
11 years ago
b868d668fa
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into typofixes_upstream
11 years ago
8212d8d543
Revert "Fixed small typo that would prevent compiling"
...
This reverts commit 51ae4881ab
11 years ago
46bae30573
Merge pull request #776 from whosawhatsis/fwretract
...
Fwretract fixes, cleanup
11 years ago
51ae4881ab
Fixed small typo that would prevent compiling
11 years ago
498d76fd79
Fixed some messages where the text shown on the screen was more than 17 characters
11 years ago
af9395ac2e
Add M605 to dynamically set delta configuration
...
Save above configs in eeprom
fix docs in createTemperatureLookupMarlin.py
add missing azteegX3pro digipot settings in delta example config
11 years ago
fd42f0d226
Merge pull request #783 from MissionSt/fix/syntax-error
...
Fix compile error
11 years ago
96217bf36a
Merge pull request #777 from PxT/M114
...
Add whitespace to M114 output
11 years ago
cf5c3b6610
Added dutch to language.h
11 years ago
d1c64b9dc4
Fix syntax error introduced in 477b6fa1d
11 years ago
5d50819791
Various typo fixes - only in comments, no code changes.
11 years ago
3f455889d0
Merge pull request #769 from Cylindric3D/typofixes_1
...
Various typo fixes - only in comments, no code changes.
11 years ago
4ddedb3b27
Merge pull request #780 from Cylindric3D/typofixes_2
...
Various typo fixes #2 - only in comments, no code changes.
11 years ago
d4ba23bc28
Merge pull request #770 from josefpavlik/Marlin_v1
...
Marlin v1
11 years ago
bbb424bd2f
Merge pull request #779 from MissionSt/makefile-fix-abl
...
Makefile fixes
11 years ago
8f0cee2a14
Various typo fixes - only in comments, no code changes.
11 years ago
08263ae66e
Merge branch 'Marlin_v1' into typofixes_1
11 years ago
5bd09d26e2
Makefile works with auto bed leveling
11 years ago
b45beeffd6
typo fix in Makefile
11 years ago
306588925d
Add whitespace to M114 output
11 years ago
c43838bb1e
disable auto retract by default
...
This should make it safe to enable FWRETRACT by default, with
autoretract (which should now be fixed) only enabled by M209. FWRETRACT
should probably now default to enabled (to make G10/G11 and M207-209
available, without changing functionality when they are not used), but
I’ll save that for another pull request/discussion.
11 years ago
99f0e44864
Move FWRETRACT defaults to configuration_adv.h
11 years ago
66e3869138
Fix autoretract
...
This takes the (now working) G10/G11 code and moves it to a function,
which is called by G10 and G11, and also called by G1 if autoretract is
enabled and a retract/recover move is detected.
11 years ago
2f2459c0db
Fix G10/G11 Z-lift
11 years ago
8c5675c290
Use language.h instead of English literals for "bed"
11 years ago
0f7393a13e
Refactor 'accurate' auto bed leveling to use probe_pt()
11 years ago
c4fbb44d6d
Refactor 3-point auto bed leveling to use probe_pt()
11 years ago
ad2c6488c7
Add probe_pt(), useful for auto bed leveling
11 years ago
c9c83a4560
Updated gen3+ board pins names to current convention
11 years ago
ab0d3c4fb3
Various typo fixes - only in comments, no code changes.
11 years ago
477b6fa1df
move engaged from lcd console refreshes power off timeout
11 years ago
831fc2a952
Pt100 and Pt1000 temperature sensors handling
11 years ago
7dcd350941
A few changes to Russian, changed LCD strings to be <=17 characters.
11 years ago
c31bb2b7ad
Only show the ZProbe offset when auto-bed-leveling is enabled.
11 years ago
46f5bea19f
Add configurable beep for UltiPanel.
11 years ago
d16a770855
Ultimainboard 2.x does not has a PS_ON pin.
11 years ago
71bb3a8133
Add comments for Ultimainboard 2.0 configuration.
11 years ago
9b7d87e885
Remove duplicate contrast define.
11 years ago
816f0a678a
Merge pull request #768 from whosawhatsis/Marlin_v1
...
multiple FWretract fixes
11 years ago
6e43398509
G10/G11 bugfixes
...
Previous version was broken by using G92 E0 between retract and recover.
11 years ago
d6c5c503d4
correct feedrate units in comments for M207/M208
11 years ago
15d6116188
Merge pull request #689 from cajun-rat/tidy
...
Use C++ initialization list
11 years ago
0b9ecf3824
Language cleanup, part 1.
11 years ago
b5ba5c1465
Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1
11 years ago
78e7654601
Keep FWRETRACT values in terms of millimeters when using M200
...
for volumetric E units
11 years ago
3f6d44d40b
Keep FWRETRACT values in terms of millimeters when using M200 for volumetric E units
11 years ago
363dc2f0e8
Merge branch 'Marlin_v1' into update_menu_plan
11 years ago
5f797ca29f
Updated Polish, changed default firmware URL to Marlin.
11 years ago
0778f5f028
Add missing entries to the new Aragonian language.
11 years ago
54bab3e0d0
Merge branch 'Marlin_v1' into localisation
...
Conflicts:
Marlin/language.h
11 years ago
bdd0211aeb
Move strings in ultralcd.cpp into language.h.
11 years ago
c8e5a82d49
keep English as default lang.
11 years ago
f64592e362
Add Aragonese translation
11 years ago
ac74f45dc0
Merge pull request #752 from MatixYo/patch-3
...
Update language.h
11 years ago
36086d3ca4
Update language.h
...
Updated Polish translations.
11 years ago
1781031f2d
Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h.
11 years ago
d485988bec
fix typo
11 years ago
8a1fd25363
Default is to not define digipot_i2c
11 years ago
5097c57d3a
Added pins for Azteeg X3 Pro under motherboard 68
11 years ago
b819fc53ca
Add Azteeg X3 Pro as motherboard 68
...
Add digipot i2c control for MCP4451
Allow M907 to set i2c digipot currents in amps
Fix Makefile to allow Azteeg motherboards
Fix Makefile to allow Wire libraries only
Add beeper pin for Azteeg X3 Pro
11 years ago
e1ae7952eb
Merge pull request #743 from Opticalworm/Marlin_v1
...
Improved support for panelolu2 encoder and buzzer
11 years ago
a5f53f0cf3
Heater wattage reporting for M105 using EXTRUDER_WATTS and BED_WATTS
11 years ago
8d162e5bd7
Improved support for panelolu2 encoder and buzzer
...
I added #define for LCD_FEEDBACK_FREQUENCY_HZ and
LCD_FEEDBACK_FREQUENCY_DURATION_MS which is used to alter the default
buzzer sound.
When selecting Panelolu2 in configuration.h:
- it automatically sets the correct ENCODER_PULSES_PER_STEP and
ENCODER_STEPS_PER_MENU_ITEM.
- if LCD_USE_I2C_BUZZER is defined it will also set the default
LCD_FEEDBACK_FREQUENCY_HZ and LCD_FEEDBACK_FREQUENCY_DURATION_MS
When selecting the sanguinololu 1284p the following is true:
- its now enables LARGE_FLASH
- It enables the gcode M300 when the panelolu2 LCD_USE_I2C_BUZZER is
defined
11 years ago
b2c11ba980
Change diameter code to 'D'
...
For some reason that I can’t figure out, the decimal is dropped when
using ’S’ for the code.
Also some minor code improvements to M200.
11 years ago
61059385a3
Merge pull request #737 from whosawhatsis/M200
...
M200 implementation
11 years ago
856edfcc0d
Fixed math
...
This is why I wanted to sleep on the code I wrote while falling asleep
rather than immediately submitting a pull request.
11 years ago
0d81ae77bc
Merge pull request #727 from drf5n/oversampling
...
temperature.cpp: Actually use OVERSAMPLENR in the oversampling calculation.
11 years ago
84df13f7d1
Merge pull request #721 from drf5n/lcdOnly
...
Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago
4c7e9502ad
Merge pull request #718 from drf5n/temptableRes
...
createTemperatureLookupMarlin.py: Add resolution comments and format for...
11 years ago
652a0f6b5a
Merge pull request #717 from drf5n/tpins2
...
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/...
11 years ago
96a0cdc541
Merge pull request #716 from drf5n/maketeensy
...
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HAR...
11 years ago
d24df7af2c
M200 implementation
11 years ago
f0b8d5ba3d
createTemperatureLookupMarlin.py: Change comment to refer to actual program name.
11 years ago
50f44d9249
createTemperatureLookupMarlin.py: Truncate to short after application of OVERSAMPLENR for improved resolution.
11 years ago
f5b5dd8038
createTemperatureLookupMarlin.py: Add output of Steinhart-Hart coefficients.
11 years ago
76cf07c3f7
Configuration.h: Use OVERSAMPLENR in dT_PID definition.
11 years ago
476c7193d8
temperature.cpp: Use OVERSAMPLENR in oversampling calculation.
11 years ago
f08bb8bb6a
Previous commit borked.
11 years ago
b1f8f492c6
Remove previous_millis_cmd update from extruder runout prevention code
...
This seems to defeat the purpose of previous_millis_cmd, preventing the
time elapsed from previous_millis_cmd from ever reaching
max_inactive_time or stepper_inactive_time while the heat was on.
11 years ago
8a5eaa3c9b
Fix crash after home bug
...
Fixes a bug in the Extruder Runout Prevention feature that caused the
extruder to move back to “current_position” after a move if it was
activated while the move was in progress. For long home moves (which
are longer than the dimensions of the machine’s working area), this
would cause the machine to crash into the far end of its travel after
homing. This usually occurred on the Z axis, which could result in
damage to the machine if you don’t hit the reset button in time.
11 years ago
61a7256d42
Enable basic ULTRA_LCD screen w/o encoders and menus.
11 years ago
fdac8f6cec
Update ConfigurationStore.cpp
...
Unable to compile if ENABLE_AUTO_BED_LEVELING is not set (not set by default).
11 years ago
05932e4458
Add Z Probe Offset to EEPROM and Ultra LCD
11 years ago
7216583b8b
createTemperatureLookupMarlin.py: Add resolution comments and format for Marlin.
11 years ago
e8e0697e48
fastio.h: Add AT90USBxx_TEENSYPP_ASSIGNMENTS for teensyduino/Lincomatic/Printrboard compatibility.
11 years ago
75f39fadfc
Makefile: Update for Arduino 1.0.5 and Teensyduino dependent boards (HARDWARE_MOTHERBOARD=={8,81,82,83,84})
11 years ago
df194f75e1
Added PT100 support for Ultiboard2
11 years ago
380144c20f
Add Ultiboard2 electronics. With PWM current settings. For the few people that have this new board as experiment in their UM-Original.
11 years ago
6ae7f7870d
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into ErikZalm
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
11 years ago
17d6d965dc
Use C++ initialization list
...
This is the recommended approach for object initialization. The change
doesn't affect binary size (although in theory it could make it smaller).
11 years ago
ce8b9c4fc5
Correct missing parameter from last upmerge
...
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
11 years ago
8e48e24c7f
Update Delta example files
...
Signed-off-by: Joseivaldo Benito Junior <jrbenito@benito.qsl.br>
11 years ago
46d2443c7d
Merge pull request #676 from IVI053/Marlin_v1
...
Minor improvements for encoder configuration, LCD entry for PSU controll and thermistor pins on RAMPS
11 years ago
eed053dffb
Revert "Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs"
...
This reverts commit b7eadb9f37
11 years ago
8349fc89a4
Fixed planner bug
11 years ago
da2a6f9a31
Accurate bed leveling: x loop inside y and zigzag motion
11 years ago
d29615dc0c
Z and Y dual stepper drivers error
...
if you try to enable Z_DUAL_STEPPER_DRIVERS the error "You cannot have dual drivers for both Y and Z" shows even if you don't have defined Y_DUAL_STEPPER_DRIVERS and don't let you compile the firmware
to solve this problem i change this line:
#ifdef Z_DUAL_STEPPER_DRIVERS && Y_DUAL_STEPPER_DRIVERS
to:
#if defined (Z_DUAL_STEPPER_DRIVERS) && defined (Y_DUAL_STEPPER_DRIVERS)
now the error only show if you define both Z_DUAL_STEPPER_DRIVERS and Y_DUAL_STEPPER_DRIVERS
11 years ago
5bde7fcb28
Minor code and comment polishing
11 years ago
20faff5935
Incorporate PS_DEFAULT_OFF for starting state on LCD menu entry
11 years ago
e5d3044801
Added posibility to set ENCODER_STEPS_PER_MENU_ITEM in Configuration.h like ENCODER_PULSES_PER_STEP as it depends on it for usability
11 years ago
b7eadb9f37
Made numbering of heat bed thermistor more logical as D8 is bed, D9 is Extruder 2 and D10 is Extruder 1, so T0 should be E1, T1 E1 and T2 bed to be sequential as MOSFET-Outputs
11 years ago
e8786bf110
Added support for Cheaptronic v1 electronic
11 years ago
cc2925b705
Implemented a least squares fit of the bed equation for auto bed leveling.
...
The code for the LSQ solver (qr_solve) is copyrighted by John Burkardt and released under LGPL here:
http://people.sc.fsu.edu/~%20jburkardt/c_src/qr_solve/qr_solve.html
(see qr_solve.cpp for further copyright information)
11 years ago
b64661070e
Fixed the plane vector equation to a simpler one (only dependent on the normal)
...
Removed the calculation of the inverse matrix since the rotation matrix is orthogonal, therefore inverted == transposed.
Much simpler and mathematically robust.
11 years ago
5c44f6c434
Bed Heater monitoring in Controller Fan
...
In some cases the Bed Heater FET heats up more then stepper drivers, so
this change add the bed monitoring to the controller fan. As soon as the
bed heater is turned on, the controller fan will run as well.
11 years ago
b33375d438
Z Axis Safe Homing when using Z Probe
...
Recommended for those who are using the Z Probe for Z Homing (as
Z-Endstop)
This feature has two changes:
1) Allow user to choose where the Z Probe will touch the bed when homing
all axis together (G28) by setting below defines:
Z_SAFE_HOMING_X_POINT
Z_SAFE_HOMING_Y_POINT
2) Prevents the user to perform Z Axis Homing when the Z Probe is
outsite bed.
11 years ago
35905ea4f9
Allow heaters to stay full On when PWM=127
...
In previous version, even with PWM = 127, the system turns the FET off
and then on in the next cycle. This bevavior may increase the FET heat
dissipation.
It was fixed keeping the FET always On when PWM=127.
11 years ago
a94e588765
Changed slow buttons behavior.
11 years ago
69af392554
Added HEATERS_PARALLEL (Request from reifsnyderb)
...
This allows a hot end with two heaters and a FET for each heater. This is useful if the FET is not capable of heating two heaters.
11 years ago
48a185d004
Fixed compile errors from bad commits.
11 years ago
24d1f480b6
Merge pull request #647 from shaggythesheep/newfeature-M226
...
Implement M226 - GCode Initiated Pause
11 years ago
95b41413e6
Merge pull request #641 from hugokernel/master
...
M80 - ATX Power On related modification
11 years ago
59b96e323e
Merge pull request #640 from fmalpartida/SAV-MkI
...
Added support for BT on AT90USB devices, corrected LCD bug, added new board and LCD
11 years ago
2433ee6fc8
Merge pull request #637 from justuswilhelm/Marlin_v1
...
Fix servo control for Melzi v2.0
11 years ago
3455a2bac2
Merge pull request #636 from PrintToPeer/Marlin_v1
...
Add UUID support to M115 responses.
11 years ago
dc887ef99b
Implement M226 - GCode Initiated Pause
...
Implemented M226 as described here:
http://reprap.org/wiki/G-code#M226:_Gcode_Initiated_Pause
Waits for pin to be become either HIGH, LOW or the inverse of what it
was before. Allows printing to pause until user interaction
11 years ago
c244eb860c
If you have a switch on suicide pin, this is useful if you want to
...
start another print with suicide feature after a print without
suicide...
11 years ago
7b556d2e96
Added BT support on AT90USB devices
...
Added AT90USB device BT connectivity support using second UART.
11 years ago
a5e8575829
Add UUID support to M115 responses.
11 years ago
cab84e0e5b
Add (correct) missing pin definitions for Y2
...
I tested this and it works.
11 years ago
5b3f60ea2e
Corrected LCD only error
...
If only an LCD is defined and no menu or keyboard defined, there is a
compilation error.
Added conditional compilation.
11 years ago
62d0b79023
Fix servo control for Melzi
11 years ago
b5a964fcc5
Initial SAV MkI (RepRap CloneWars board) integration.
...
Included support for BT dongle on AT90USB boards.
Added LCD Shift Register LCD control
Included support for RepRap Clone Wars project board (SAV MKI).
11 years ago
f941203172
PS_ON configurable boot state
...
Allows the user to select wheter or not the PSU should be turned on or
kept in standby when marlin boots
11 years ago
c79e3967b3
Make G11 not horribly broken
11 years ago
d69822ed51
Fix '#'
...
since it can occure in comments.
11 years ago
2fb2a0a119
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
39d88bcccb
preparation for hibernation
...
If a print is stopped, it would be nice in the future to write a file with the printer state, the filename of the print, and the position within the print.
this file could be read, to continue a previously stopped print.
not finished yet.
11 years ago
ab965376ff
Sub-file calls.
...
by overloading M32 it is now possible to execute gcode files from other gcode files, with a fixed recursion level.
This can be used e.g. for having a real start.g and end.g somewhere on the sd card, which are then called from the normal print file.
Another usecase would be to have macro-files for nozzle-change and layerchange.
I have not tested the speedwise performance. The testing was done with pronterface.
syntax:
normal call from sd card will open the new file and continue executing there.
M32 !/path/filename#
this however will call the new file and return to the caller file.
M32 P !/path/filename#
with the optional "S<position>" the file starting position can be set.
this is for continuing prints from a previous location.
11 years ago
b2cc27e5ea
Added a magic character for sd buffering.
...
if a '#' is read now the buffer will be emptied before reading ahead.
This is so one can execute files from within gcode files, without messing the buffer with preread characters from the caller file.
# can not occure in sd files imho, because it should only occure within checksums in ther serial communication.
Yes, thats a lame argument. If you have a better idea please tell me. It has to be a character that one can type
on a keyboard manually.
11 years ago
8a08cca0f2
Added temperature status less.
...
Hopefully fixed viky button handling without braking other boards
11 years ago
667d278f54
Revert "Fix for Viki display"
...
This reverts commit 314fd13c39
11 years ago
bf27e79e74
Small BlinkM fix
11 years ago
87e28c0599
Added ifdefs to blinkm
11 years ago
24c6b2ab35
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
11 years ago
6a803ba9c5
Merge pull request #590 from timkoster/Marlin_v1
...
Added BlinkM support over i2c
11 years ago
457d8a0acb
Fixed merge conflicts
11 years ago
6f85a8c7aa
Bed auto Leveling change: Raise Z before homing
...
- Added "Z_RAISE_BEFORE_HOMING" for raising Z the defined distance
before homing. This is useful to avoid Z-Probe collision when hotend is
near bed.
- Fixed the issue of Z not going bellow Z_PROBE_OFFSET when
"min_software_endstops" is true.
Now the Z_PROBE_OFFSET is not set in Z_MIN_POS, it is added after
homing.
11 years ago
dd3086d3f2
Show Temperature ADC values
...
If "SHOW_TEMP_ADC_VALUES" is defined in Configuration_adv.h, the M105
command will present, after tradicional temperatures, the ADC value read
from temp sensors. This is great for adjusting thermistor tables with
thermocouple.
From Pronterface you can see the ADC value and compare with a
thermocouple reading.. then you just need to create your own thermistor
table.
Since this merge doesnt change the original information, it doesnt mess
with PC software parsing (tested under Pronterface and Repetier-Host).
11 years ago
7fad13a1e2
Reverse SD card file name order.
...
This is _not_ automatically the cronological, since deleting a file will free
the filesystem descriptor for it, which then will be used by the next file copied on it.
Since this makes the auto0.g file very inaccessible, I put the option back, to have it in the prepare menu.
this should satisfy https://github.com/ErikZalm/Marlin/pull/373
as a reminder, auto0.g will be executed every time after a boot with sd card present and file present.
thereafter, if there is a file auto1.g this will be done. Thats IMHO the best place to put settings, and prepare heating.
I also execute again after each (now again via the prepare menu) before starting a new print/ after a failed one.
It for me 100% replaces any start.gcode form the slicers.
11 years ago
b832f5b9f6
added delta tower babystepping. Its untested, but hopefully florian horsch will be able to try.
...
also, removed some trouble for compilation with corexy.
I think that babystepping is only possible in z for a delta tower.
not sure if it would be usefull to step individual motors on a delta, i don't own one
11 years ago
c38b0855c8
I think that filament change is ready for the masses. I have tested very often with my ultimaker.
...
I strongly vote for it being a single gcode, because otherwise the triggering from the menu is terrible.
11 years ago
d147a057ac
Add the socalled "Babystepping" feature.
...
It is a realtime control over the head position via the LCD menu system that works _while_ printing.
Using it, one can e.g. tune the z-position in realtime, while printing the first layer.
Also, lost steps can be manually added/removed, but thats not the prime feature.
Stuff is placed into the Tune->Babystep *
It is not possible to have realtime control via gcode sending due to the buffering, so I did not include a gcode yet. However, it could be added, but it movements will not be realtime then.
Historically, a very similar thing was implemented for the "Kaamermaker" project, while Joris was babysitting his offspring, hence the name.
say goodby to fuddling around with the z-axis.
11 years ago
bca353cc12
Fixed duplicate define in fastio.h
11 years ago
253dfc4bc1
Bed Auto Leveling feature
...
Check the Readme for instruction how to enable and configure the feature
11 years ago
1bda6bf862
Merge pull request #609 from phq1910/patch-1
...
Update Configuration.h
11 years ago
c80aac1518
Merge pull request #610 from phq1910/patch-2
...
Update pins.h
11 years ago
314fd13c39
Fix for Viki display
11 years ago
4f7c6dfe35
Update pins.h
...
Include Pins cpu Sethi 3D
11 years ago
57173739a1
Update Configuration.h
...
Include CPU Sethi 3D
11 years ago
0dca49a7c0
Added Azteeg X3 board.
11 years ago
d8c2c810b4
Added info to the delta configuration files in the configuration.h file
11 years ago
9bc88f8bab
Placed optional ENCODER_PULSES_PER_STEP in the configuration.h file
11 years ago
3ca1ca6869
Fixed missing ENCODER_PULSES_PER_STEP
11 years ago
97b0da0c2e
Removed #ifndef BLINKM
11 years ago
61db046b32
Added #ifdef BLINKM around new code. Also refined BlinkM.h.
11 years ago
77df2ab0e7
Make Y_DUAL_STEPPER_DRIVERS disabled by default
11 years ago
ed1ab42186
Added Y_DUAL_STEPPER_DRIVERS
...
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped in either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
f4a59e4ce5
Revert "Added Y_DUAL_STEPPER_DRIVERS"
...
This reverts commit 7ee275b620
11 years ago
7ee275b620
Added Y_DUAL_STEPPER_DRIVERS
...
Enables two stepper drivers to be used for the Y axis (useful for
Shapeoko style machines)
Each Y driver can be stepped either the same way or in opposite
directions, accounting for different hardware setups (leadscrew vs. belt
driven)
11 years ago
6a1e980c6d
Merge pull request #600 from xoan/Encoder_Pulses_Per_Step
...
add ENCODER_PULSES_PER_STEP
11 years ago
20076a8bd3
Merge pull request #598 from GDV0/Marlin_v1
...
FIx compilation error when enabling SERVO_ENDSTOPS (#591 )
11 years ago
3626b5ad8b
Removed Delta from the default config file.
...
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
11 years ago
bf7007d02f
add ENCODER_PULSES_PER_STEP
11 years ago
f17506c504
FIx compilation error when enabling SERVO_ENDSTOPS ( #591 )
11 years ago
acd8619809
Fan fix for Panelolu2+Sanguinololu.
11 years ago
595580556c
Fixed bug that makes ulticontroller knob backwards introduced Feb 28 2013 by Robert.
...
Bug introduced in version 6beb42cdf6839bef6d5d
11 years ago
88dfeefca3
Define BlinkM default disabled
11 years ago
5350faf2a2
Merge https://github.com/timkoster/MarlinBlinkM into Marlin_v1
11 years ago
7016cc9511
Added BlinkM support over i2c
11 years ago
3b315b3da0
Added BlinkM support over i2c
11 years ago
f26f26b7bd
Fix the example delta configuration as someone forgot to do it.
11 years ago
9aa2229077
add command M666 for adjusting delta printer endstop position
11 years ago
9547fb9dfb
Add duplication and auto-park mode for dual x-carriage support.
11 years ago
53614e5144
add pins for rambo lcd
11 years ago
b42d24e31e
add additional pins to avr2560 for rambo lcd
11 years ago
b0c8120fcc
Added feedrate setting in exemple config for manual moves from panel
11 years ago
a54fe2d73c
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
7ea63d08df
Merge pull request #565 from iXce/avrdudeconfpath
...
Detect OS in Makefile to use the correct avrdude.conf path
11 years ago
4187b637a5
Merge pull request #570 from hg42/separate-INVERTING-macros-for-MIN-and-MAX-endstops
...
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
11 years ago
07e7de3600
Merge pull request #569 from hg42/convert-PROTOCOL-macros-from-statements-to-expressions
...
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
11 years ago
c0c4c97db6
Detect OS in Makefile to use the correct avrdude.conf path
11 years ago
2ca983568d
separate INVERTING for MIN and MAX endstops (6 #defines instead of 3)
11 years ago
3700f688f5
convert PROTOCOL macros from statements to (multiple, comma separated) expressions
11 years ago
a504c88346
Fix a bug where the PID controllers D action kicks in hard as soon as the PID controller starts.
11 years ago
394ed08f88
Added feedrate setting for manual moves from panel
11 years ago
9bf1cf1b22
Pre-calculate diagonal rod length squared
11 years ago
4623e78ce0
Added Honeywell thermistor 135-104LAF-J01
11 years ago
d7f384f680
Skip SD menu refresh if nothing has changed
11 years ago
abc8320a68
Save LCD_CLICKED before it is cleared
...
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
11 years ago
f4c3135c6d
Add Panelolu2 pins for RAMPS1.3
11 years ago
aae42c68f9
Update French translation in language.h
11 years ago
4d435c38a6
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
11 years ago
6c42a3a339
Woops, fix logic
11 years ago
376d8af2c8
Report temperatures for all extruders
11 years ago
434b6a05c1
Merge pull request #552 from iXce/Marlin_v1
...
Report temperatures for all extruders in reply to M105
11 years ago
bdc2621119
Merge pull request #561 from Brendan-csel/Marlin_v1
...
Fix for Viki LCD issues printing from SD card
11 years ago
6965bd4e15
Merge pull request #560 from njprossi/Marlin_v1
...
Fixed move from panel for delta bot #557
11 years ago
a55b33e613
Merge pull request #559 from iXce/panelolupinsramps13
...
Add Panelolu2 pins for RAMPS1.3
11 years ago
8b34351537
Merge pull request #558 from iXce/frenchupdate
...
Update French translation in language.h
11 years ago
735e556724
Merge pull request #555 from iXce/liquidtwi2_makefile
...
Add support of LiquidTWI2-based panels to Makefile
11 years ago
d80aecda0a
Skip SD menu refresh if nothing has changed
11 years ago
be2dea1dc6
Save LCD_CLICKED before it is cleared
...
The SD card menu was refreshing so slowly that the button interrupt was clearing LCD_CLICKED before the menu items could check it.
11 years ago
55c287a69e
Fixed move from panel for delta bot #557
11 years ago
1902d339b0
Add Panelolu2 pins for RAMPS1.3
11 years ago
eb23a68e92
Update French translation in language.h
11 years ago
1561c6df51
Merge pull request #547 from wolfmanjm/delta-configuration
...
Setup Default configuration for Deltas if DELTA is defined
11 years ago
374bc99fa3
Add support of LiquidTWI2-based panels to Makefile
...
Use LIQUID_TWI2=1 as make argument to enable this support
11 years ago
ab624eac2a
revert COnfiguratiuon to the same as head
11 years ago
52f79ffeca
add an example default configuration for delta style bots
11 years ago
b9d7ccf1cd
Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration
...
Conflicts:
Marlin/Marlin_main.cpp
11 years ago
d4d1540727
Use -fno-use-cxa-atexit to override gcc --enable-cxa_atexit
11 years ago
01ed99143c
Woops, fix logic
11 years ago
76841450c8
Only display poweron/poweroff if PS_ON_PIN > -1
11 years ago
44f327d738
Uniformly reindent language.h
11 years ago
326d2db025
Update language.h so that all languages compile
...
Some strings still need translation, but at least everything compiles.
11 years ago
2cb716f513
Run Marlin/language.h through dos2unix
11 years ago
34da3a0a3f
Merge github.com:ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/language.h
11 years ago
18199ff960
Merge github.com:ErikZalm/Marlin into Marlin_v1
11 years ago
fb5334f428
Fixed compile error when QUICK_HOME is defined.
...
As well a couple of minor changes to handling of extruder offset for
dual x-carriage mode.
11 years ago
c3568398b5
Disable DUAL_X_CARRIAGE by default
11 years ago
39cd3dbdbe
Remove dual x-carriage functionality that could/should be implemented in slicer
...
Also added a couple of missed merge lines in homeaxis() from previous
commit.
11 years ago
fb20ceabce
enable soft endstops for delta
...
disable delta by default
11 years ago
d01ee7e7b5
fix zjerk being the same for delta as xy jerk
...
add more delta defaults
on delta make second home even slower
11 years ago
d7390e13d9
Support dual x-carriage printers
...
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
11 years ago
f3aa2a48e7
update max pos
11 years ago
460751503e
Added default configurations for deltas when DELTA is defined
11 years ago
9da94c247a
fixed bad lcd commit from makr3d
...
#elsif does not exist #elif is correct
12 years ago
59004023fd
Fixed typo
12 years ago
461dad6e05
Added : M32 - Select file and start SD print (Can be used when printing from SD card)
...
Untested
12 years ago
c4a2077951
M109 and M190 now wait when cooling down if R is used instead of S.
...
M109 S180 waits only when heating.
M109 R180 also waits when cooling.
12 years ago
8a2a3ef91d
Merge pull request #531 from iXce/Marlin_v1_lcd
...
Only clamp panel movements if software endstops are enabled
12 years ago
6397b3339c
restored configuration.h defaults
12 years ago
cdaaad3df1
Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1
12 years ago
e3bdefd873
fixed missing #endif
12 years ago
a5be0c52c6
no message
12 years ago
e509cdbeb0
added contrast control function for gLCDs
12 years ago
99b7e926e7
added MaKr3d Melzi board
12 years ago
68be33b1fc
Update language.h
...
I update the spanish Messages, now this compile for spanish language.
12 years ago
acb3271c9a
Merge pull request #534 from xifle/Marlin_v1
...
Fixes compiler warning for feedrate deadzone
12 years ago
61fe430d4f
Should fix compiler warning for feedrate deadzone
12 years ago
fde17d5720
Fix for ugly code compilation errors in SERVO_ENDSTOP checks
12 years ago
chrono