27ad381e25
Allow fractional seconds in G4 and M0
10 years ago
5146694452
Merge pull request #1884 from shaggythesheep/feature_new_board_ramps_cnc_controller
...
Feature: Add RAMPS CNC Controller Board
10 years ago
b2bd9aae7c
SCARA_SEGMENTS_PER_SECOND
10 years ago
bd20bd5444
Merge pull request #2063 from chris-bo/autobed_sled
...
improve sled handling
10 years ago
9e95ceb3fc
Split up prepare_move by type
...
- For better encapsulation add inlines for each prepare_move type
- Move controllerFan vars inside the function as statics
- Some formatting cleanup
- Rename `ClearToSend` as `ok_to_send`
10 years ago
9ba8cf5fe3
Merge pull request #2061 from thinkyhead/wait_before_g28
...
Always do st_synchronize() before G28
10 years ago
873f7d6f2a
Check that configs are up-to-date
10 years ago
f48599f172
add pin definition to some motherboards
10 years ago
b5200e184c
Remove extra setup_for_endstop_move
10 years ago
8d814de558
Return void in prevent_dangerous_extrude
10 years ago
367e2eb9f4
Global setup_for_endstop_move
10 years ago
1d5677cc3b
add missing Z-bits
10 years ago
df12e68e7d
add missing Z_PROBE-bit
10 years ago
fa951f8a0b
Always do st_synchronize() before G28
10 years ago
27a3b1d895
disable sled pin by default
10 years ago
fb44b53ae3
sled improvements
...
- create sled pin definition
- G28 Works with sled
10 years ago
46d1932380
add plan buffer remaining for 'P' and block buffer remaining 'B'
10 years ago
429c6ccad2
Neaten config formatting
10 years ago
8a0dc4d54a
Merge pull request #1922 from Wurstnase/serial_wait
...
Serial wait
10 years ago
8332a15899
Fix testing of runaway options in temperature.cpp
10 years ago
526ad82d20
activate advanced_ok and no_timeout
10 years ago
2b92b01afc
Fix typo in SanityCheck.h
10 years ago
2445ae3d3a
Combine thermal runaway and watch-period
...
- Make thermal protection for all hotends and/or bed into simple
switches
- Now enable `WATCH_TEMP_PERIOD` when `THERMAL_PROTECTION_HOTENDS` is
enabled
- Move detailed thermal parameters to `Configuration_adv.h`
- Add sanity checks to warn about old configurations
- Change `WATCH_TEMP_PERIOD` to seconds instead of milliseconds
10 years ago
4097207c75
Merge pull request #2041 from thinkyhead/watch_temp
...
More thermal protection
10 years ago
45d64040fe
Merge pull request #2048 from Wurstnase/hit_bits
...
replace some bools
10 years ago
9b3d4380d3
Only watch the heater that was set
10 years ago
52c0696e44
Merge pull request #2044 from thinkyhead/fix_servos_too
...
Make some z probe and servo code tweaks
10 years ago
b55f32f8a1
replace some bools
...
this PR replaces some bools with one char. this will safe 3 bytes and should also be sometimes a little bit faster.
10 years ago
e70e6e2b48
Correction traductions
10 years ago
f73f4ce555
Make some z probe and servo code tweaks
10 years ago
28c87ec81b
Disable all heaters on temp error
10 years ago
79106638a8
Fix documentation of heating sanity check
10 years ago
6110494a56
Change default to 4°C in 16s
10 years ago
54deb9eea3
Enable WATCH_TEMP_PERIOD by default
10 years ago
deedb00c18
Document WATCH_TEMP_PERIOD
10 years ago
be77cfd895
Merge pull request #2032 from Wurstnase/toshiba_for_all_stepper
...
We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER …
10 years ago
cb4ea75fab
Support for MKS BASE 1.0 board
10 years ago
0e70511381
Merge pull request #2036 from brupje/mainline
...
Fixes for reprapworld's keypad
10 years ago
0cb87795a3
advanced 'ok'
...
ok N(linenumber) P(bufferremaining)
the host can use this to send the data much faster.
Some pseudo code:
If (bufferremaining > 0) send command
## as long there is free buffer send command
Also
if (linenumber > lastsend - bufferremaining) send command
## as long last linenumber received is bigger than lastsend (host) - last bufferremaining received
10 years ago
182e0d99c9
Merge remote-tracking branch 'Marlin8bit/Development' into serial_wait
10 years ago
d1148a0198
Rename Configuration_megatronics.h to Configuration.h
10 years ago
7f3252eea9
Merge pull request #1999 from paclema/Filrunout_configurable_script
...
Added configurable script for filrunout from configuration.h
10 years ago
181ccc884c
Edit thermal runaway description
10 years ago
073e4af7e2
We don't need the old standard one. The STEP_ADD and STEP_IF_COUNTER are also good for non-Toshiba stepper driver.
10 years ago
b7fcb11580
Added example configuration for Megatronics
10 years ago
8f8174dc93
Revert "Default configuration for megatronics."
...
This reverts commit 22e0d2afcb
10 years ago
79633a74ab
Fix MBL compile error
10 years ago
ba9741139e
Clean up pins file for megatronics
10 years ago
22e0d2afcb
Default configuration for megatronics.
10 years ago
816aa19861
Up/down buttons were reversed, swapped the assignments
10 years ago
df4d50579a
This is conflicting with the settings in ultralcd.h. Not sure why it' s redefined here anyway.
10 years ago
8f8bf3a897
Make Marlin actually compile when #define REPRAPWORLD_KEYPAD is uncommented
10 years ago
777f2d3820
Merge pull request #2018 from fmalpartida/bugFixing
...
Bug corrected: persistent HOMING message when HOME button pressed for homing.
10 years ago
ecb46de349
Merge pull request #2013 from bq/Fix_lowercase
...
Fixed lowercase change missing on commit a22a228b
10 years ago
150a35eff8
Bug corrected:
...
Persistent homing message.
Message was declared as an alert, therefore it was persistent.
Updated to message.
10 years ago
ab246ab032
Reverting changes to error messages on serial console
...
This reverts the changes done to the error message for line number mismatches done in commit d43cc2dd5f
10 years ago
59529b755d
Fixed lowercase change missing on commit a22a228b.
...
Servo.cpp and Servo.h were changed to lowercase in Makefile but not their actual filenames.
10 years ago
df4c104637
Merge pull request #2012 from BrianGilbert/Development
...
Add example configuration for Boots Industries V2.5 Delta Printer
10 years ago
1f039cde61
Merge pull request #1992 from thinkyhead/too_many_probes
...
Stow Z probe on M402 without extra raise
10 years ago
1285784a49
Add Boots Industries V2.5 example configuration
10 years ago
35493e1af9
Tweak to planner.cpp position.debug
10 years ago
26015b02d8
Fixed typo and updated Configuration.h of configurator
10 years ago
aedd580911
Updated all configuration.h examples
10 years ago
2c892fca6a
Cleanup of language.h
10 years ago
2db384a21d
Fix compile error in configuration_store.cpp
10 years ago
ca8cec8e8a
Merge pull request #1998 from paclema/Filament_runout_fix
...
Fixed sintaxis error of filament runout
10 years ago
425cd46c12
Merge pull request #1993 from AnHardt/TRP-bed
...
Enable TRP for the bed
10 years ago
d4c74b8f8c
Don't apply M428 if an error occurs
...
- Also move audio feedback into the command
- Added shorthand for `lcd_buzz` availability
10 years ago
d065d37822
Add M428 to set home_offset logically
10 years ago
013a09dbe6
Added configurable script for filrunout form configuration.h
10 years ago
4dcc0fd55a
Fixed sintaxis error of filament runout
10 years ago
514d8ac460
Enable TRP for the bed
...
in all Configurations.
10 years ago
ce3caf447b
Tweak how homeaxis deploys and stows
10 years ago
a235dca79c
Stow z on M402 without extra raise
10 years ago
2610b8d047
Enable thermal runaway protection by default
10 years ago
b4b19a6cbd
Merge https://github.com/MarlinFirmware/Marlin into Bulgarian
...
Conflicts:
Marlin/Configuration.h
Marlin/configurator/config/Configuration.h
Marlin/example_configurations/Felix/Configuration.h
Marlin/example_configurations/Felix/Configuration_DUAL.h
Marlin/example_configurations/Hephestos/Configuration.h
Marlin/example_configurations/K8200/Configuration.h
Marlin/example_configurations/SCARA/Configuration.h
Marlin/example_configurations/WITBOX/Configuration.h
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/example_configurations/makibox/Configuration.h
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Conflicts with my Chinese implementation resolved.
10 years ago
7548a56f64
Merge pull request #1886 from ex-nerd/pins_BRAINWAVE_PRO
...
Add pin configuration for Brainwave Pro
10 years ago
02acf0641a
Merge pull request #1983 from CONSULitAS/Development_Update_language_de.h
...
language_de.h: updated translation and minor typos
10 years ago
a120bf3fe4
Latest upstream commits
10 years ago
3688256f86
Merge pull request #1974 from thinkyhead/eeprom_in_gcode
...
Make EEPROM reproducible in GCode
10 years ago
ae53b3cdc3
Fix the M303 S-1 report text
10 years ago
c1fbef1722
Merge pull request #1988 from thinkyhead/bye_string_url
...
Remove obsolete STRING_URL
10 years ago
31516e2a3b
Merge pull request #1985 from Arengorn/Development
...
Update of servo.h
10 years ago
185f8a0a66
Merge pull request #1917 from CONSULitAS/Development_Update_K8200_Config
...
Example Configuration for K8200: comments/URL/readme
10 years ago
0970102950
Remove obsolete STRING_URL
10 years ago
0f687b5dda
Merge branch 'Development' into eeprom_in_gcode
...
Latest upstream commits
10 years ago
28aef684b4
Merge pull request #1957 from Voxel8/sjk/home_y_before_x
...
Allow Y to home before X with option in Configuration_adv.h.
10 years ago
c1dd9bda7f
Merge pull request #1987 from thinkyhead/fix_homing_zpos
...
Disable endstops between homing bumps
10 years ago
71a0b1a5bb
Disable endstops between homing bumps
10 years ago
8c28e36e75
Merge pull request #1986 from thinkyhead/fix_homing_zpos
...
Fix homing Z position
10 years ago
c36226c4dc
Fix homing Z position
...
Add `sync_plan_position()` after `axis_is_at_home(axis)` to keep the
planner position in sync when homing.
10 years ago
2bc1d70a31
Merge pull request #1977 from AnHardt/Cinese2
...
We mark this historic day, when Marlin went to China.
10 years ago
ff178d8cf7
Change M421 to take coordinates
...
This makes `M421` more amenable for irregular matrices
10 years ago
e449659338
Update Servo.cpp
...
Updated "servo.h" to "Servo.h"
10 years ago
ff67ee73fc
Update Marlin_main.cpp
...
Corrected "servo.h" to "Servo.h" because of the updated filename.
10 years ago
5b248757c7
Level Bed in Prepare submenu
...
- Add “Level Bed” menu item for auto bed leveling
- Hide the option if homing has not been done yet
- Arrange the Prepare submenu more logically (?)
- Add documentation comments, some white-space
- Apply some coding standards here and there
- Move old encoder multiplier debug option to `ultralcd.cpp`
10 years ago
c5dfb35597
language_de.h: updated translation and minor typos
...
language_de.h: updated translation and minor typos
10 years ago
6423fe7601
language.h: update documentation / URL für K8200
...
language.h: update documentation for LANGUAGE_INCLUDE
language.h: URL für K8200 github repository
10 years ago
6af40e9dc0
K8200 example Configuration.h: STRING_URL removed
...
K8200 example Configuration.h:
* STRING_URL removed: like proposed by thinkyhead in #1917
10 years ago
d1c1f766d5
Merge remote-tracking branch 'upstream/Development' into K8200_2015-04-23_TEST
...
Conflicts:
Marlin/example_configurations/K8200/Configuration.h
10 years ago
98ca46006c
Allow Y to home before X with option in Configuration_adv.h.
...
This addresses comments in #1956 and #1079 . In particular, this is useful
when both endstops are stationary on a CoreXY system, and the Y axis needs
to be homed before the X so the flags are aligned.
10 years ago
6cba6bcd82
Add 'cn' to the other 'Configuration.h's
10 years ago
1d9699be0f
Add some doku
10 years ago
76b12edecf
Give TALL_FONT_CORRECTION a default
10 years ago
6b1b71837c
Intit. commit for Chinese
...
Edited the European part of 'ISO10646_CN.fon' to match the existing fonts.
Added Chinese font to make_fonts.bat
Created 'dogm_font_data_ISO10646_CN.h'
Added Chinese to 'language.h'
Added 'language_cn.h' with some minor edits.
Added Chinese font in 'language_en.h' to not fall back to European font.
Added cn to 'Configuration.h'
Changed WIDTH to LCD_PIXEL_WIDTH and HEIGHT to LCD_PIXEL_HEIGHT to have more descriptive names.
In 'dogm_lcd_implementation.h'
Added Chinese Font
Made 1 pixel more room for the larger Chinese font on the status line.
Changed geometry of the 'select bar' by one pixel.
Changed the way the position for values and postcars are set.
10 years ago
fb379384ee
Reduce MBL eeprom read code
10 years ago
0fca084ea6
Make EEPROM reproducible in GCode
...
With these changes the output of `M503 S0` is all you need to restore
the EEPROM. Building on this it is straightforward to save and restore
the EEPROM state using the SD card or external GCode file.
- Added `M145` to set “heatup states” for the LCD menu
- Added `M420` to toggle Mesh Bed Leveling
- Added `M421` to set a single Mesh coordinate
- Extended `Config_PrintSettings` with added M codes
- Cleaned up some comments here and there
10 years ago
d43cc2dd5f
M111 - Debug Level
...
- Add `M111` as a standard option to set the debug level
- Implement `DEBUG_ECHO` in `process_commands`
- Other debug levels (e.g., `DEBUG_DRYRUN`) need more work
10 years ago
0ec444720f
Rename blinkm files
10 years ago
a22a228bcc
Rename files to move them in the IDE
10 years ago
a932e7490f
No noTone needed, but delay is
10 years ago
9c5d14ea68
Fix BEEPER duration
10 years ago
5c29fda167
Add a warning for DISABLE_[XYZ] options
10 years ago
0438f0d835
Merge pull request #1924 from thinkyhead/raise_z_for_m401_m402
...
Raise Z for M401 and M402
10 years ago
a640cad139
Merge pull request #1967 from thinkyhead/g4_dwell_message
...
Use millis_t for progress_bar_ms and expire_status_ms
10 years ago
c92b59952a
Use millis_t for progress_bar_ms and expire_status_ms
10 years ago
b275946a52
Merge pull request #1966 from thinkyhead/g4_dwell_message
...
G4 shows status message only if no message is set already
10 years ago
97dfa0365d
Rename expireStatusMillis to expire_status_ms
10 years ago
7295640f44
Remove extraneous ;
10 years ago
0d8c00d3f6
Define lcd_hasstatus for no lcd also
10 years ago
182f2cda35
Minor cleanup of M48
10 years ago
3a6fd912cd
Latest upstream commits, merged
10 years ago
3c9e94e035
Merge pull request #1964 from AnHardt/Max6675again
...
Add variant for MAX6675 in M104
10 years ago
56ff46eb8b
Improve code_has_value test
10 years ago
ce142afdda
G4 shows status message only if no message is set already
...
- Address issue raised in #1961
10 years ago
35e79d56a5
Remove set-coordinate extension of G28
10 years ago
3a74bb5039
Merge pull request #1945 from Wurstnase/max_endstopp
...
Max endstopp
10 years ago
0fed46360c
Add variant for MAX6675 in M104
...
Else will throw error:
@:0 B@:0
Error:No thermistors - no temperature
[ERROR] Error:No thermistors - no temperature
when no bed is defined
10 years ago
79a44a9de3
stepper.cpp macros rework
...
delete some tabs
10 years ago
588ed70d4a
Latest upstream commits, merged
10 years ago
0165560333
Apply zprobe_zoffset in axis_is_at_home
...
Ensure the probe offset will always be included when homing Z.
10 years ago
075386e7fe
Merge pull request #1959 from thinkyhead/lcd_move_rate
...
Include axis parameter to ultralcd's line_to_current
10 years ago
2558c10c6c
Use the slower feedrate for XY axes
10 years ago
31932912dd
Use AxisEnum instead of int for _lcd_move
10 years ago
c2e11daf66
Merge pull request #1958 from thinkyhead/redo_1937
...
Fix homing of YZ with DUAL_X_CARRIAGE
10 years ago
c3560e0288
Include axis parameter to ultralcd's line_to_current
10 years ago
a0a5ff61c4
Merge pull request #1951 from AnHardt/Azteeg_x3
...
Fix for #1946
10 years ago
0094481e55
Merge pull request #1955 from AnHardt/langlang
...
Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
10 years ago
64268f3312
Fixup axis_is_at_home a little
10 years ago
996d0a9185
Squish the code down a little
10 years ago
8534bc376c
Fix homing of YZ with DUAL_X_CARRIAGE
10 years ago
3b97a7d446
Merge pull request #1944 from AnHardt/beep2
...
More Beeper clean up
10 years ago
be9e4ceddc
fix typo
...
c'n'p ftw :/
10 years ago
c26d816839
filter any 0
10 years ago
f2c94b3298
tone will end automaticly
10 years ago
c5e0e29d23
Add DISPLAY_CHARSET_HD44780_CYRILLIC as alternative in SanityCheck.h
...
and add some documentation - how to integrate a new font.
10 years ago
b59e92ab99
Fix for #1946
...
Syntax error.
10 years ago
61ae43f35e
v <-> code_value
10 years ago
da0d91a79b
max endstopp
...
no user will home to 0 with a max endstopp
10 years ago
3a27a78f9e
Commented REPRAP_DISCOUNT_SMART_CONTROLLER again
...
and removed some tabs.
10 years ago
064f2b37d0
More Beeper clean up.
...
Centralised beep code to lcd_buzz().
From gcode_M300() and lcd_quick_feedback().
Enforced max. duration for M300 to 5 seconds.
Corrected description in 'Configuration.h'
LCD_FEEDBACK_FREQUENCY_HZ 0 gives now a silent delay of
LCD_FEEDBACK_FREQUENCY_DURATION_MS.
10 years ago
92575cecca
new timout/add adv_ok
10 years ago
671aaf2dc9
Minor fix for M300
...
Corrected wrong order of parameters.
10 years ago
d931220a65
Tweak comments
10 years ago
47847765e2
Add M410 QuickStop command
10 years ago
a4ca87ba99
Merge pull request #1933 from bq/Fix_stray_in_configuration
...
Fixed compilation error "error: stray ‘\357’ in program"
10 years ago
5e3bb4bdf3
Merge pull request #1931 from paclema/M303_echo
...
Added new PID autotune info, to make easy copy & paste results to marlin
10 years ago
b99e63a7bf
Fixed compilation error "error: stray ‘\357’ in program" in several configuration files.
...
Introduced in commit 697ee2dc
10 years ago
581685a231
Added new PID autotune info, to make easy copy & paste results to marlin
10 years ago
483384aaa4
Fixed faulty comment merge
10 years ago
cc6b7cf3ce
Fixed some comment spellings.
10 years ago
e4595fa24a
Fixed jump in speed when using high accelerations on axes with lots of steps.
...
I.e., when acceleration * steps per mm > 2,000,000.
This was done by changing MultiU24X24toH16 to take a 32b bit operand.
Removed the claim that stepper.cpp uses the Leib algorithm.
10 years ago
b09a957fce
make 'wait' optional and mark as workaround
10 years ago
63b98b8280
Raise Z for M401 and M402
10 years ago
d69da22f7c
last_command_time inside get_command()
10 years ago
53be0f3399
Babystep delay 2us
10 years ago
574e2d856e
remove config
10 years ago
cde5eee2a5
Removed unnecessary comments
10 years ago
e1b69db6d1
Fixed M48 mismatch between n and P parameter on documentation
10 years ago
1de9b568db
Example Configuration for K8200: comments/URL/readme
...
Example Configuration for K8200 : comments/URL/readme
example_configurations\K8200\Configuration.h:
* add machine specific header
* change STRING_URL to K8200 fork (@thinkyhead: What do you think?)
example_configurations\K8200\readme.md:
* updated documentation
* added URLs and links
10 years ago
0af5e3a04f
Example Configuration for K8200: comments/URL/readme
...
Example Configuration for K8200 : comments/URL/readme
example_configurations\K8200\Configuration.h:
* add machine specific header
* change STRING_URL to K8200 fork (@thinkyhead: What do you think?)
example_configurations\K8200\readme.md:
* updated documentation
* added URLs and links
10 years ago
637babb99b
Merge pull request #1915 from elgambitero/Development
...
Some minor translations to spanish
10 years ago
cb9ac490d4
Some minor translations to spanish
10 years ago
3851ac6226
Example Configuration for K8200 back in sync
...
example_configurations\K8200\Configuration.h:
* merge upstream changes from default Configuration.h manually
* add some machine specific comments
10 years ago
b447a4ffab
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
7336e6df07
Always define old_z, not always z2
10 years ago
5dd87d2e74
Enable all old_z_*_endstop vars for Z_DUAL_ENDSTOPS
...
- Potentially addressing #1911
10 years ago
3f02da646c
Make sure axis_active is cleared for #1908
10 years ago
e0e68c5cbc
Rename servos[] array in Marlin to servo[]
10 years ago
ffaf1b4f22
Add pin configuration for Brainwave Pro
...
Copied from jcrocholl's contributions to the OpenBeamUSA Marlin fork
10 years ago
642f6a92bc
fix type of code_has_value
10 years ago
17ad80c1e1
Spacing in XYZ_CONSTS
10 years ago
09d60e0128
Naming and code comments
10 years ago
5a9e45cc4a
Fix Syntax Error Filament Runout Statement
10 years ago
257a907456
Fix typo in next_bed_check_ms
10 years ago
e4b1e8651b
next_ vars faster than previous_
...
- Change some `previous_` time vars to `next_` so an add only happens
at intervals
- Fix `HEATER_0_USES_MAX6675` polling too frequently, or not at all
10 years ago
ccddc280be
Apply three more commits
10 years ago
74e4b42f7e
Default MACHINE_NAME to "3D Printer"
10 years ago
8857b9e921
Use the extruder argument in plan_buffer_line
10 years ago
ac2b23f574
Homing fixes
...
- Prevent `Z_SAFE_HOMING` from homing Z twice in some cases
- Allow `G28` with XYZ values of 0 to explicitly set the position
- Don’t add `home_offset` when setting XYZ explicitly in `G28`
- Add `code_has_value` function to check for the presence of a numeric
value (could just test for space or nul to allow other types of values)
10 years ago
055b11814a
Additional cleanup of ultralcd.cpp
10 years ago
388dd0cfa5
Fix doubled lcd_quick_feedback
...
- MENU_ITEM causes lcd_quick_feedback to be called, so only those calls
to `lcd_goto_menu` outside of the `MENU_ITEM` macro need to set the
`feedback` flag when calling `lcd_goto_menu`.
10 years ago
c6bb98abad
machine name for hephestos too
10 years ago
ccbe2c4ea3
Apply CUSTOM_MACHINE_NAME to configurations
...
- Replace “Mendel” with “RepRap”
10 years ago
5fe382949b
Some G-Codes comment cleanup
10 years ago
8b16ebe705
Break out prevent_dangerous_extrude feature
...
- It’s inline here, but could be a macro and duplicated for
`planner.cpp`
10 years ago
740152ee70
Merge branch 'Development' into cold_extrude
...
Latest upstream commits
10 years ago
5914d9d7de
Shuffling declarations..
10 years ago
b328c6e6b6
Shuffling declarations.
10 years ago
fb4cefc91d
Define lcd_move_[xyz] ahead of lcd_move_menu_axis
10 years ago
4c3736ed43
Feature: Add RAMPS CNC Controller Board
...
Created a new board to make using RAMPS as a CNC machine controller
easier. It maps pin 8 to the spindle and pin 9 to the controller fan.
10 years ago
9189cc66ab
Fix moves for DELTA for MANUAL_BED_LEVELING
...
- Use `line_to_current` in place of `plan_buffer_line`
10 years ago
56fc3a4835
bgr -> bg
...
+ update in documentation
10 years ago
7a1aef1450
Merge pull request #1877 from AnHardt/display-only
...
Made encoderPosition and quick_feedback dependant on NEWPANEL
10 years ago
6096164d79
Merge pull request #1878 from thinkyhead/cold_extrude
...
Cold extrude
10 years ago
a488445cbe
Fix spelling of "too"
10 years ago
b1950a7f25
Merge pull request #1875 from Natealus/Development
...
Z Probe inverting not present in example configs, causes error
10 years ago
df50523605
Made encoderPosition and quick_feedback dependant on NEWPANEL
...
where the hardware is available.
Fix for #1873
10 years ago
2ca099d1e7
Merge pull request #1876 from thinkyhead/cold_extrude
...
Catch dangerous extrude before trying several
10 years ago
837ceb9abb
Merge pull request #1867 from epatel/Development
...
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
10 years ago
a95544f92a
Spell adjustment
10 years ago
a00ebf03d4
Merge pull request #1868 from AnHardt/LCD_STR
...
Moved the definitions of the LCD_STR_* to Conditionals.h
10 years ago
1269c445ab
Catch dangerous extrude before trying several
10 years ago
585eee6549
Z Probe inverting not present in example configs, causes error
...
The line const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to
invert the logic of the endstop is in the main configuration.h but
wasn't present in the example configuration.h's. Causes a compiling
error with Z Probe enabled. Just added it to all the configs. :)
10 years ago
c5961892e3
Bulgarian for all the Configuration.h's
10 years ago
6248c93f37
Introduction of Bulgarian - language_bgr.h
...
Thank you @Nprod!
10 years ago
540dbb35e2
And an other MSG_BED in Marlin_main.cpp
10 years ago
14d4419e16
Replaced SERIAL_PROTOCOLPGM(MSG_BED) with SERIAL_PROTOCOLPGM("Bed")
...
Resolved some warnings in Marlin_main.cpp regarding compares of signed and unsigned integers by replacing 'int' or 'uint16_t' with 'uint8_t'.
10 years ago
ea897654a4
Moved the definitions of the LCD_STR_* to Conditionals.h
...
to avoid errors in Marlin_main.cpp. #1860
In the include tree of Marlin_main.cpp the decision between the display types is not made.
To include the right LCD_STR_* ether 'dogm_lcd_implementation.h' or 'ultralcd_implementation_hitachi_HD44780.h' with all their code.
A 'dogm_lcd_implementation.h.h' would be a curiosity.
So i moved both of the definition blocks to conditionals.h
On the long term it could make sense to use the same numbering for the u8glib and the hitachi symbols.
10 years ago
7dc64efe67
Added sanity check for MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS
10 years ago
6a514f3dc9
Aplied HAS_LCD_CONTRAST also to Marlin_main.cpp
...
and cleaned typo.
10 years ago
a76fb42ca6
Merge https://github.com/MarlinFirmware/Marlin into contrast
10 years ago
bcc04192fc
Remove Contrast Menu for U8GLIB_ST7920
...
The other two devices we use in u8glib have more than only dummy code.
Checked this in the library code.
10 years ago
4788b59300
Thermistor values for configurator
10 years ago
bb917ecda8
Merge pull request #1853 from thinkyhead/dev_version
...
Set version to "1.0.3 dev"
10 years ago
caa7734402
Merge pull request #1864 from thinkyhead/is_running
...
IsStopped / IsRunning inline
10 years ago
3162971cd6
current_position not static
10 years ago
27cb90da8b
IsStopped / IsRunning inline
10 years ago
07fc2b5b70
Update language_ru.h
10 years ago
756bb5e268
Cleanup formatting in hitachi & dogm lcd
10 years ago
7431ef7e2d
Merge branch 'Development' into dev_version
...
Latest upstream commits
10 years ago
43773ff735
Formatting and lcd contrast masking
10 years ago
eb6e3886f4
Set version to "1.0.3 dev"
10 years ago
cf9b58452c
Minimum delay in menu click feedback
...
Squished #1849
10 years ago
1d291be2ba
Fix de after PREVENT_DANGEROUS_EXTRUDE
...
- Set `de` to 0 when `position[E] = target[E]`
- Address regression mention in #1846
10 years ago
e03da4805b
Merge pull request #1774 from epatel/Development
...
Mesh bed leveling: Added G29 S3 + finer display steps during manual input + bug fix
10 years ago
f7c4e7e19f
Fix G29 not deploying in some instances
10 years ago
a9ed39b12d
Moved checks into SanityCheck.h + removed previous added checks.
10 years ago
002340f32c
Merge branch 'Development-Marlin' into Development
10 years ago
c379f17117
Encapsulate setting of homing_bump_feedrate
10 years ago
7d2c2f1790
Updates for the configurator
...
- Sections in all `Configuration_adv.h`
- Recognize JAPANESE/WESTERN/CYRILLIC options
- Better capturing of comments for tooltips
10 years ago
967db181d0
Latest upstream commits
10 years ago
e502144eda
Fixup formatting of last commit
10 years ago
d05efa008d
Merge pull request #1825 from shaggythesheep/bugfix_no_heaters
...
Bugfix: Temperature checks when no heaters in use
10 years ago
d20f42c883
Don't stow the probe until the last grid point!
...
- Address Issue #1682 at hash #issuecomment-89756858
10 years ago
5c2bb05af3
Merge pull request #1839 from AnHardt/fix-statusmessage
...
Fix lcd_status_message
10 years ago
d70a4a3847
Merge pull request #1823 from AnHardt/splashscreen
...
Disable splash-screen when done once
10 years ago
56aea5f8e5
Merge pull request #1829 from Natealus/Development
...
Azteeg X3 Pro Pin fix ups
10 years ago
6a860b99dc
Merge pull request #1828 from Wackerbarth/Configurator
...
Update Configurator Files
10 years ago
ac843fbf3b
Fix lcd_status_message
...
Because we now can use utf8 with up to 3 bytes per symbol,
lcd_status_message[] must be 3*LCD_WIDTH wide.
Filling up the message, or cutting to length, are fixed to.
Fix for #1832 about at the end.
10 years ago
6d084c017f
Fix typo in FWRETRACT handler
...
Should be `retracting` and not `retract`
10 years ago
d27c82a450
Added check for Delta printers in Mesh, #error not yet supported.
10 years ago
9a093b2e8f
Added #error + mention not to enable ABL and Mesh at the same time
10 years ago
6ae714894e
Now the simplycistic solution.
...
Just and only display splashscreen only once.
10 years ago
d521693641
Revert "Draw content in display loop only when needed"
...
This reverts commit bf04a92cc0
10 years ago
b6f2bff461
Azteeg X3 Pro Pin fix ups
10 years ago
d867c18535
Fix compile error with Z_DUAL_ENDSTOPS
10 years ago
46474cf2f2
Incorporate @section headers from configurator
10 years ago
cf66cb8808
Bring configurator up-to-date
10 years ago
1a5293c2ce
Prevents MINTEMP / MAXTEMP when no heaters present
...
This commit checks whether or not HEATER_0 is in use, and if not, skips
the MIN / MAX temperature checks.
10 years ago
5360158545
Merge branch 'Development-Marlin' into Development
10 years ago
bf04a92cc0
Draw content in display loop only when needed
...
Example for splash screen.
10 years ago
9865318f1c
Disable splash-screen when done once
...
Splash screen was shown with every display init.
That means every time the menus where entered.
Note the 2 in the initialisation.
The buffer is already written in two steps a 512 byte.
Without the 2 only the upper half is shown.
10 years ago
53eb662908
Have the configurator read from MarlinFirmware repo
10 years ago
d24ea7c03f
Added Comment in hope of github seeing these updates
10 years ago
61de6ecd54
Added change to example Configuration.h's
10 years ago
2f0081bbb5
Compile error fix! Fix for merge artifacts.
10 years ago
0e6514e7bd
Bug fix! Missed putting z value back in right slot after zigzag mod.
10 years ago
ea10601406
Merge branch 'Development-Marlin' into Development
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
10 years ago
cb02bc6db4
Merge pull request #1817 from AnHardt/dogm_looptest
...
Execute DOGM display-loop less often
10 years ago
b02a55e60f
Fixed scara directions
...
Config said for a delta instead of for a scara
10 years ago
6c5f07c5cb
Merge pull request #1813 from thinkyhead/fixup_probing
...
Fix bad thermal runaway trigger
10 years ago
340d165a9c
Reduce display updates for dogm displays
...
In 'if (encoderPastThreshold || LCD_CLICKED)' lcdDrawUpdate was not set.
'lcd_status_update_delay'-loop was not effective in function
lcd_status_screen().
The loop prevented the update of the status screen but not the displays
update.
Shifted the loop into lcd_update().
10 years ago
418d22d7b3
Revert "Testloop cleanup"
...
This reverts commit 6361404b91
10 years ago
6361404b91
Testloop cleanup
...
Shifted condition should still be in.
10 years ago
6d4b3f0d6a
Move the condition before the loop
...
Result see: https://youtu.be/AEnBzdu9_tk
Dot is moving not so fast -> less executed loops.
10 years ago
4cb7dfc546
Move the 'alive dot' in every displayloop
...
Result see: https://www.youtube.com/watch?v=tdu7J0i-c4g
Loop is executed several times per display update.
10 years ago
b0f198c153
heater_index above its use
10 years ago
60f8e0386f
More thermal runaway states
10 years ago
f9dbd73652
Fix tr_target_temperature type - float!
10 years ago
c83faa9c5e
Merge pull request #1811 from thinkyhead/fixup_probing
...
Compare indices instead of floats for probe actions
10 years ago
61f8394361
Compare indices instead of floats for probe actions
10 years ago
a98183b463
Merge pull request #1809 from Wackerbarth/LanguageCleanup
...
Deferring default definition made #undef unnecessary
10 years ago
41ded7e996
Merge pull request #1805 from thinkyhead/fixup_probing
...
Optimize coordinate copying, fix EXTRUDER_RUNOUT_PREVENT
10 years ago
4119738e69
Deferring default definition made #undef unnecessary
10 years ago
6f06d33be5
Fix missing refresh_cmd_timeout function
10 years ago
2d099a2c70
Fix missing backslash in macro
10 years ago
0f9b29e6c5
Merge pull request #1803 from Natealus/Development
...
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
10 years ago
0935084141
Fix manage_inactivity
...
- Document `manage_inactivity` function
- Allow `EXTRUDER_RUNOUT_PREVENT` to work with all extruders
- Use faster `memcpy` for copying coordinates
10 years ago
c065da52ec
Spacing and spelling
10 years ago
a3e129e091
Merge pull request #1801 from thinkyhead/fixup_probing
...
Minor optimizations
10 years ago
ab11f90da0
Z_PROBE_ENDSTOP Pin for Azteeg X3 Pro
...
Just a simple #ifdef Z_PROBE_ENDSTOP to define the pin for it. Also has
a couple commented lines for switching Z_MIN_PIN if needed.
10 years ago
8680b515b0
Fix missing tmp_extruder -> target_extruder
10 years ago
a6ba40ae48
Compiling error temperature.cpp with multiple extruders defined
...
It wouldn't compile because of this line in temperature.cpp it turns out
it was just a stray ( that didn't line up with the previous lines so I
just made it in line with the rest and it compiled fine.
10 years ago
fc3c76fc16
Fix #1800
10 years ago
c185912c19
Latest upstream commits, mostly
10 years ago
1e5c18bb14
Add code_value_short and SERIAL_CHAR
10 years ago
e0d4368cb5
Minor code cleanup, move NUM_AXIS out of config
10 years ago
4c7af484f8
Merge pull request #1787 from thinkyhead/fixup_tr
...
Fix: thermal_runaway_protection triggered by target temperature increase
10 years ago
c747becec1
Merge pull request #1796 from thinkyhead/pidbed_temp_eeprom
...
Add PIDTEMPBED to EEPROM
10 years ago
84e4edaea7
Add M48 comment for #1794
10 years ago
9ba55baa5b
Track target temperature separately for each heater
10 years ago
528e32a1d4
Fix timeout in thermal_runaway when temperature is set higher
10 years ago
b98ebd517e
disable / enable_all_steppers functions
10 years ago
713953d8c1
Upstream commits, allow no extruder in M105
10 years ago
8f893eb8df
Merge pull request #1798 from thinkyhead/fixup_probing
...
Fix probe height at G28 start
10 years ago
dde7e11f8e
Merge branch 'Development' into fixup_tr
...
Latest upstream commits
10 years ago
abd7fc36b6
Fix probe height at G28 start
10 years ago
610c8c5471
Merge pull request #1795 from thinkyhead/fixup_probing
...
Finish pin tests
10 years ago
e4934164e4
Merge pull request #1790 from Wurstnase/fix_home_z
...
fix feedrate for homing z
10 years ago
a469d796e1
Add cleanups needed for #1772
10 years ago
c0ca26cd50
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
10 years ago
5c1f08a35f
Merge pull request #1772 from croadfeldt/Merge_cleanup
...
Z_PROBE_ENDSTOP
10 years ago
db7b0ea0cf
Merge pull request #1569 from Wackerbarth/Development
...
Incorporating Build Numbers
10 years ago
92119d0f7d
Static delta[] for SCARA
10 years ago
007a4bd421
Adjust spacing in view function
10 years ago
424d5495e4
Add PIDTEMPBED to EEPROM
10 years ago
6b919e14c1
Group all universal variables
10 years ago
21cd2e4fae
Merge branch 'Development' into fixup_probing
...
Latest upstream commits
10 years ago
0e8182bbf2
Additional pin tests, cleanup
10 years ago
45565b680d
second wrong feedrate
10 years ago
581b2aae04
fix feedrate for homing z
...
max_feedrate is in mm/s. line_to_destination needs a feedrate in mm/min because there is feedrate/60.
10 years ago
48b1c3822f
Merge branch 'Development-Marlin' into Development
10 years ago
ccdaea51ba
Add KosselPro
10 years ago
f4599143eb
Allow M115 to better reflect the build
10 years ago
34c7d45879
Hook for Auto-generated Build Version
...
The automatic versioning system extracts a
build version number from the SCM system
That versioning information is written to the file
_Version.h, a file that is NOT preserved in the SCM.
If such a file will be present,
we include it here to utilize the parameters
that are defined therein.
10 years ago
c756b4cf07
Comment tweak
10 years ago
23cd54755f
Fix typo in Marlin_main.cpp
...
related to current_position[Z_AXIS] and retract_zlift.
'+ =' -> '+='
Fix for #1786
10 years ago
e96df67630
Clarify thermal_runaway_protection
...
- Add comments documenting `thermal_runaway_protection`
- Add an enum for the thermal runaway states
- Add macros for temperature helper functions
- Fix a glitch with the z probe sled in homeaxis
10 years ago
0afe6696f0
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
10 years ago
59994bd519
Not doing network admin work, pin not ping... :)
10 years ago
916f59e35f
Spaces not tabs in language.h.
...
Catch unlikely but possible error and head crash when using
Z_PROBE_REPEATABILITY_TEST
10 years ago
66b3b53e76
Merge pull request #1762 from AnHardt/MiMa
...
Fix MIN&MAX temperatures again
10 years ago
6b91b7b411
Mesh bed leveling: Added G29 S3 + finer steps in manual probing.
...
* Use "G29 S3 Xn Yn Zn.nn" to modify bad probed point manually
* Changed manual Z steps from 0.05 to 0.025 and made brought it to Configuration.h
10 years ago
26dc80bf2d
Typo fixed...
10 years ago
2966ae2022
Fix Z_PROBE_PING not declared, allows code to compile if Z_PROBE_ENDSTOP
...
is not used.
10 years ago
67d5e7973e
old bump_divisor for cartesian/corexy-printer
...
some people are starting to ask why homing is so slow. this is the old standard hard-coded value.
10 years ago
bb41edc2ef
Fixed extra #endif
10 years ago
a57862e29f
Cleaning up code in prep for merge with upstream.
10 years ago
745d9fe1a4
Merge remote-tracking branch 'MarlinFirmware/Development' into Merge_cleanup
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
488666832b
Remove the previously introduced ()
10 years ago
443468df8d
Merge pull request #1771 from AnHardt/iss1770
...
Added new - changed entries from Fix up LCD_PROGRESS_BAR
10 years ago
9593f09b99
Merge pull request #1764 from thinkyhead/probe_leveling
...
Fix homing and leveling
10 years ago
72c7de3570
Cleanup M48
10 years ago
97a258b0b0
Clean up, document home_axis
10 years ago
831016b09f
Added new - changed entries from Fix up LCD_PROGRESS_BAR
...
for when no LCD is defined.
Fix for #1770 .
10 years ago
a508d835db
Changed Z_PROBE_AND_ENDSTOP to Z_PROBE_ENDSTOP.
...
Updated documentation in Configuration.h.
Cleaned up and commented some code relating to Z_PROBE_ENDSTOP.
Separated Z_MIN_ENDSTOP and Z_PROBE_ENDSTOP completely.
10 years ago
fdb4ddbdea
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
d273c90d53
Added support for Atmega 1281 chip
10 years ago
1c7391717e
Include sync_plan_position_delta for SCARA also
10 years ago
8231fb166d
Merge pull request #1758 from AnHardt/MENU_MULTIPLIER_ITEM
...
Fix: Audio feedback for MENU_MILTIPLIER_ITEM click
10 years ago
0b57a2ab8b
Merge pull request #1757 from bq/Translation-strings
...
Added new trasnslatable labels.
10 years ago
18bb6be80e
Fix homing and leveling
...
- Include the current Z when raising the axis after and between probing
- Add `sync_plan_position_delta` for parity with `sync_plan_position`
- Clean up and clarify `M48`, `dock_sled`, and others
10 years ago
3f2e863206
Improve conditions for HAS_TEMP
...
and use them in temperuture.h
Flattened the if structure - the preprocessor is doing the work - not the Arduino. Arduino.
10 years ago
85f8a26ba4
Fix MIN&MAX temperatures again
...
replaced GE0 with th matching GEX in the second row.
added some ()
10 years ago
19b11dfdd7
Fix can't enter MENU_MULTIPLIER_ITEM
10 years ago
c89b8368ee
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
d08782386b
Added new trasnslatable labels.
...
* Added MSG_END_HOUR and MSG_END_MINUTE labels to all language files.
* Available translations:
EN, FR, DE, ES, IT, PT, PT-BR.
10 years ago
97a69d9b1c
Correct XYZ after obtaining plan_bed_level_matrix
...
The current position needs to be updated by using the inverse
`plan_bed_level_matrix` on X, Y, and Z. All moves in the planner are
transformed by the `plan_bed_level_matrix` from this point forward.
10 years ago
5f6962dd90
Merge pull request #1755 from thinkyhead/fixup_config
...
Raise when not retracting
10 years ago
ae89ccd2c7
Use Z_RAISE_BETWEEN_PROBINGS
10 years ago
9a5a7a3f68
Raise when not retracting
...
Code to raise the probe before retraction is good, but the code should
always raise the probe, not just when retracting
10 years ago
6ff1620fcb
Merge pull request #1753 from thinkyhead/fix_extruder_offset
...
Fix EXTRUDER_OFFSET compiler error
10 years ago
cda4bd4ad9
Correct the comment about M206
10 years ago
935592cf6a
offsets off by default
10 years ago
2a45922afe
Restore extruder_offset, init more simply
10 years ago
28792e5731
Fix typo in assignment
10 years ago
bb6174524f
Fix EXTRUDER_OFFSET compiler error
...
- Addressing issue #1741
10 years ago
571652c49b
Fix LCD click
...
- Make the default LCD click sound more pleasant
- Fix warnings about bed temperature runaway
10 years ago
45ece5afb1
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
10 years ago
17707e7479
Fixed Z_PROBE_PIN pullup bug.
...
Documented some additional areas that should be addressed if Z_PROBE is
fully separated from Z_MIN or Z_MAX.
Fixed a documentation error in sanity checks. Servos start at 0 not 1.
10 years ago
21ab44cfa7
Merge pull request #1750 from thinkyhead/fixup_config
...
Bring all configs up to date
10 years ago
50145266cd
Merge pull request #1748 from thinkyhead/raise_before_homing
...
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
a117b6bff6
Merge pull request #1747 from thinkyhead/progress_bar_tweak
...
Fix up LCD_PROGRESS_BAR
10 years ago
3348b3bf0c
Allow SD_FINISHED_RELEASECOMMAND to be undefined
10 years ago
82794fa5f7
Add delta generic not renaming
10 years ago
ba2c7cb467
Update configs with all the latest
10 years ago
ec1d9c0b8f
Use Z_PROBE_ENDSTOP_INVERTING when checking pin status.
10 years ago
3175c70c79
Manually synching back up with MarlinFirmware/Development.
10 years ago
faac2af4af
Merge remote-tracking branch 'origin/Development' into Development
10 years ago
3be00cce6f
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Configuration.h
10 years ago
e08f8eed05
Revert 06f767d..cba5692
...
This rolls back to commit 06f767d608
10 years ago
5e82ed4f30
Restore ENDSTOPPULLUPS in Configuration.h
10 years ago
992b07ca57
Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled.
10 years ago
cba5692673
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
10 years ago
8500c80b33
Apply Z_RAISE_BEFORE_HOMING before homing XY
10 years ago
92b54aa27e
#define HAS_POWER_SWITCH
10 years ago
5519882eea
Fix up LCD_PROGRESS_BAR
...
- Some messages should not expire with `PROGRESS_MSG_EXPIRE`.
- Simplify conditional for progress bar with sanity checks.
- Rename `messageTick` to `expireStatusMillis` and make it the expire
time.
10 years ago
6864280803
Use elif and parentheses in conditionals
10 years ago
8c136a5ab5
Conditionals and comments for PS = 0
10 years ago
2faed961ce
Allow POWER_SUPPLY 0 for no power switch
10 years ago
baa6787393
Merge pull request #1740 from thinkyhead/fixup_homing
...
Apply leveling for DELTA
10 years ago
9ac7dc675e
Make filament display on dogm_... same as hitachi...
...
Thanks @MagoKimbra.
10 years ago
50a732360a
Replace extrudemultiply by extruder_multiply[active_extruder]
...
Fix for #1460 .
Seems to work with only one extruder. Can't test this myself with more.
10 years ago
e63076504d
Merge pull request #1733 from AnHardt/c20
...
Get back folder symbols on Hitachi displays
10 years ago
41d258697a
Pass the z for after probing to retract_z_probe
...
A `z_before` value is passed to probe_pt, but the `retract_z_probe`
function assumes that Z is 0, doesn’t add `current_position[Z_AXIS]` as
other cases do. This may be superfluous, so this is a test, and will be
reverted if it has no effect.
10 years ago
06f767d608
Merge remote-tracking branch 'upstream/development' into development
10 years ago
b47fa8c064
Merge pull request #1735 from AnHardt/compilerCandy
...
Remove some further warnings
10 years ago
e96db1cd6c
Make G29 shared function inline
10 years ago
d73b169de3
Apply leveling for DELTA,
...
- Fix `prepare_move` function not calling `adjust_delta`
- Add more shorthand for plan_buffer_line.
- Fix wrong `federate` usage, assuming they are all mm/m
- Minor `stepper.cpp` cleanup
10 years ago
85b67e5223
Merge pull request #1738 from thinkyhead/fixup_homing
...
Fix G29 E and M48 n
10 years ago
ce44bee28b
Small code reduction
10 years ago
0213f7f016
Cleanup case for M666
10 years ago
803425e12c
Fix G29 E and M48 n
...
- Users prefer `G29 E` to work like `M48 E` so fixed that
- `M48 n` replaced with `M48 P` (or `p`). `n` legacy support
- Shorten some strings to save precious bytes
- Smaller code for 3-point probing
10 years ago
1e9999711c
Merge pull request #1736 from thinkyhead/fixup_homing
...
Fix G28 homing Y with X
10 years ago
d738b7acdd
Merge pull request #1724 from Natealus/Development
...
Viki 2 Pins from Manual and Azteeg X3 Pro Endstop Reswap
10 years ago
e8ae51bfe3
Fix G28 homing Y with X
...
- Fixed a typo causing G28 to home incorrectly
- Added documentation to G28
- Added homeXYZ bools to neaten the code
- Added a note about home_offsets being questionable
10 years ago
7b2550a604
Times can't be negative.
...
cardreader.cpp needs temperature.h for autotempShutdown() when
AUTOTEMP is defined but warns about unused variables.
Unpublished variables by putting them in to temperature.cpp.
10 years ago
507efa771b
Remove unused variable fan_rot
...
and satisfy the compiler about the implicit compare.
10 years ago
2b959a7752
Some additional {} to make the compiler happy.
10 years ago
0f1bd6e4a7
In ST7920_SWSPI_SND_8BIT(uint8_t val) parameter is unsigned
...
therefor in macro ST7920_WRITE_BYTE(a) cast a to uint8_t
to make the compiler happy.
10 years ago
81bab8739d
Get back folder symbols on Hitachi displays
...
and make use of column 20.
10 years ago
a9802c95b3
Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is.
10 years ago
62834a1c43
Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,
...
unless Z_SAFE_HOMING is.
10 years ago
666fad3494
Typo fixed in sanity check.
10 years ago
08a7aa16c5
Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined.
10 years ago
80285251cc
More config cleanup work for Z_PROBE_AND_ENDSTOP.
10 years ago
fe4549cd83
Config file Z_PROBE_AND_ENDSTOP description clean up.
10 years ago
82d2f11129
More additional sanity checks for Z_PROBE_AND_ENDSTOP
10 years ago
05134f0807
Additional Sanity Checks for Z_PROBE_AND_ENDSTOP
10 years ago
c75a5e8c55
Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h.
...
Confirmed Sanity checks are working.....
10 years ago
a98ac4033b
Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support.
10 years ago
6125124d6c
Config file cleanup for Z_PROBE_AND_ENDSTOP support.
10 years ago
324c14943b
Bug fixes for Z_PROBE_AND_ENDSTOP.
...
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
10 years ago
ca5821aa57
Made #ifdef DELTA branch instead
...
Another fellow here gave me the idea to do it this way
10 years ago
04fda6b3e9
Undesired behavior with endstops swapped
...
Made my swap commented out so its the option not the default.
10 years ago
ca1477d830
Revert "Undesired behavior with endstops swapped"
...
This reverts commit 15028e9b08
10 years ago
15028e9b08
Undesired behavior with endstops swapped
...
I made my changes to swap MIN and MAX endstops on the Azteeg X3 Pro the
option rather than the default to fix unexpected reversal.
10 years ago
18245c6cd2
Update pins_RAMBO.h
...
Updated for the changes that Thinkyhead made before I submitted mine.
10 years ago
234a9d0b12
Viki 2 Pins from Manual
...
I added in the pins into the new board files for the Azteeg X3, X3 Pro,
Printrboard, and Rambo. I'm sure it can be added for others too but
these are the manual specified pins. Just like many things here though,
I can't test for the boards other than the Azteeg X3 Pro. Hopefully it
works smoothly for everyone who happens on this nifty display. :)
10 years ago
a22efc5f11
Merge pull request #1597 from Wurstnase/g29_auto_script
...
G29 auto script
10 years ago
62a3da9618
Merge pull request #1723 from thinkyhead/tweak_g92
...
Tweak G92
10 years ago
afff968e88
ARRAY_BY_EXTRUDERS, shorthand to sync planner
...
- Add some documentation to planner and stepper headers
- Patch up RAMBO pins with undefs
- Add `sync_plan_position` inline to set current XYZE
- Swap indices in `extruder_offset` to fix initialization values
10 years ago
2b0c25a091
Tweak G92 to call plan_set_position only once, yes?
10 years ago
22bea37393
Azteeg X3 Pro Pin Revisions
...
I added the fan pins in here and left them at -1 in configuration_adv.h
and it works fine. Pinned for a 4 extruder from 1-4 and HE5 being the
controller fan, HE6 being the Extruder Auto Fan/Water pump in the Kraken
case, and HE7 being for part cooling fan. Added in descriptions for the
MIN MAX pin swap and for servo motor additions.
10 years ago
93dc0d0518
Merge pull request #1718 from AnHardt/blink
...
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
10 years ago
edb67ea165
Patch generic delta config
...
- Addressing issue mentioned at #1699
10 years ago
c481c3b180
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
...
to avoid warnings about unused blink.
Concentrate definitions of variables in dogm_lcd_implementation.h to one place.
Make only local used variable currentfont static.
10 years ago
059052889f
Further Sanity Checks for Z_PROBE_AND_ENDSTOP.
10 years ago
8b81f20c61
Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to
...
be.
Added Sanity Check for it.
Added hook so it's enabled.
10 years ago
fd823449ad
Added serial message for Z Probe trigger.
10 years ago
92eb8109ab
Fix declaration of old_z_probe_endstop.
10 years ago
44b88b41a2
Added credit for code.
10 years ago
2979b40a7a
Fixed typo in Z Probe and Endstop section.
10 years ago
9f3ff14008
Enabled separate Z Probe and Z Axis endstop use at same time.
...
Typo fixes in comments in existing code.
10 years ago
b14be7235e
Merge pull request #1585 from galexander1/strtod_e_fix
...
Fix `code_value` (so `G1X1E2` isn't evaluated as `G1 X100 E2`)
10 years ago
ba871e46bf
Fix compiler warnings
...
- Patched up for most included configurations
10 years ago
ffe0df4b36
Latest upstream commits
10 years ago
bc2f249cc6
Merge pull request #1622 from AnHardt/tm-utf-minus-kanji
...
The big Language Pack
10 years ago
abfcbd793f
Merge pull request #1693 from chris-bo/rework_lcd_beeper
...
use only one implementation for beeper feedback
10 years ago
55739a4efe
Fix Z_APPLY_STEP
10 years ago
df02b992b0
Fix redundant_temperatrure_raw setting
10 years ago
fe29bdd72b
Also fix temperature externs
10 years ago
578f93bc26
Fixup temp arrays and leveling equation, prepare for merge
10 years ago
7d472367e2
Merge pull request #1713 from epatel/Development
...
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
10 years ago
ce485175eb
Give all temp arrays 4 indices
10 years ago
782464ea4d
Parentheses need here otherwise sanitycheck.h does wrong thing on line 222
10 years ago
460f73056b
Fix ECHOPAIR ambiguity
...
- Also patch up some warnings
10 years ago
19d418cd6a
Fix up the code to eliminate warnings
10 years ago
b2496533c6
Put " M" into pmem
10 years ago
267d6bef15
Eliminate most warnings
...
- Fix a bug reading `code_value` for `M503 Sn`
- Hide and remove unused variables
10 years ago
3fd7790a15
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
b76a352d41
Fix the planeNormal calculation
10 years ago
410f64782a
Always 4 temp sensors
10 years ago
0b32431551
Remove abs() from planeNormal.z
10 years ago
53169d96e8
Set temp_meas_ready in set_current_temp_raw
10 years ago
06eb7f5b3c
Latest upstream commits
10 years ago
04328d7537
Add zprobe_zoffset in set_bed_level_equation_*
...
- Also a small tweak to SanityCheck.h
10 years ago
d2e73545ba
Merge pull request #1705 from AnHardt/ddt
...
Avoid warnings in SanitiCheck.h
10 years ago
78090275a9
Fix probe range editing
...
- Increase the probe offset range to -20…20
- Apply the range limits to the menu item
10 years ago
1ff6df8f9e
Avoid warnings in SanitiCheck.h
...
/SanityCheck.h:107:53: warning: missing terminating ' character
...
10 years ago
ebe5b87c2c
< like in the oher compareble loops
...
to avoid:
Marlin_main.cpp:1790: warning: array subscript is above array bounds.
10 years ago
20f909567a
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
README.md
Solved
10 years ago
eab5fad539
code formatting
10 years ago
abadeac08d
Group zprobe_zoffset with bed leveling
10 years ago
9e8427f253
Merge pull request #1698 from zeuseye/Development
...
Clean "fromsd" array if not SDSUPPORT
10 years ago
32331faee4
Prettify Bed Level Correction Matrix
...
- Put + in front of positive values in the output
10 years ago
f5f4c2b366
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
7667023817
Merge pull request #1694 from Wurstnase/fix_z_config
...
comment #define Z_DUAL_STEPPER_DRIVERS
10 years ago
5eff15c409
Merge branch 'Development' into fixup_leveling
...
Latest upstream commits
10 years ago
ad05a726c1
Merge pull request #1691 from AnHardt/PID_dt
...
Move definition of PIDdT back to temperature.h
10 years ago
5261d35737
Fix custom m-code behavior
...
Don’t set CUSTOM_M_CODE_SET_Z_PROBE_OFFSET if there’s no Z probe
10 years ago
fbf9b21e0c
Merge plus fixup zprobe_zoffset
...
- Make `zprobe_zoffset` conditional
- Fix ConfigurationStore for `zprobe_zoffset`
10 years ago
96b5da7198
Fix up bed leveling code
...
- Init `zprobe_zoffset`
- Remove `current_position[Z_AXIS] = zprobe_zoffset` lines from the
`set_bed_level_equation_*` functions
- Apply standards to `mesh_bed_leveling` files
- Document `MESH_BED_LEVELING`
10 years ago
02b4f5f9cd
Merge pull request #1689 from AnHardt/MAXand161
...
Fix MAX6675 again and introduce set_current_temp_raw()
10 years ago
f680e509c4
Enclosed error-messages for TEMP_SENSOR_1_AS_REDUNDANT in PSTR()
10 years ago
d43d47da14
Clean "fromsd" array is not SDSUPPORT
...
if not have SDSUPPORT the fromsd array is not necessary
10 years ago
ac81b4084f
Make variables and function static.
10 years ago
55025558dc
Implement Dry-Run mode in G29
...
It just probe all the bed without appliying the matrix.
Useful after a first G29 to check the topology.
10 years ago
a4ad9117dd
comment #define Z_DUAL_STEPPER_DRIVERS
10 years ago
2dfd0e5ce7
Update Configuration.h
...
documentation how to disable buzzer feedback
10 years ago
4c3cbc0961
use only one implementation for beeper feedback
10 years ago
01cc97a3c3
Corected condition for PIDdT
10 years ago
94330705c7
Move definition of PIDdT back to temperature.h
...
make it unconditional
remove all definitions in the 'Configuration.h's
remove form 'Conditionals.h'
10 years ago
dd0067afa6
Fix MAX6675 again and introduce set_current_temp_raw()
...
to make the temperature-code work again with Arduino 1.0.6.
Sorry could not make an extra block on base level.
10 years ago
8848b7e9ef
Add the missed {} to END_MENU in ultralcd.cpp
...
what caused an extra update of encoderLine most of the time.
10 years ago
4beffbca69
Make SMALL_INFOFONT configurable.
...
Tweak the documentation
10 years ago
045ea42cc8
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
c2ba5d0c09
Fix ZigZag and Topograph table
...
ZigZag: Inverted Behavior.. If T supplied, it does not zigzag.
Topograph table: The table was rotated 90º clockwise.
10 years ago
0ce3576685
New Feature: Z_DUAL_ENDSTOPS
...
Z_DUAL_ENDSTOPS is a feature to enable the use of 2 endstops for both Z
steppers - Let's call them Z stepper and Z2 stepper.
That way the machine is capable to align the bed during home, since both
Z steppers are homed.
There is also an implementation of M666 (software endstops adjustment)
to this feature.
After Z homing, this adjustment is applied to just one of the steppers
in order to align the bed.
One just need to home the Z axis and measure the distance difference
between both Z axis and apply the math: Z adjust = Z - Z2.
If the Z stepper axis is closer to the bed, the measure Z > Z2 (yes, it
is.. think about it) and the Z adjust would be positive.
Play a little bit with small adjustments (0.5mm) and check the
behaviour.
The M119 (endstops report) will start reporting the Z2 Endstop as well.
10 years ago
c686069ccd
Revert "Remove 6x9 font"
...
This reverts commit e6cb8ee188
10 years ago
b00a531df8
Revert "Removed now unneded FONT_STATUSMENU"
...
This reverts commit 8c5bb38748
10 years ago
9d589cbb2a
Merge https://github.com/MarlinFirmware/Marlin into tm3-utf-minus-kanji
...
Conflicts:
Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Marlin/language.h
Conflicts solved
10 years ago
8db4fd7177
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
0d81abe1c9
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
01740fd9c6
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
fc53e43de6
Don't test raw temp for MAX6675
...
- Remove test of raw temp for thermistor 0 when using MAX6675
- Longer `raw_temp_value` array for `TEMP_SENSOR_1_AS_REDUNDANT`
10 years ago
03fa9fae9f
Merge branch 'Development' into fix_temperature_minmax
...
Latest upstream commits
10 years ago
1fac388664
Revert measurement loop
10 years ago
703f3b38c4
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
37cde8a191
Report changes from previous PR from old code base including :
...
I've updated the minimum values from the LCD.
It has been a while that i want to at least fix this.
I have an inductive probe and often i need to set my zOffset to something lower than 0.5.
With the current implementation, the default LCD value is set to 0.5 for some reason.
On my case i need to be able to set it down to 0.0 as my inductive probe can be lower than 0.5.
Before with the LCD we couldn't change this value below 0.5. We had to flash the firmware every time which was painful.
Now we are able to change this value down to 0.0 if needed.
I've also changed the minimum value for Z min acceleration.
In the default configuration it's set to 25 but on the LCD the minimum was 100 which is not coherent.
I've changes the minimum to 10. On this axis, depending on the mechanics/motor drivers we might require very low acceleration, so i guess 10 is somehow realistic.
10 years ago
b26a3ea02c
Merge pull request #1662 from josla972/refactor_scara
...
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
e6f6c6e3a1
fix bad insertion config again
10 years ago
6bdee87be3
Cleanup temperature code
...
- Get rid of unused temp states in the ISR, resulting in more frequent
temperature reading with fewer sensors
- Shrink code slightly in min/max testing
10 years ago
34a41648ab
Merge branch 'Development' into planner_oh_planner
...
Latest upstream commits
10 years ago
4fbb80567e
Get upstream commits
10 years ago
7717e1ce33
Fix bad insert in configuration
10 years ago
146501215f
Fix mangled probe_pt calls
...
- Address issue #1669
- Remove the TOPO_ORIGIN configuration setting
10 years ago
15345cc249
Corrected Z_PROBE_ALLEN_KEY behaviour.
10 years ago
0f034dd97e
Clean up Z_RAISE_AFTER_PROBING to work the same in all code paths except Z_PROBE_SLED.
10 years ago
6c96f32069
Blind fix for #1507
10 years ago
379348487e
Removed malplaced comment.
10 years ago
8bd6e37b21
Merge pull request #1661 from thinkyhead/G92_no_offset
...
Don't add home offsets in G29
10 years ago
582cd780cd
Fix compile error with `*_DUAL_STEPPER_DRIVERS`
...
- Patch up macros in stepper.cpp
10 years ago
9b3462f73f
Refactor SCARA calibration. Save some lines of code and possibly ROM.
10 years ago
691e753cc3
Don't add home offsets in G29
...
- Address #1262 by leaving values as set
- Rename `add_homing` to `home_offset`
10 years ago
88e81a4804
Latest upstream commits, plus fixes
...
- Also add Manual Bed Leveling to the rest of the configs
10 years ago
15eb5d35a2
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
19df90622b
Include Conditionals.h file in update
10 years ago
9b639b4135
Merge pull request #1619 from epatel/manual-bed-leveling+mesh-bed-level
...
Manual bed leveling + mesh bed leveling
10 years ago
2c9bd15625
Move LCD items to `Conditionals.h`
...
- `Conditionals.h` is included twice, setting LCD values the first time
10 years ago
63abeaff38
Merge branch 'Development' into config_testing
...
Latest upstream commits
10 years ago
3703694e30
Fix temperature min/max test
...
- Base tests on all thermistors/thermocouples, not just heater 0
10 years ago
3d0a060a7a
Added G29 command
10 years ago
c516747847
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
af14c684b5
Minor optimizations to planner code
...
- Prefetch values used more than once
10 years ago
13fbf42d95
Cleanup of planner code
...
- Use named axis indexes, `X_AXIS` etc.
- Replace `block.steps_A` with block.steps[A]`
- Replace `A_segment_time` with `segment_time[A]`
- Add `A_AXIS`, `B_AXIS` for `COREXY` axes
- Conditional compile based on `EXTRUDERS`
- Add BLOCK_MOD macro for planner block indexes
- Apply coding standards to `planner.h` and `planner.cpp`
- Small optimizations of planner code
- Update `stepper.cpp` for new `block` struct
- Replace `memcpy` with loops, let the compiler unroll them
- Make `movesplanned` into an inline function
10 years ago
64e3d33893
Fix shrinked menucode
...
by updating 'encoderPosition' in END_MENU() line 1.
10 years ago
a7e89d4cfa
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
8c5bb38748
Removed now unneded FONT_STATUSMENU
10 years ago
2176a22d42
Fix count_direction initializer
...
- Addressing #1625
10 years ago
e72cb3e45d
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fix merge conflicts 2
10 years ago
cb6942d4a7
Merge branch 'Development' into config_testing
...
Get upstream commits
10 years ago
6bfccaf99e
Merge https://github.com/MarlinFirmware/Marlin into tm2-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/ultralcd_implementation_hitachi_HD44780.h
Fixed conflicts 1
10 years ago
5644ad6809
Fix hiliting of edit items
10 years ago
63d5d28085
Merge branch 'Development' into config_testing
...
Latest upstream changes
10 years ago
526a755a66
Merge pull request #1652 from AnHardt/PIDdebug
...
PID debug
10 years ago
a1c240b0a4
Delta supports some auto bed leveling options
10 years ago
5112cf8422
Added comment for the EEPROM storage
10 years ago
4619d80524
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
199151a4ed
Merge pull request #1650 from AnHardt/beautify
...
Beautivy statusscreen
10 years ago
2424713a8f
Merge pull request #1640 from AnHardt/warning6
...
codepos not used in gcode_M28()
10 years ago
b6d381f863
Divide up Conditionals to get LCD items early
10 years ago
e85061d20d
Added changes to the 'new' Configuration.h s
10 years ago
33c7c6e11d
Conditionals.h requires Arduino.h
10 years ago
8ade04b78e
Felix and Hephestos configs
...
- Not sure why these are showing as all new
10 years ago
670006b919
Remove invariant code from Configurations
...
- Add `Conditionals.h` with calculated configuration values
- Add `SanityCheck.h` with checks for configuration errors
- Remove equivalent code from all configurations
- Move error checks from some sources to `SanityCheck.h` also
- Fix initialization of count_direction in stepper.cpp
10 years ago
a61f679568
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
c87faa69ed
Shortened mesh_plan_buffer_line()
10 years ago
47c1ea72af
Merge https://github.com/kieranc/Marlin into PIDdebug
...
Conflicts:
Marlin/temperature.cpp
Cleaned merge conflict.
Codeposition had changed.
Variable pid_input had vanished.
Signed-off-by: AnHardt <github@kitelab.de>
10 years ago
f1d3d1524d
Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify
...
Conflicts:
Marlin/dogm_lcd_implementation.h
solved merge conflict.
10 years ago
fa889cd6e1
Beautivy statusscreen
...
by shifting things some pixels around
10 years ago
7279e4f82f
Small code tweaks re lcd.print
10 years ago
90ba61b9b8
Include indicator for new drawmenu_generic
...
In the new method we pass the character that should be used for
selected state, not the character to print always.
10 years ago
15d29efad5
Pass sel to lcd_implementation_mark_as_selected
...
- Pass selected state directly to lcd_implementation_mark_as_selected
- Rename sel function parameter
- Include a minor fix for SdBaseFile.h
10 years ago
a547dc2148
Merge branch 'Development' into optimize_menu_code
...
Get upstream changes
10 years ago
9c1f6e7ac7
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
e650d4044e
Fix "Stop Print" function in the LCD menu
...
When one hit "Stop Print" option in LCD menu, the command buffer was not
cleared. The printer keep moving until the buffer has been emptied.
Actually I could not clear the command buffer as well.. I don't know
why, it doesnt work as expected.
I need to implement a routine inside Stepper ISR to handle such
situation.
10 years ago
e917477fec
Merge https://github.com/MarlinFirmware/Marlin into tm-utf-minus-kanji
...
Conflicts:
Marlin/dogm_lcd_implementation.h
Marlin/fonts/make_fonts.bat
Claerd conflicts with my own #1621 . (His was easy. :-) )
corrected typo in fonts/README.fonts
Applied changes to the new delta-configurations
and deletet there some extra whitespace at the line-endings.
10 years ago
ae01a6b5f2
Make use of codepos.
...
Saves one addition.
Needs one pointer on the stack.
Don't know if this is a go trade.
10 years ago
a534ac197a
Merge pull request #1621 from AnHardt/remove--6x9-font
...
Remove 6x9 font
10 years ago
80e0ee10ca
Merge pull request #1631 from AnHardt/iss1593
...
Decrease KILL_DELAY
10 years ago
4ce79920e5
Merge pull request #1635 from AnHardt/warnings1
...
Negative times are unlikly
10 years ago
76127b8a55
Merge pull request #1630 from Wurstnase/fix_g29
...
optional parameters must be named when ignoring order
10 years ago
be3f2dc1d9
Merge pull request #1636 from AnHardt/warning2
...
lcd_control_retract_menu() is conditional.
10 years ago
8d396584bf
Merge pull request #1637 from AnHardt/warning3
...
lcd_autostart_sd() has two conditions.
10 years ago
8664c6d465
Merge pull request #1638 from AnHardt/warning4
...
delta[3] not used when DELTA not defined.
10 years ago
10711ccc6a
Merge pull request #1639 from AnHardt/warning5
...
G4 could wait for an undefined time
10 years ago
28c91deb5c
EEPROM saving of z_values.
...
Tried to make it a little intelligent.
10 years ago
240b5cfe04
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
10 years ago
4521f6655b
Restore "S" parameter of M204 for retrocompatibility.
10 years ago
5ddb8d94e2
Update Documentation related to M204
10 years ago
f8c4d43886
delta[3] is used with SCARA
...
Shoot in the dark.
10 years ago
72a9fed4fb
codepos not used in gcode_M28()
...
Got:
Marlin_main.cpp:2567: warning: unused variable 'codepos'
Needs revision.
Don't now how this should look like.
10 years ago
b94dd33641
G4 could wait for an undefined time
...
Got:
Marlin_main.cpp:1689: warning: 'codenum' may be used uninitialized in this function
And indeed codenum is undefined when no parameter is given.
10 years ago
e90985a4e8
delta[3] not used when DELTA not defined.
...
got:
Marlin_main.cpp:387: warning: 'delta' defined but not used
Compiles cleaner when definition is removed.
10 years ago
5099b86ad4
lcd_autostart_sd() has two conditions.
...
got:
ultralcd.cpp:408: warning: 'void lcd_autostart_sd()' defined but not used
10 years ago
5d81c779cc
lcd_control_retract_menu() is conditional.
...
Got:
ultralcd.cpp:64: warning: 'void lcd_control_retract_menu()' declared 'static' but never defined
10 years ago
450b89e63c
Negative times are unlikly
...
While bunting an other bug I stumbled across:
ultralcd.cpp:1250: warning: comparison between signed and unsigned
integer expressions
Changed to the type of lcd_next_update_millis.
10 years ago
d1658eebfc
Decrease KILL_DELAY
...
Users hat to press kill-button for unexpexted lon times.
See #1593
10 years ago
00adb2a6c1
optional parameters must be named when ignoring order
10 years ago
0d43898a22
Remove of mesh_plan_buffer_line parameter reference (e)
10 years ago
8067a985ce
Merge branch 'Development' into manual-bed-leveling+mesh-bed-level
...
Fixed conflicts:
Marlin/planner.h
10 years ago
05333f61b7
fix macro
10 years ago
1883e1bb60
Applied thinkyheads corrections from 2015-03-17
10 years ago
be79235ef2
Add new (cleaner) Marlin font
...
with sources in /fonts
10 years ago
89fe77468d
Merge pull request #1586 from maverikou/delta_auto_bed_level
...
Delta auto bed level (Updated PR)
10 years ago
2b1ddc0413
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
cb676cdf39
Fix CoreXY homing bug introduced by PR #1606
...
The Check Endstop logic must be:
if (current_block->steps_x != current_block->steps_y || (TEST(out_bits,
X_AXIS) == TEST(out_bits, Y_AXIS)))
if (TEST(out_bits, X_HEAD))
not
if (TEST(out_bits, X_HEAD) && (current_block->steps_x !=
current_block->steps_y || (TEST(out_bits, X_AXIS) == TEST(out_bits,
Y_AXIS))))
Same applies for Y axis.
10 years ago
8a29dd4839
Cleaned typo in dogm_lcd_implementation.h
10 years ago
7e69f72db6
Moved font directory. Updated README.fonts
10 years ago
00b162a993
Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji
...
Conflicts:
Marlin/language.h
Conflict cleaned
10 years ago
e38dd5f030
Merge remote-tracking branch 'origin/utf' into utf-kanji
10 years ago
08e4651ece
Corrected cyrillic font again
...
Thank you @Nprod.
10 years ago
752c804677
remove offset, add minimum scan area
10 years ago
14f0250853
allow negative values
...
and some more comments
10 years ago
e6cb8ee188
Remove 6x9 font
...
in dogm_lcd_implementation.h
by using standard font and
shifting down temperature displays by one pixel
Saves 2300 bytes.
10 years ago
e93eb3e8d3
Update test
10 years ago
b8ae3feb9e
Update test
10 years ago
3570447ded
Fix Z_RAISE_AFTER_PROBING
10 years ago
8a739b6fba
Merge branch 'Development' into delta_auto_bed_level
...
Conflicts:
Marlin/Marlin_main.cpp
10 years ago
7629c4f05c
Cleanup for menu optimization
...
- Compare pr_char to space
- Fewer calls to lcd_strlen
10 years ago
3405f85a6a
Reduce size of menu code
...
- Get rid of _selected functions, passing selected state instead
10 years ago
e983a5ab92
Disable option. Enable for use/test.
10 years ago
f34b9c83d1
Added comment about MESH_NUM axis points.
10 years ago
a686c9878f
Move TOPO_ORIGIN define to Configuration.h
...
- Addressing issue #1608
10 years ago
8005d22c81
Added menu option for bed leveling.
10 years ago
0e51e53813
WIP. Adding bed leveling code.
10 years ago
d0d12962e0
Merge pull request #1615 from AnHardt/fix-1611
...
Fix #1611
10 years ago
f0dcea7e14
Fix #1611
...
Warning: suggest parentheses around comparison in operand of &
pretty much helped.
10 years ago
28b1c37dea
Fix for #1612
10 years ago
a8c1bdabd2
Update: readme.md for K8200 example
...
* readme.md: updated typo and URLs
10 years ago
2f374f1465
Removed Kanji.
10 years ago
5efc798642
Merge pull request #1546 from apollo-ng/pr-felix
...
Added support for Felix 2.0/3.0 printers
10 years ago
b83e52e50f
Merge pull request #1467 from thinkyhead/marlin_configurator
...
Configurator utility
10 years ago
7bc77dc134
Merge pull request #1583 from galexander1/m404fix
...
M404 should not use 'N' address as parameter because 'N' is reserved
10 years ago
b80ed51fcc
Fix controllerFan() code
...
- Add support for 4th extruder
- Fix parentheses matching
- Apply coding standards
- Address issue mentioned at #1575
10 years ago
4b50205f11
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
bb4cb1b15a
Merge pull request #1606 from thinkyhead/cleanup_stepper
...
Cleanup of stepper.cpp
10 years ago
63f41f56f8
Merge pull request #1607 from chris-bo/Development
...
Update ultralcd_st7920_u8glib_rrd.h
10 years ago
4eabd80025
Fix babystep for extruder_duplication
10 years ago
d3259d0dba
Merge pull request #1581 from msutas/Development
...
Filament Runout Sensor Feature
10 years ago
25c4f17e5d
Corrected Cyrillic fonts. Round II.
10 years ago
b73ba26b23
Update ultralcd_st7920_u8glib_rrd.h
10 years ago
c37f7d15c9
- Rename WRITE_E_STEP for consistency
...
- Add BIT and TEST macros
- Add _APPLY_ macros to stepper.cpp to help with consolidation
- Consolidate code in stepper.cpp using macros
- Apply standards in stepper.cpp
- Use >= 0 instead of > -1 as a better semantic
- Replace DUAL_Y_CARRIAGE with Y_DUAL_STEPPER_DRIVERS
10 years ago
44a205d9d9
Corrected Cyrillic fonts.
...
Cleaned typo in language_test.h Cyrillic part.
10 years ago
4d878b9bac
Fixed path typos in README
10 years ago
12ec557a75
Added DEFAULT_TRAVEL_ACCELERATION
10 years ago
1d25d510bc
Upstream Merge Fixes
10 years ago
a89d690b77
Merge remote-tracking branch 'upstream/Development' into pr-felix
10 years ago
cb57fc727d
Declare pid_output for PIDBEDTEMP
10 years ago
3d6deb9bdf
Simplify manage_heater
...
- Make separate get_pid_output(e) and get_pid_output_bed() function
- Reduce size of manage_heater function
- Hopefully work around linker errors
10 years ago
730497aaa1
Make use of ligatures in language_kana_utf8.h
10 years ago
3240d89f7d
Logic cleanup in utf_mapper.
10 years ago
2f3c77b751
Fix decimal places in G29 Bed Equation Coeficients
10 years ago
96f8d20f2f
Change selection logic another time
...
Automatic selection was to unflexible.
Updated documentation
Updated language files to new logic and documentation.
Updated bdf2u8g.exe
10 years ago
76da32b567
add hash-bang for python3
10 years ago
2e7ba44633
some renaming for readability
10 years ago
352aa3f4c5
Merge branch 'Development' into marlin_configurator
...
Latest upstream
10 years ago
e3ca9137b5
Fix missing temp_error declarations
...
- Fix for #1591 replacing #1595
10 years ago
0620267ebb
g29 auto-mode for the new G29 LRFB
...
short:
this script scans the first few lines from a gcode. If the line between 2 different z are greater than min_g1 this is our first layer. On this layer we search the min and max values of X and Y. With an offset we write that in a new file.
10 years ago
08694339eb
Merge branch 'Development' into marlin_configurator
...
Conflicts:
Marlin/Configuration.h
10 years ago
e4d77a6313
Merge pull request #1554 from 2PrintBeta/Development
...
Macro indirection for stepper drivers + Support for TMC26X and L6470 Stepper Drivers
10 years ago
b373826428
Merge pull request #2 from MarlinFirmware/Development
...
update
10 years ago
5bafb1fe1f
Add user test to language_test.h and make it default.
...
Improve description in Configuration.h
10 years ago
c0b6075f77
Fix max acceleration limits in planner
...
The max acceleration limiting was in wrong place.
10 years ago
9157cbd8f3
Add Travel Acceleration and change the M204 options
...
Added option to set Travel Acceleration (non printing moves).
The M204 options was a non sense (S for printing moves and T for retract
moves).
It has been changed to:
P = Printing moves
R = Retract only (no X, Y, Z) moves
T = Travel (non
printing) moves
I will add this info o G-Code wiki in reprap.org. I also advise to put
this info in Marlin next version changelog.
10 years ago
888cf161bd
fix travel speed option for G29
...
I forgot to enclousure the variable with #ifdef
10 years ago
af63b54562
Add travel speed option to G29 command line
10 years ago
817751d4b9
Added new languages, the Cyrillic display and a test language to find out your hardware.
10 years ago
c4b0087f7a
Insert utf_mapper.h
...
Top -> down
- Decide what output function is to use.
- Precautions. If non of the DISPLAY_CHARSET_HD44780's is selected fall back to Japanese.
- When we are not on the dogms setup a mapping table depending on display type and mapper.
- If we are on dogm we use ONE To ONE mapping - except kanji.
- select and define one of the mapping functions.
10 years ago
b60761bcff
Removed some messages that shouldn't be translated in the Japanese files.
...
And made falback to kana work.
10 years ago
97ae3c5c6a
Corected some errors inrtoduced by a faild global replacement.
10 years ago
ae76b1e8a8
Changes in dogm_lcd_implementation.h in detail.
...
Top -> down
- We don't need the old Marlion_font package any more - we made new.
- But we need information about configured fonts and the mappers.
- We support Cyrillic now.
- LCD_CLASS is not used in this file. LiquidCrystalRus.h is deleted anyway.
- define some fonts
- BIG_EDIT_FONT works only together with western languages.
- Select a matching FONT for the MENUE depending on the defined language.
- Number the different font-types. Wanted to avoid to store complete font-structures when changing fonts back and forth.
- Marlin special symbols are now at the lower end - like in 'ultralcd_implementation_hitachi_HD44780.h'
- insert the new remembering setFont function.
- insert the new counting lcd_print functions.
- make use of the new setFont and lcd_print functions.
- On some places redefined one character long strings with chars to avoid overhead and reduce warnings.
10 years ago
5bf42066fa
Fix typo in configuration.h
10 years ago
8a4b62d081
Set more regular setup in configuration.h
10 years ago
255ca68123
Changes in ultralcd_implementation_hitachi_HD44780.h in detail
...
Top -> down:
We don't need LiquidCrystalRus.cpp and LiquidCrystalRus.h any more. Functionality is now in utf_mapper.h
Comment on LCD_STR_BEDTEMP about behaviour in strings.
Change LCD_STR_ARROW_RIGHT from "\x7E" to ">" because "\x7E" is only ARROW_RIGHT on displays with DISPLAY_CHARSET_HD44780_JAPAN.
Introduce the counting UTF8 enabled lcd_print functions.
Replace the old lcd.print functions and make use of them.
A bit of reformatting around the changes.
10 years ago
60ceca1bc1
Add speed configuration for home-bumping movement
10 years ago
6fc2ccd568
Make use of new remenbering fontswitch.
10 years ago
0f26f3abf2
Add a test_language.
...
Will show the compleet utf8 or ASCII charset
To se the second half of ASCII click on "01234..."
10 years ago
901cf203fe
Add legal stuff to marlin_kanji.h
10 years ago
2d5134b0ed
Introduce - clean - prepae language files
10 years ago
d813090d90
Merge remote-tracking branch 'remotes/upstream/Development' into Development
...
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
10 years ago
c321c97f35
Merge pull request #1584 from galexander1/stringcleanup
...
fix a handful of cases where strtod() was cast to int, instead of just using strtol()
10 years ago
53abc5e2f1
Merge branch 'Development' into delta_auto_bed_level
10 years ago
956fb2d278
Merge pull request #1 from MarlinFirmware/Development
...
update
10 years ago
978dadf806
Base64 decode AJAX-fetched text properly
10 years ago
0eae9c24bc
Merge pull request #1582 from galexander1/deltaconftypo
...
fix typo in delta example config introduced in commit 697ee2d
10 years ago
624f23f550
Merge pull request #1575 from Wurstnase/fix-controllerFan
...
Fix controller fan
10 years ago
424c747fb3
Enable M401 and M402 for deltas with allen key z-probes.
10 years ago
0d593ab7c1
Fix debug message
10 years ago
3e8c5678f5
fix bug where, i.e., "G1X1E1" would be interpretted as "G1 X10 E1",
...
because strtod() will read the E address value as if it was a base 10
exponent.
10 years ago
ed7874b4e0
M404 should not use 'N' address as parameter because 'N' is reserved for the line number
10 years ago
b9dfa5cad4
use code_value_long() instead of (int)code_value()
10 years ago
901b03d020
use strtol() instead of strtod() when an integer value is desired
10 years ago
4fba7b084f
fix typo in delta example config introduced in
...
commit 697ee2dc50
10 years ago
cfc6a3a87a
Filament Runout Sensor Feature
...
With this change a mechanical or optical switch may be used to check the
availability of the filament and when the filament runs out an M600
(filament change) command is issued. This is only done while printing
with an SD card.
This feature was requested several times (issue #679 ), but the requests
were not accepted since it was believed that this situation should be
handled at host side. However during an SD print the control is totally
on firmware and I think that during an SD print it should be handled by
the firmware.
The original code was posted at reprap forum
(http://forums.reprap.org/read.php?1,297350 ) by Lazymonk. I have only
corrected some bugs of the code and improved it by adding definitions to
the configuration.h in order to make it more standardized.
10 years ago
e6862700af
Add Z_RAISE_AFTER_PROBING to all config files
10 years ago
39d255608d
Test an extra delta configuration with auto bed leveling code paths
10 years ago
7c24b97958
Ported over Johann Rocholl's improvements for delta printers:
...
- Nonlinear auto bed leveling code (includes G29, G30, Z_RAISE_AFTER_PROBING). Cleaned it up to be a delta-specific AUTO_BED_LEVELING_GRID code path.
- Allen key z-probe deployment and retraction code. Cleaned it up and added safety checks.
10 years ago
a5342c942e
Update Marlin_main.cpp
10 years ago
0f3b7d5575
Update annotated configurations
...
- Also update base configs
10 years ago
c5aa56bc4d
Merge branch 'Development' into marlin_configurator
...
Latest upstream commits
10 years ago
d085725c86
More sanity-checking for ABL
...
- Moved sanity-checks to Marlin_main.cpp
- Applied to other configuration files
- Fixed formatting of ABL output
- Passing verbose level to probe_pt
- Miscellaneous cleanup
- Put CONFIG_STEPPERS_TOSHIBA into Configuration.h
10 years ago
8b6766b37b
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
9eed8c8cf0
Make sure a ROM is selected for ULTRA_LCD
10 years ago
7136268273
Added 'dogm_font_data_6x10_marlin_Kanji.h'
...
This is copied from http://www.thingiverse.com/thing:664397
// Japanese Original font
// Version 0.1 by ichibey
//
// 営利目的で利用する際は、かならず許可を得てください。非営利の場合は、CCライセンスに従い使用ください。
// http://creativecommons.org/licenses/by-nc/2.1/jp/legalcode
This font is very special. It uses a mixture of katakana an kanji symbols, uses multi character symbols and is only addressable by '\xxx' sequences.
10 years ago
16e173e167
Added 5 new font.h files to main directory.
...
The former place of 'dogm_font_data_6x9_marlin.h' was in 'dogm_font_data_m0arlin.h'.
Deleted 'dogm_font_data_marlin.h'.
10 years ago
254970c92a
Merge pull request #1570 from C-o-r-E/escape_fix
...
Fixes gCode handling of comments and escaped characters
10 years ago
25dc79f124
Remove M48 credits also
10 years ago
34e51f576f
Fix compile error in gcode_G29
...
- A redo of #1576 , which missed topo_flag
- Always set verbose_level
10 years ago
b14270b029
Added font tools
10 years ago
fe2bd237d5
Add font sources.
...
Fonts have been created with fony.exe (http://hukka.ncn.fi/?fony )
The HD44760_? fonts simulate the fonts of the character based displays.
The ISO10646 fonts provide the right size of the standard fonts.
Marlin_symbols contains only the the special symbols of the original marlin font.
10 years ago
344a12bd10
Merge pull request #1571 from AnHardt/Undubble
...
Undubble MSG_MIN & MSG MAX
10 years ago
1149c24b86
More grouping, cleanup, start on overrides
10 years ago
62bd734612
fix controllerFan() for inverted enable pins
...
add ```^ !(n_ENABLE_ON)``` for each stepper
10 years ago
3024f6c706
Undubble MSG_MIN &MSG MAX
10 years ago
63b62d8d4e
Fixed in-line comments and escaping
...
* "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
* "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.
Tested with the following commands:
* M117 Hello ; test => displays "Hello" on display, ignores "test"
* G1 X1 ; foo => moves 1mm in X, ignores "foo"
* ; test => completely ignored, not even acknowledged
* M117 Hello \;) => displays "Hello ;)" on display
* M117 Hello \\;) => displays "Hello \" on display, ignores ")"
10 years ago
99fb1bc3e8
Attempt to resolve #1568 and add basic escape character support
10 years ago
fad14ae7eb
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
cdc38aa783
Move gcode handlers into inline functions
10 years ago
6d9e9a6bef
Merge branch 'Development' into enhanced_g29
...
Latest upstream changes
10 years ago
4db2179f5c
Include 4th extruder support
10 years ago
f90a947e65
Fix autoretract
...
Autoretract was broken, looks like it was overlooked when the retracted flag was updated for multi extruders.
10 years ago
2ef6b3d57a
Fix wrong defines, broken syntax
10 years ago
08b722b635
Merge pull request #1555 from C-o-r-E/solenoids
...
Add support for solenoid articulated extruders
10 years ago
32744d41a9
Do sanity checking on LRFB values
...
- Setting boundaries based on configured limits, contrasting with G28
(which forgets these limits?)
10 years ago
0a7d85c20e
Minor fixes
10 years ago
48e3a97a18
Removed extra encoder definitions from pins_FELIX2.h
10 years ago
d052a3c6aa
Merge pull request #1551 from thinkyhead/redundant_encrot
...
Cleanup rotary encoder encrot* defines
10 years ago
d8eeddfb93
Updated DUAL Extruder config, added README and enabled NEWPANEL by default
10 years ago
b423b90c77
Added Configuration_adv.h to examples for LCD/SD Support
10 years ago
075507fb9a
missed one X_ENABLE_PIN
10 years ago
dfb38874f8
Some suggested changes for #1555
10 years ago
7f8ea7105f
Arrange ProbeAction values bitwise
10 years ago
7684721977
Enhanced G29
...
- Adapted “Enhanced G29” code referred to in #1499 and posted at
[3dprintboard.com](http://3dprintboard.com/showthread.php?3105-Auto_Bed_
Leveling-Enhanced-G29-command)
- Compatible with current G29 while adding some new arguments
- `V` sets the verbose level for serial out
- `T` (or `V` > 2) send a Topology report to serial out
- `E` works the same way as before
- `P` works as before (source used `n` or `U`/`u`)
- `L`, `R`, `B`, `F` work as before
- Still needs sanity checking for `LRBF`
10 years ago
874d3d3fc5
Add support for solenoid articulated extruders
10 years ago
7540a81106
Minor fixes
10 years ago
a375d648c7
Merge remote-tracking branch 'upstream/Development' into Development
10 years ago
4a7aca2736
Merge remote-tracking branch 'remotes/upstream/Development' into Development
10 years ago
715104e477
Fix Endstop check for CoreXY bots.
...
The X_Axis could not home to min while Y_Max endstop was trigged.
10 years ago
e428e8da75
Merge pull request #1552 from thinkyhead/cleanup_cardreader
...
Cleanup of cardreader.*
10 years ago
20e59dc61e
Don't skip files starting with underscores
10 years ago
f171656f8e
Cleanup of cardreader.*
...
- Apply standards to cardreader.*
- Fix minor issues with cardreader.cpp
- Apply standards to some other stale regions
10 years ago
f379edca78
Cleanup rotary encoder encrot* defines
...
The encrot values are used in only one place, and don’t vary, so remove
redundant references.
10 years ago
c7cdb176c8
Merge branch 'Development' into marlin_configurator
...
Latest upstream changes
10 years ago
49f471a5fc
Merge pull request #1541 from thinkyhead/fixup_temperature
...
Cleanup of temperature code
10 years ago
f2710e11d1
Optimize initial loading, code cleanup
10 years ago
558c6313f7
Merge branch 'pr-felix' into Marlix
10 years ago
08bc723a3c
Enable PIDBED
10 years ago
e487bd642b
Updated PR to streamline integration
10 years ago
2eeb241b42
Find fields that group together
...
- Do field grouping
- Tweak configurations for better grouping
10 years ago
e30bfedce4
Fix undefined *_PROBE_BED_POSITION error
10 years ago
3eafea840d
Minor fixes in Configuration.h
10 years ago
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.
11 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
12 years ago
d01ee7e7b5
fix zjerk being the same for delta as xy jerk
...
add more delta defaults
on delta make second home even slower
12 years ago
d7390e13d9
Support dual x-carriage printers
...
Dual x-carriage designs offer some substantial improvements for dual
extruder printing.
12 years ago
f3aa2a48e7
update max pos
12 years ago
460751503e
Added default configurations for deltas when DELTA is defined
12 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
aa65c20d1f
Only clamp panel movements if software endstops are enabled
12 years ago
ecf3ab5de4
Added thermistor 60 to configuration.h
12 years ago
2daa85918e
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin.git into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/language.h
Marlin/pins.h
Marlin/ultralcd.cpp
12 years ago
2015989f84
Added DISABLE_MIN_ENDSTOPS
12 years ago
648d45cfb2
Fix Pin Description Typo
...
Reverse 'Bed' and 'Fan' at the RAMPS 33 Description.
Signed-off-by: Christian Inci <chris.pcguy.inci@gmail.com>
12 years ago
171719f18c
Merge pull request #525 from lajos/ultralcd_pid
...
ultralcd.cpp compile errors when !defined(PIDTEMP)
12 years ago
b519af4f05
fixed another !defined(PIDTEMP) compile in ultralcd.cpp
12 years ago
7d03c52511
fixed compile error in ultralcd.cpp when PIDTEMP undefined
12 years ago
02dee80fa5
added Azteeg X1 motherboard
12 years ago
47dc70e3ec
Fix location of avrdude.conf
12 years ago
1d258903bb
Allow command line compilation when using BEEPER.
12 years ago
e34c9981ab
Delta disabled by default
12 years ago
26a441fc7d
More 3Drag controller patches.
12 years ago
ac975ed8c2
Merge branch 'deltabot' into Marlin_v1
12 years ago
caa848f943
fix homing for deltas
12 years ago
7ad12be763
Merge branch 'Marlin_v1' of https://github.com/codexmas/Marlin into codexmas-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
README.md
12 years ago
408169aef4
Merge branch 'Marlin_v1' of https://github.com/BorisLandoni/Marlin into BorisLandoni-Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/language.h
Marlin/pins.h
12 years ago
bd96d22bfb
Merge branch 'Marlin_v1' into thinkyhead
...
Conflicts:
Marlin/Configuration.h
Marlin/Configuration_adv.h
Marlin/Marlin.h
Marlin/Marlin_main.cpp
Marlin/Servo.cpp
Marlin/language.h
Marlin/pins.h
Marlin/planner.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
README.md
12 years ago
73f21cd5d6
Spanish updated so far.
12 years ago
6f4a6e531c
Merge branch 'deltabot' into Marlin_v1
12 years ago
01edf22a10
Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.
12 years ago
ff6fa09ecf
Moved corexy implementation from stepper to planner
...
(Thanks iquizzle)
12 years ago
c8dcc7c208
Allow increasing the software PWM frequency.
12 years ago
8b0d82e9db
Removed "awaiting translation" for french
12 years ago
1e05d192ab
Make the beep tone less offensive
12 years ago
373f3ecab3
Merge branch 'deltabot' of https://github.com/jcrocholl/Marlin into deltabot
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin_main.cpp
Marlin/pins.h
12 years ago
f295712008
Trying to fix weird diff on ultralcd_implementation_hitachi_HD44780.h
12 years ago
69b02031ca
Fixed small error in lcd define statements.
12 years ago
6a81291c57
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
...
This should fix issues with pull request 467, I hope.
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
c1cb5977ee
Update Configuration.h
12 years ago
8a5bd8a808
Update Configuration.h
12 years ago
c1d7cf939e
Update language.h
12 years ago
4c7d1436e9
Update pins.h
12 years ago
6588933c04
Update Configuration.h
12 years ago
5dabc95409
Apply all changes from latest Marlin_V1
...
Diffed and merged, preserving my updates
12 years ago
a733537ddd
Missed some variable declarations
...
Integrated fixes from henrikbrixandersen pull request #504
12 years ago
f4f30c9d64
Added servo actuated enstop coding to allow G28 command to engage and retract a servo to specified angles.
12 years ago
79374f0b93
Merge branch 'reisnyderb' of https://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
da05b3ba94
faster GLCD (ST7920 SW-SPI) implementation / fixes
...
- fixed long menu entries (>14 or >18 chars) caused overrun in dogm lcd
implementation
- fixed pin set problem when in interrupt
- much faster ST7920 SW-SPI implementation
- increased ST7920 framebuffer size for more speed
12 years ago
4b19c8552e
Fixing changed Configuration.h settings to be default values per ErikZalm Request.
12 years ago
971ec35135
Expanded M302 to allow setting the temp
12 years ago
5090c56651
More redundant temp sensor changes. (After testing and debugging by reifsnderb)
12 years ago
16b9239a26
Report temperatures for all extruders
12 years ago
a964b3cf3d
Merge pull request #495 from Gatulibu/Marlin_v1
...
Added support for Megatronics v2.0 and Minitronics v1.0
12 years ago
e8572c5239
Fix: Long menu entries (>14 or >18 chars) caused overrun in hitachi display implementation
12 years ago
7ee70c2248
Fix: removed wrong ; at end of define
12 years ago
b78fa6bb70
Added support for Megatronics v2.0 and Minitronics v1.0
...
merged from code downloaded from reprapworld.com
12 years ago
9be61cdc02
Added redundant temp sensor
12 years ago
7231a20dba
Put #ifdef around servo pins in pins.h. This allows the pins to be used for M42.
12 years ago
e2ff536b03
Fixed typo in Comment
12 years ago
40eb07bad4
Revert and extend previous change pin check change
...
Reviert previous change of #if BLAH_PIN > 0 to #if defined(BLAH_PIN) &&
BLAH_PIN > -1. Unfortunately some times pin 0 is used. For my sins I've
gone through and replaced all unsafe checks of #if BLAH_PIN > -1 with
the safe version.
12 years ago
bd33cf4a9f
fixed typo / added "const" to defines for newer gcc compatibility
12 years ago
567291e734
Merge pull request #485 from Banjer/Panelolu2_Melzi
...
Add Panelolu2 support for Melzi
12 years ago
8d80cbbf4c
fix broken LCD commit #dfa549f268 from buildrob - GLCD/DOGM implementation was ignored
12 years ago
98d0d48191
fixed merge
12 years ago
bbe67fca5a
soft tab correction
12 years ago
9eeb711c96
Merged from Upstream Master
12 years ago
424101110c
Add Panelolu2 support for Melzi
12 years ago
0d4a9444c4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
86cce025f4
Added #ifdef NUM_SERVOS to servo.cpp
12 years ago
03141a5ef4
LCD: Added Deadzone at 100% Feedrate
...
This adds a deadzone at 100% Feedrate when changing it at the status
screen/main menu. Prevents from unwanted feedrate-changing when
navigating back to the main menu and makes it easier to return to 100%.
12 years ago
28ada096e2
Adding servo documentation
12 years ago
4121311b9d
Change to LCD status indicators
...
The I2C LCD status indicators now indicate when the hotends or bed are
turned on at all (rather than just when they are in their heating phase)
12 years ago
dfa549f268
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
64360164ad
Merge pull request #482 from codexmas/Marlin_v1
...
servosupport
12 years ago
86405cdd11
Merge pull request #479 from MStohn/thermocouple
...
BUGFIXES for temperature.cpp / add RUMBA thermocouple support
12 years ago
6c45c3f4e7
BariCUDA changes
12 years ago
96624f0f31
Forgot to include reference to Servo in makefile
12 years ago
dc59f07d24
First attempt at refactoring of original servo code. Only adding servo support as a start to keep things simple.
12 years ago
b668cb0516
Adding in clean copies of Servo library from Arduino 1.0.4
12 years ago
95dff34b73
fixed wrong compare for min temp check of heater 1 and heater 2
12 years ago
4cc6f9f6de
fixed wrong pin initialization when using temperature 2 pin input
12 years ago
61a48cc662
Add support for RUMBA thermocouple add on
12 years ago
9cc15876be
Add support for RUMBA thermocouple add on
12 years ago
c9cf2174dd
Merge pull request #474 from xifle/Marlin_v1
...
Fixed "Cooldown" Selection not reseting bed temp
12 years ago
bd2cd4903e
Added #ifdef BARICUDA around the BariCUDA changes
12 years ago
37f3199df3
fixed problems in planner with solenoids for BariCUDA when set to 0
12 years ago
fbd899a37d
Support for BariCUDA Paste Extruder derived from MakerBot Frostruder. Using Ultimachine RAMBo board. M126/M127 and M128/M129.
12 years ago
29bb8d7d4f
Fixed "Cooldown" Selection not reseting bed temp
...
- enquecommand with multiple lines "\n" doesn't work -> M140 S0 didn't
get processed. So I wrote a new func for the cooldown which uses
setTargetHotend. In addition this does return to status page after
selection.
- Added setWatch() to preheat-functions (Temperatur sanity check
would never have worked when preheating from the lcd panel)
12 years ago
015d0594b0
Optimize menu selection for Viki rotary encoder.
...
The Viki LCD rotary encoder uses a different number of steps per
rotation. This fixes the seeming "missed" steps when selecting a menu.
12 years ago
2739c26c4f
changes:
...
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
12 years ago
6fb9573157
added support for the reprapworld keypad
12 years ago
594193c908
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
1fa61c297e
Turning off Control Panel by Default and Updating the link to the LiquidCrystal_I2C library to avoid confusion.
12 years ago
b27a59f41e
Added support for Elefu RA Board and Elefu Control Panel
12 years ago
a65a26d6b4
If CORE_XY is in use X and Y Axis had to be activated at the same time
12 years ago
db2f157a22
Replace the <= to < in the Command M907, M350 and M351.
...
The for loop for Axis count over the Array.
Add a break after M907
12 years ago
a5cd582665
Support for 10 level deep SD folder hierarchy
12 years ago
fc4ab05157
Solved minor bug in controllerFan()
...
Extruder 2 was checked where extruder 1 should be checked.
12 years ago
0ef54f2f85
Make M303 silent when "S0" is sent
...
If S is left out perhaps it should be silent, but check the spec for
this M code.
12 years ago
a200521eab
Added CUSTOM_MENDEL_NAME option to Configuration.h and language.h
...
Also cosmetic comment changes and spelling corrections in printed
messages
12 years ago
1a397825f9
fix DEFAULT_AXIS_STEPS_PER_UNIT minor Z rounding error
12 years ago
289c02eda4
Remove unnecessary pin initialization in stepper.cpp
...
(duplicates initialization in Marlin_main.cpp)
12 years ago
d5ad7a0814
Rework change to incorporate CONTROLLERFAN
...
Also refactor extruder auto fan logic to simplify further and now only
check every 2.5 seconds
12 years ago
c3cdaceab3
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
1c127217df
Make DOGLCD merge neater.
12 years ago
7f57f28ccc
Add lcd_buzz function to ultralcd.h so that non-LCD code can make use of lcd's buzzer.
...
Argument order of lcd_buzz was set to mirror that on tone(). Change
default M300 frequency to something audible.
12 years ago
788d62bcc4
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h
12 years ago
d71f1e9bf6
Add (as an option) slower SD transfer mode
12 years ago
db5bb8546d
Merge pull request #452 from MStohn/Marlin_v1
...
128x64 RepRapDiscount Full Graphic Smart Controller support
12 years ago
4b2ece159b
Merge pull request #453 from brackendawson/Marlin_v1
...
Make Gen7 1.4+ heater temp sensort pins match silkscreen.
12 years ago
d5ee2a5a62
Make Gen7 1.4 heater pins match silkscreen
12 years ago
7ac6d7f78e
FIX: Speedup - no explicit display clear needed in u8glib
12 years ago
13596e8722
Added RepRapDiscount FULL GRAPHIC Smart Controller
12 years ago
3a6abe1d6e
Removed STB custom font hack from u8glib library and moved to marlin project
12 years ago
16afbf9bfa
FIX: adopted latest changes from hitachi implementation
12 years ago
34bca48b98
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
ac52dcc174
Updated the card menu and watch messages to make it more informative.
12 years ago
31bb3fb297
Fix: Build error when EEPROM_SETTINGS is defined and PIDTEMP is undefined
12 years ago
c80a78bb70
Lower the default max E feedrate a bit. With the stepper fix this is much to high.
12 years ago
5d5909fc25
Fix failure to compile with heated bed: remove call to non-existant scaleBedPID().
12 years ago
93f0463b21
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
...
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).
Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.
Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.
Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.
Conflicts:
Marlin/language.h
12 years ago
4fa2260a59
Fixed cardreader.h to resolve issue #440 (Pull Request #425 missing file)
12 years ago
038d405254
Corrected #endif in language.h
12 years ago
443aaa30bf
Removed GIT fragments
...
Seems that there was something wrong while merging
12 years ago
7f622467fc
Merge pull request #425 from kefir-/m928_logging
...
M928 logging
12 years ago
86867928ac
Merge pull request #434 from DDRBoxman/Marlin_v1
...
Add support for M300: Play beep sound
12 years ago
9a38cad6f0
Merge pull request #430 from STB3/GLCD_128x64_dots
...
Final task of the 128x64dots GLCD implementation
12 years ago
7a5c474d91
Update Configuration.h
12 years ago
4e448b700a
Merged fetched files from Marlin_v1 branch
...
Pull requests: #414 #433 #432 #428
12 years ago
9f2862ce48
Merge pull request #414 from whosawhatsis/Marlin_v1
...
regenerated thermistor table 7
12 years ago
9fb8bd5685
Merge pull request #433 from whosawhatsis/bang-mode
...
Separate PID_MAX from BANG_MAX
12 years ago
0d075378d5
Add LARGE_FLASH define and enable it for some of the beefier boards
...
The LARGE_FLASH flag allows superfluous features to be excluded
on boards with less memory
12 years ago
9a1c90471f
Ignore unused beeper pins
12 years ago
1a0f889803
Add support for M300: Play beep sound
12 years ago
9322c408c6
Updated for LiquidTWI2 library version 1.2.3
...
The new version of the library means that PANELOLU no longer needs to be
defined in LiquidTWI.h (the library file can be used as is) and the new
version of the library also enables the buzzer on the Panucatt VIKI
panel.
12 years ago
fd5b7e0cec
Separate PID_MAX from BANG_MAX
...
This allows PID_FUNCTIONAL_RANGE to use a maximum duty cycle higher
than PID_MAX. This is useful for powerful heaters to heat quickly in
bang-bang mode, but use a lower duty cycle that is easier to stabilize
in PID mode.
12 years ago
e5a853a3d0
Added automated extruder fan function
12 years ago
72419f69a9
Added rumba
12 years ago
91bea43332
Added rumba pinout
12 years ago
d2b00fe486
Removed html and added rumba
...
Found some unwanted html at the bottom of the file which caused it to not be able to compile.
Also added rumba as machine.
12 years ago
6c66cae694
GLCD init screen cosmetics
12 years ago
f3e0e5184d
Add include selector between char. LCD and GLCD
12 years ago
5d3862f9d1
Modified u8glib logo on welcome screen
12 years ago
0b320f75e9
Removed debug code, add some comments
12 years ago
5f1cd70122
Add code to lcd_update() for GLCD
...
This code selects between the routines for the GLCD or the char.
display.
12 years ago
a49c09a776
Add variable for animated fan, add float conversion w/o sign
...
A new variable was introduced to allow fan animation on the GLCD.
Add additional float to string conversion routine without sign
character. This is used for the coordinates visualisation on the GLCD.
12 years ago
26d8863111
Add library selection between GLCD and char. LCD
12 years ago
4a141a694f
Marlin code for GLCD display
...
This contains the menues, status screen etc...
12 years ago
83c790a020
Add bitmap graphics for GLCD
...
1. Marlin welcome screen
2. Status screen symbols 3 Extruders, heated bed, animated fan logo 1
3. Status screen symbols 3 Extruders, heated bed, animated fan logo 2
12 years ago
233df9cca0
Add missing LF at the end of the file
12 years ago
bb0de75a92
Removed umwanted HTML code ath the end of the file
...
Sorry for that. This does not lead to compile errors. I removed the
unwanted code to make it clean.
12 years ago
7c47e7162d
Adding Maker's Tool Works heated bed thermistor
12 years ago
af78d0cbfa
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
9a78f321a4
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
12 years ago
5de25ccd20
Add Motherboard variant 64 - STB V1.1
...
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
d6ce63c49c
Merge pull request #411 from STB3/Marlin_w_STB_Board_support
...
Add STB board support to Marlin (next step towards graphic LCD implementation)
12 years ago
f036be7c4e
Clean up tab/whitespace from last commit
12 years ago
07e11c7cf5
Add command M928 to enable logging to file of received gcode commands
12 years ago
92782f9252
Merge pull request #1 from illuminarti/Fix_E_Speed
...
Fix step rate bug (especially for retraction)
12 years ago
6a61a3c0b4
missing comma in last commit
12 years ago
f0aee4101a
regenerated thermistor table 7
...
Generated with createTemperatureLookup.py. The old table crapped out at
270C, which was a problem for polycarbonate.
12 years ago
aba67e2449
No bed config for RAMPS
...
The motherboard 35 is a config without bed with this pins setting :
D8 Extruder
D9 Fan
D10 Controller Fan
12 years ago
6504e96165
Turn off power supply off-load
...
Disable the high current output and wait a little before to turn off,
because the interrupting capacity of the PSU is unknown.
Could be a function if needed by other.
12 years ago
86bf911139
Toggle menu for PSU from LCD pannel
...
From the prepare menu, accessible when is not printing, you have the
possibility to turn off the PSU when is on et vice versa.
From the host, you can turn off or turn on the PSU then the menu is
updated accordingly.
From the LCD message, the printer status is reported ready or off
respectively when the PSU is on or off.
12 years ago
7bad72359c
Support encoder click on PANELOLU2 being read through I2C
...
This change also handles the case where the pause/stop/restart button on
the VIKI is not used. Make LCD I2C buzz sound the same as the normal
buzz (300ms is too long for quick feedback).
12 years ago
1daf2f3256
Number of extruders is not an advanced configuration - it is a basic property.
12 years ago
f1263d3f88
Further reduce code by using precompiler logic
12 years ago
140e095c6e
Add pins for Motherboard variant 64
...
These definition contain also the definition for the graphics LCD.
12 years ago
b2c1c64fb1
Add Motherboard variant 64 - STB V1.1
...
Definition for the graphic LCD are already in it, they will not harm the
configuration as they are only defined constants
12 years ago
ceb5ee38af
Replaced corrupted language.h file on local PC with current from ErikZalm/Marlin
12 years ago
8efd4cfd73
fixed merge conflict
12 years ago
372e12f83f
Implement automatic extruder/cold-end fan control based on temperature
...
This change allows fan outputs to automatically turn on/off when the
associated nozzle temperature of an extruder is above/below a threshold
temperature.
Multiple extruders can be assigned to the same pin in which case the fan
will turn on when any selected extruder is above the threshold.
It also makes the M42 command compatible with the M106/M107 command.
The majority of the logic in this change will be evaluated by the
compiler at build time (i.e, low code space requirements).
12 years ago
6beb42cdf6
Attempt to address Bernhard's comments
...
Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
12 years ago
839bef6d5d
Fix Configuration.h file to not define LCDs be default.
...
Also fix compile time check in Marlin.pde
12 years ago
1292d735ba
Converge all I2C LCD branches (PANELOLU2, VIKI & PCF8575)
...
This includes refactoring the buttons code to remove a large amount of
non-pin dependent duplication from pins.h.
12 years ago
4eb81a69e6
Only compile the new extruder offset code if you have multiple extruders.
12 years ago
3e9cd334a4
Merge pull request #383 from dob71/jeff
...
Hotend offset handling for multi-extruder machines
12 years ago
67710df9f3
Made i2c mode wok with the hardware I am able to test (ywrobot / sainsmart i2c LCD 2004)
...
Removed incorrect LiquidCrystal_I2C Library
12 years ago
b6209c86dd
Added import of Wire Library to make I2C LCD support compilable
12 years ago
2b567d1df5
Added I2C port expander support to HD44780
12 years ago
06272f463d
Added Config variables for activating I2C LCDs and setting type and address
12 years ago
de3dec7215
Also show the tune menu when USB printing.
12 years ago
73d41c10b9
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into jeff
...
Conflicts:
Marlin/language.h
Marlin/thermistortables.h
12 years ago
63da4dc59a
Merge pull request #398 from DanieleSdei/Marlin_v1
...
Marlin v1, alignment of the Italian language
12 years ago
82e28851bd
Italian language: SD-Card change and SD-Card init
12 years ago
aed5965ad8
Italian language: remove space and some fix
12 years ago
d360846dd4
Update Marlin/language.h
...
Update Polish language #define MSG_RESUMING "Wznawiam drukowanie"
12 years ago
2f60e324dc
Fixed #394
12 years ago
5e2abfcdcd
Merge pull request #391 from STB3/Marlin_with_SD-Card_Change_Menu
...
Add SD-Card change and SD-Card init. for electronics equipped with LCD Display
12 years ago
a0d4e8e78e
Add Messages for SD Card init. & change
12 years ago
bbf0cc1379
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Fix to a bug that I just introduced - sorry. Forgot about offset of string length.
12 years ago
c8f1fbd9d8
Add SD-Card change and SD-Card init.
...
Add SD-Card change and SD-Card init. for reprap electronics without
SD-Chard change detect pin.
12 years ago
71ddb8dc60
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Use all available characters in narrow LCDs < 20 characters.
12 years ago
d2c547c407
Update Marlin/ultralcd_implementation_hitachi_HD44780.h
...
Fix to a minor bug with hardcoded LCD_WIDTH that draws edited values outside of the 16 characters width LCDs.
12 years ago
70871715e4
Added support for extruder offset handling
...
The extruder offset can be specified in the configuration
file or adjusted on the fly using the "M218 T# X# Y#" command.
The EEPROM support is not yet merged in.
The "T#" command can take option "F#" that specifies the feedrate
at which the printing head should be re-positioned. If not
specified the re-positioning move is not preformed immediately,
but the coordinates are adjusted for the printer to properly
position the head when the next movement happens.
12 years ago
49b2ddc8c1
Cleaned up non-standard characters
12 years ago
f8876a7958
Merge pull request #376 from kintel/skip_longfilenames
...
Also skip .files and _files with long filenames. I think its better than before. If somebody dislikes it, or wants additional configuration, it can be done in a future step. Thanks, Marius, and nice to have you helping!
12 years ago
18fcc367d2
Merge pull request #371 from Banjer/Melzi_LED_PIN
...
Chenged LED_PIN for Melzi boards, added comment about broken versions of...
12 years ago
19ce90fe02
Added comment about M42 usage (clean)
12 years ago
00fed0a703
Revert "Extended comment explaining M42 usage"
...
This reverts commit 01541ee64c
12 years ago
e06d820909
Also skip .files and _files with long filenames
12 years ago
01541ee64c
Extended comment explaining M42 usage
12 years ago
f24f02e212
compile fix: quickStop() needs stepper.h
12 years ago
12c41423ad
Fixed typo in comment
12 years ago
0995eaa492
Chenged LED_PIN for Melzi boards, added comment about broken versions of the Sanguino libraries
12 years ago
1d06b10962
Added a feature to have filament change by gcode or display trigger.
...
[default off for now]
syntax: M600 X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
if enabled, after a M600, the printer will retract by E, lift by Z, move to XY, retract even more filament.
Oh, and it will display "remove filament" and beep like crazy.
You are then supposed to insert a new filament (other color, e.g.) and click the display to continue.
After having the nozzle cleaned manually, aided by the disabled e-steppers.
After clicking, the printer will then go back the whole shebang, and continue printing with a fancy new color.
12 years ago
408b349a84
Fixed #368 . Commented out the wrong pin definition, but explained why it is there.
12 years ago
9ecb267b63
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
12 years ago
3cf59f6f9a
add RepRapPro Huxley thermistor tables
12 years ago
c1730e2b08
Merge pull request #363 from yuroller/sanguino_panelolu
...
Panelolu pin assignment for sanguinololu
12 years ago
86358dd6cd
Panelolu pin assignment for sanguinololu from http://reprap.org/wiki/Panelolu
12 years ago
0f3f5d083d
Minor cleanup of the new FAN_KICKSTART code. #334
12 years ago
6ec56fa923
Merge pull request #334 from KevinOConnor/FanKick
...
Add feature to briefly run the cooling fan at full speed when it first starts.
12 years ago
965baf2683
Merge pull request #362 from daid/Marlin_v1
...
Finnish language
12 years ago
3d91bd486c
Add "kick fan" feature - briefly run fan at full speed on start.
...
Add a feature to run the cooling fan at full speed for a small period
(default 100ms) when first starting the fan. Some fans wont reliably
start spinning at low power, and many fans have issue with the PWM at
low power. However, once the fan starts spinning it can reliably be
set to a wide range of PWM values.
12 years ago
3f2f94ef28
Be consistent in setting of the fan PWM.
...
Always set the FAN PWM value in check_axes_activity() and always use
the value of the active move if a move is active.
12 years ago
7f30039d2a
+ Finnish translation
12 years ago
14e1d495ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
bbe7d3d0fe
Fixed #312
12 years ago
7ce509b9a7
Merge pull request #361 from yuroller/MakefileSanguino
...
Makefile sanguino
12 years ago
9c34c4f05b
fixes for ramps compilation using installed arduino ide
12 years ago
442ade15a6
Move Gen6 stuff into a proper location.
12 years ago
5fd4582cc8
Merge pull request #242 from Drakelive/Marlin_v1
...
Fixes issues # 216 and # 135 for Gen6 and Gen6 Deluxe board
12 years ago
8b88e3b386
Fixed #345 , Fixed #267 .
12 years ago
27843388c6
Merge pull request #360 from njprossi/Marlin_v1
...
Power signal control definitions for other power supplies
12 years ago
921273baa0
Added optional feature to stop printing when an endstop is hit. Made the Z display on the LCD in 3.2 format instead of 3.1. Added LCD message when and endstop is hit.
12 years ago
7d20ec706e
Added libraries from Arduino 1.0.3 for sanguino build
12 years ago
437eb3bafc
Initialize PS_ON at startup
12 years ago
f3c1fc70a9
Power signal control definitions for ATX and others
12 years ago
dad7691df9
makefile for sanguino standalone compilation
12 years ago
6752cb2d9c
PID now per extruder. Fixed typo
12 years ago
0ac452e252
Disable is now multi extruder compatible. M84 got a T option.
12 years ago
9e7b5056a0
{X,Y,Z}_{MIN,MAX}_POS are actually in Gcode coordinates.
12 years ago
5f82f03ff3
Add italian MSG_RESUMING.
12 years ago
5e3873c8db
Add german MSG_RESUMING.
12 years ago
01aac2a142
Small changes on the LCD panel, let the speed control work better, line up the parameter edit the same as the menu, remove some unused defines, and remove the Z from the 10mm move menu.
12 years ago
b69cb9fbd9
Change the end of SD cart print message from minutes/seconds to hours/minutes.
12 years ago
30254e3388
Merge pull request #350 from jcrocholl/Marlin_v1
...
Automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
38ee395ac7
Replace the 1ms delay for 2 nops to get a 100ns delay. #259
12 years ago
5df5e4c4a2
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
a95dcd74e7
Fix some of the duplicated PSTRs, saving 500bytes of flash with LCD on.
12 years ago
8caf5d252d
Remove bogus blank line.
12 years ago
1c2ecddae4
Fix typo (# missing before define).
12 years ago
6dfb8a2187
Fix home_all_axis to make QUICK_HOME work with Repetier-Host which sends G28 X0 Y0 Z0 instead of G28. Thanks to Matt Schoenholz for reporting this issue.
12 years ago
3b2e5027e5
Merged updates from Marlin_v1.
12 years ago
b39f5d614a
For boards with only one endstop per axis, automatically set *_MIN_PIN and *_MAX_PIN according to *_HOME_DIR.
12 years ago
ab09fa4bbf
fixed pwm generation at pin D12 and D13 when one of them is used as FAN_PIN on Sanguino, added soft pwm entry for FAN_PIN in temperature.cpp
12 years ago
5697451c72
fix lcd class
12 years ago
58e806f3fa
Fix the russial translation.
12 years ago
50a5ce1dc4
deduplicate messages
12 years ago
6123a00e64
Fix the german translation.
12 years ago
7c21716886
Fixed #341
12 years ago
ae1bc83350
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
596a7e1904
Fix compiling for Arduin < 1.0.0
12 years ago
b264317fa0
Reverted the patch by KevinOConnor, as it crashes some versions of avr-gcc and caused linking issues.
12 years ago
673577a31b
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
23022f1a82
Updates to Makefile to compile for Teensy.
12 years ago
96e9db8919
Merge pull request #339 from KevinOConnor/CompilerFlags
...
Add additional optimization flags to Makefile
12 years ago
08356361ac
Fixing a problem with heated beds not working without PID and BED_LIMIT_SWITCHING
12 years ago
047d037f8c
#ifdef fix for #326
12 years ago
0908458381
Use gcc "-fwhole-program" optimization.
...
Use "whole program" and "link time optimization" features of gcc. The
whole-program optimization enables the compiler to evaluate the entire
firmware for optimization instead of just one code file at a time.
This leads to better overall optimizations.
12 years ago
16fbb455ef
Use linker "--relax" option.
...
The "relax" option enables the linker to convert certain "call"
instructions to the smaller "rcall" instruction. This reduces the
size of the resulting binary.
12 years ago
f30b46b2a8
One more fix for #338 , I really should get a heated bed to test with.
12 years ago
65c3f1ffcd
Most likely fixing #338
12 years ago
7577717b59
Fixed #336
12 years ago
1a8f54cea1
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
12 years ago
6731c094ee
Fix compiling with just an 16x2 LCD and no buttons.
12 years ago
b99a928a80
Fix the M117 (display message on LCD) when used over USB with checksums.
12 years ago
55ba90ac19
Add PID functional range setting. With high powered heaters the current functional range of 10 degrees causes high overshoots as the PID needs to kick in before the temperature hits 10 degrees below target.
12 years ago
5ff5cee8ce
Fix the sensitive pin definitions, there where analogue numbers in the digital pin list. Also made M42 without a P function on the LED_PIN (which was otherwise a useless pin definition)
12 years ago
8b58edc70e
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
d0319d45af
Merge pull request #335 from jcrocholl/Marlin_v1
...
Fix endstop pins for Printrboard
12 years ago
ca409e5531
Fix X/Y/Z_MIN_PIN for Printrboard.
12 years ago
1f45cb0a51
Fix typo in MANUAL_HOME_POSITION (plural S missing) and improve comments.
12 years ago
931a0052ea
Fix typo in MANUAL_HOME_POSITION (plural S missing) and reduce BLOCK_BUFFER_SIZE because 64 wasn't working for some reason.
12 years ago
46ec4b648c
Added some missing Mxxx comments to M commands. Fixed the unsetting of the timer dividers for the fast PWM fan.
12 years ago
724f5aa36b
Update on makefile for moved Arduino addons.
12 years ago
6d9dfa96c3
Move the Arduino related stuff out of the Marlin tree, as they are not directly related to Marlin functionality but addons for the Arduino IDE. Also split up the addons for pre 1.0.0 Arduino and post 1.0.0 Arduino.
12 years ago
3fb07d9b8d
Add MINTEMP/MAXTEMP error to LCD, and fix temperature bug with more then 1 extruder.
12 years ago
8e2519e88b
Add realtime delta geometry in Marlin_main.cpp.
12 years ago
cec7283b21
Enable QUICK_HOME for deltabot.
12 years ago
2292441f0c
Use X/Y/Z_MAX_PIN instead of X/Y/Z_MIN_PIN for top endstops on deltabot.
12 years ago
c430906d3b
Deltabot settings and configuration adjustments.
12 years ago
82c8724b33
Fix compile with PID_DEBUG
12 years ago
9b160972a1
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
e036750bdf
Use the disable macros on initialization. Which fixes a bug when there is no pin defined for stepper enabled (motherboard 4)
12 years ago
fcd9de72ef
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
12 years ago
32d4373e0f
Add printrboard and brainwave to Makefile.
12 years ago
b3ddbcee2a
Merge pull request #329 from jcrocholl/Marlin_v1
...
Add Printrboard and Brainwave to pins.h and fastio.h
12 years ago
29435dfb4b
Proper avr for Sanguino in Makefile.
12 years ago
52158dffcc
Big temperature code update. No longer converts back and forwards between temperature and raw sample value. Reducing complexity, removing code. Also named some variables better. While keeping the safety intact and functionality the same.
12 years ago
ca7acbe6d9
Allow specification of which arduino hardware subvariant in Makefile.
12 years ago
33247733e0
Teensylu and Printrboard use different analog pins for thermistors.
12 years ago
621c24a10f
AT90USB is only defined after pins.h is included.
12 years ago
6cba11f087
Stop redefining MOTHERBOARD and #define AT90USB instead. Also put #ifndef AT90USB around the HardwareSerial_h trick, so now Printrboard / Brainwave support compiles on Arduino 1.0.2 as well.
12 years ago
4d351b4846
Improved formatting and comments for consistency.
12 years ago
a30007caa4
If fastio.h is not messed up then Teensylu and Printrboard are actually using the same pins.
12 years ago
6aa87a7b67
Use the same fastio.h definition for AT90USB1286/7 and AT90USB646/7.
12 years ago
b1c38d4c82
Avoid compiler warnings (redefined MOTHERBOARD) in Arduino 1.0 and greater.
12 years ago
42e21bb06e
Add support for Printrboard (from https://github.com/lincomatic/Marlin ) and Brainwave (from https://github.com/metrix/Sprinter ).
12 years ago
ce4b5bbeaa
Add AT90USB646 support from Sprinter to fastio.h.
12 years ago
f413aa33b3
Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile.
12 years ago
587154c01b
Fix the WATCHPERIOD implementation. It did not work correctly in a multi extruder setup, it did not work after 32 seconds after startup (int16 used as millies timestamp). And it did not work if you gave an M104 or M109 when the target was already around the target setpoint. So on average, it did not work at all. The new implementation should be robust in detecting a failure to heat up.
12 years ago
1f27870d41
Fix compiling the watchdog error message when the manual reset watchdog is used.
12 years ago
c5d4225804
Mistake there, not sure why I did that. My bad.
12 years ago
529748894c
Minor changes in the temperature code for some cleanup.
12 years ago
4e26ecc940
The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.
12 years ago
c421774422
The Partial release message (which does not really tell you anything) overwrites the final print time on the LCD, which is a real shame. So I removed the message.
12 years ago
16078e47d4
Fixed #325
12 years ago
6a9bee27cc
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
12 years ago
94ea26ff46
Some minor changes on code style. And a bugfix where the counters for positioning in the stepper where wrong depending on compiler settings. (Caused strange values to reported back with M114 and endstop triggers). Also fixed compiling with FWRETRACT enabled.
12 years ago
6c51fe5039
Fix the bug where the SD percentage calculation is wrong when the file is larger then 42MB
12 years ago
57429cb9fe
Fix for keypad
12 years ago
97fa2a9c30
Few simple fixes that save RAM, as static strings are stored in RAM by default.
12 years ago
c94ca24adc
Fixed #317
12 years ago
99e9554edd
Some fixes in the Makefile to support Arduino 1.0.0 or higher and added the Rambo. Still needs some more work for the different arduino hardware variants.
12 years ago
dbbf050005
More rambo fixes
12 years ago
f934d0ef5b
Merge remote-tracking branch 'tonokip/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
12 years ago
e48dfcc2b3
Tmp copy before merge
12 years ago
b98fb17fe9
Small FREQUENCY_LIMIT changes
12 years ago
bce67ec2c9
Merge pull request #312 from gege2b/Marlin_v1
...
Added french translation
12 years ago
9b1d2483a0
I hope last changes to french translation
12 years ago
b1adc567da
Correction to french translation (non-ASCII chars only)
12 years ago
0807d82af0
Correction to french translation (plain text only)
12 years ago
5cd7a90b32
Added new temperature lookup table creation tool. This one uses stein hart-hart equations.
...
You need 3 temperature resistance:combinations. This gives a better result then using beta.
12 years ago
bb119739b0
Added french translation
12 years ago
df8dd5ac21
Merge pull request #306 from nothinman/Marlin_v1
...
Added automatic build numbering.
12 years ago
2b7b1e52b1
allow marlin internal 0°C represenation
12 years ago
2f771b3979
Added automatic build numbering.
12 years ago
9bebe9b631
Merge pull request #302 from nothinman/Marlin_v1
...
Added Polish translation. Cosmetic changes to English.
12 years ago
a2032afa3a
Fixed #303
12 years ago
6a55ca8370
Added Polish translation. Cosmetic changes to English.
12 years ago
8f20562f49
Fix some of the crowded code style. And fixed the conditional. #300
12 years ago
43018a48c4
Fix for a few -Wextra warnings.
12 years ago
72586eb30a
Solved few warnings.
12 years ago
7a02ba361c
Header multiple include protection should match the filename, not just _ARDUINO_H, which is almost bound to go wrong some day.
12 years ago
f4a89ec776
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
12 years ago
57834776ad
Made the 2nd speed lookup table condition more explicit.
12 years ago
caa2b25b40
Fix Gen7 compile if you have avr-libc version 1.7.1 or higher. See http://code.google.com/p/arduino/issues/detail?id=604
12 years ago
a27fef8750
Store the pre-heat constants outside of the ULTIPANEL define, so we can use them when storing EEPROM in a build without the ULTIPANEL.
12 years ago
789be03b4f
Update on makefile, should make it easier to compile for different boards without changing the makefile. (Still missing Arduino 1.x.x support).
12 years ago
40ce057a3e
Fixing issue #297
12 years ago
625ac81acc
Yes, makes sense, lets NOT use the value directly from the configuration define but modify it before setting it. This will not confuse people (including me) at all!
12 years ago
ffc69537aa
Update on some comments, make the MOTHERBOARD list complete again.
12 years ago
71efcfc648
Most likely fixing issue #295 .
12 years ago
04be9d6001
God damn. Sorry, my mistake, forgot to add this file.
12 years ago
c17da4b707
Add ConfigurationStore to the Makefile.
12 years ago
ccd9fd0dc3
Merge pull request #292 from jothan/lcdfix
...
Lcd fixes
12 years ago
46b9988e26
Search and replace failure.
12 years ago
0f73afb0b0
Avoid defining overriding definitions for the RepRapDiscount Smart
...
Controller. Remove common definitions. Harmonize declaration order.
12 years ago
36b452c7ac
Remove abbrs.
12 years ago
332344bd43
Update Marlin/language.h
...
Included Portuguese language
12 years ago
e6c1cadea0
Set the watchdog to a 4 second timeout, as with 1 second it can timeout during SD card init.
12 years ago
faea7d72b8
Merge pull request #290 from buildrob/Marlin_v1
...
Clean up special serial port cases
12 years ago
12a4d60e18
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
12 years ago
9606f4d04f
Include Marlin_main.cpp in source files.
12 years ago
3cbaad9288
RepRapDiscount Smart Controller pin definitions.
12 years ago
99692dc99e
Clean up special serial port cases
...
Assume SERIAL_PORT 0 if not defined. Collapse un-numbered register
special case. Clarify comments.
12 years ago
5a998558a9
Update suggested by Robert F-C. #289
12 years ago
f6ff0ab767
signed/unsigned fixes.
12 years ago
5d471e0f34
Also reset the PID values to defaults. Fixes #281
12 years ago
d3ebc34958
Hopefully also support chips with a single UART in MarlinSerial now.
12 years ago
b6ff45254e
Better explain the watchdog "problem" and rename the config define so it explains that the feature belongs to the watchdog.
12 years ago
7e348fcb5f
By mistake enabled the watchdog by default. This should be off by default.
12 years ago
06b58a9c4f
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
12 years ago
539f3b3fe4
Merge pull request #284 from brackendawson/Marlin_v1
...
Use the right pins for Gen7 1.4
12 years ago
65c9a0728f
Set default serial port back to 0.
12 years ago
ab9d183024
Make serial port configurable.
...
This change makes the choice of serial port configurable so that
wireless capability can be easily added by connecting Bluetooth modules
(such as BlueSmirf or JY-MCU) to the expansion port pins.
12 years ago
f5631a89e8
Add dummy Emergancy Pin to Gen7 1.4
...
Change required after pulling from ErikZalm.
12 years ago
a4f9e1ebf2
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
2873d67b17
Put bogus temp override back in Gen7 up to 1.3
...
Took out the ifdef when I split 1.4 out and forgot to permanently
define it for <=1.3.
12 years ago
a7e40b2903
Merge pull request #276 from setar/Marlin_v1
...
Fix num of digits on LCD for E and Z axis.
12 years ago
6ed02c86be
Fixed wrong code (will not even compile when EXTRUDERS>2)
12 years ago
2a67363e27
Fix ‘prog_uchar’ definition in LiquidCrystalRus.cpp
12 years ago
205304ddee
Merge git://github.com/ErikZalm/Marlin into Marlin_v1
12 years ago
58bca87c72
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
febeb43197
Revert "fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '"
...
This reverts commit cb02c2f9d8
12 years ago
8178dec4c3
Fix num of digits on LCD for E and Z axis.
...
The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1
12 years ago
70f57a6844
Merge pull request #273 from setar/Marlin_v1
...
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
ff14199e58
Merge pull request #270 from jothan/Marlin_v1
...
Create an explicit rule for building applet/Marlin.cpp.
12 years ago
695938ba3f
Italian language support
12 years ago
cb02c2f9d8
fix LCD temp bed artifacts on power up ' B022/0.) -> B022/000 '
12 years ago
e4a5e333ef
Generalize.
12 years ago
e10d3136c8
Create an explicit rule for building applet/Marlin.cpp.
...
It would seem that the pattern matches do not work when the source
file is created when make is running. The result of this is that it is
necessary to run "make" twice to build the firmware.
This adds an explicit rule without a pattern match for building
applet/Marlin.cpp it corrects the make behaviour at the cost of adding
a little redundancy in the Makefile.
12 years ago
9f089756b7
Merge pull request #265 from setar/Marlin_v1
...
Added Russian translation
12 years ago
326423719f
Add support for Megatronics
12 years ago
d07b6e93d5
Add support for Megatronics
12 years ago
efcc28d347
Fix check for include LiquidCrystalRus.h
12 years ago
cfc193cdac
Enables support the Cyrillic alphabet for LCD
12 years ago
24bcc9647d
Added Russian translation
12 years ago
bf7e453d02
Unwanted artifacts from unclean merge of bed-pid tree
12 years ago
36a746d7d5
Merge pull request #244 from markfinn/pidbed
...
PID for heated bed
12 years ago
df09e2adce
Spanish updated
12 years ago
ddf6603d81
Spanish language updated. Bug fixes on dialogs.
12 years ago
4bf8b1aeee
fesfas
12 years ago
be1e099f1b
Union whit Erick version
12 years ago
7afd202b89
New dialogs translated to spanish. Bug fixes.
...
Dialogs from M119 translated, and "Set Preheat" dialogs adapted to the
screen size.
12 years ago
ebc4601185
Some new dialogs translated to Spanish
12 years ago
c8ea9b0e58
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
12 years ago
ca7ca4572e
primo commit
12 years ago
8016f058bc
fix max endstop pins
12 years ago
d197f8504b
clean up and changes from testing
12 years ago
eb06a886c4
missed
12 years ago
04631d2250
cleanup for pull
12 years ago
0a5ad3ab85
move comment to correct place
12 years ago
8ac5b29e02
Changes to M119 response for easier visual comparison
...
Changed to report on individual lines with "TRIGGERED" or "open" instead of "H" or "L" on one line as H&L could be confused with logic levels High and Low which may be wrong if using inverted logic. Added strings to language.h.
Fixed typo "deu" in English language that was fixed in #134 but got added back in via 9f7f7354f5
12 years ago
c6caa45ae2
Limit Switch locations based on MIN/MAX limits and homing direction
...
fixes #246
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
Relocated code based on feedback.
12 years ago
dc566d654f
fixes #246
...
Added statements to set the limit switch positions to the maximum travel if homing in the positive direction as well as bed center at (0,0) if defined.
12 years ago
ba898faa7d
Merge pull request #249 from gwelchc/patch-2
...
Slight modification for byte savings
12 years ago
0152ee71a5
Merge pull request #248 from gwelchc/patch-1
...
Binary representation for characters in ultraldc.pde
12 years ago
6ccbfeb80c
Update Marlin/Marlin.pde
...
Added function 'setTargetedHotend' that turns into a function an operation repeated 3 times through the M-codes processing.
This modification saves a few bytes that can be used to add support for new commands.
12 years ago
c433142abf
Update Marlin/ultralcd.pde
...
The joris' char drawins are expressed in binary so to show their content's in a more visual fashion.
This is not a code modification as much as a readibility modification.
12 years ago
1d389ad3a8
Fix M81 not working reliably on Gen7
...
Some discussion of the issue is here http://forums.reprap.org/read.php?181,118329,page=1
12 years ago
9698f4ea64
bed pid
...
Conflicts:
Marlin/Configuration.h
12 years ago
e5c39b7c2a
commit
12 years ago
e8c92e0a95
Missing #else in temperature.cpp prevented reading bed temp when TEMP_BED_PIN <7. Thanks to Leland Wallace for helping me track this down via "Sesame Street" coding (what is not like the other)
12 years ago
bf2071871c
Merge branch 'Marlin_v1' of https://github.com/Drakelive/Marlin
12 years ago
fc32e20881
first commit
12 years ago
abf0693e8e
Added KILL_PIN -1 to gen7 boards
12 years ago
47319cf64e
Fixed typo in SF arc fix code.
12 years ago
e358a2d7af
Added fix for SF Arc Point fillet procedure
12 years ago
044a64a1fb
Merge pull request #225 from Justblair/Marlin_v1
...
Added PDF file containing Menu Tree for documentation purposes.
12 years ago
d728e35658
Update Marlin/pins.h
12 years ago
1c1fddc7ac
Added support for the Rambo reprap electronics board. Added Mcodes to set
...
motor current and microstepping pins.
12 years ago
dcd3e8a211
Tidy up
12 years ago
ddd9d0cfd4
Added PDF file containing Menu Tree for documentation purposes. Source xlsx document included.
12 years ago
0e58ef6805
Some dialogs are corrected
12 years ago
0e89022cc3
Correct temptable_55 name.
12 years ago
47d4f55bc0
Fix Gen7 1.4 pinout
...
Gen7 1.4 uses very different pin assignments, might as well make a new
section and remove some of the conditionals from each. It's easier to change
your pin assingment this way if like me you don't wire it exactly to plan.
12 years ago
6cd150842f
Update Marlin/language.h
...
Some dialogs corrected and Default language set to 1
12 years ago
299c18596f
Update Marlin/language.h
...
Some dialogs are corrected
12 years ago
b86336c3f5
Merge pull request #221 from daid/Marlin_v1
...
Long filename support for LCD display
12 years ago
b69e75c89a
Added long filename support.
12 years ago
1d224cc031
merged with upstream and FIXED AGAIN bad translation commit
...
PLEASE BE MORE CAREFUL WHEN SUBMITTING NEW TRANSLATIONS
When you add new menu items / messages always copy them to ALL
languages (just use english)
12 years ago
06c03fe2f0
new method for message for making KILLED message visible
...
The cli(); at the start of the kill() function also stops the internal
arduino timer which stops updating of millis() which prevents the
display of the "KILLED." message.
The new function updates the display directly without checking any
timers.
12 years ago
87ff61a8a6
Fix for #201
12 years ago
aacbebbebe
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
12 years ago
31873ec707
changed int to long to overcome overflow of number display
...
- related bug reports: Issue #201 , Issue #213
12 years ago
de0448343f
added KILL_PIN support / cleaned up manage_inactivity function definition
12 years ago
69961dbba3
fixed incorrect menu messages from last commit...
...
- removed several multiple definitions of same message
- fixed definition of missing messages in german and spanish
- tweaked german translation (a lot)
- added note about changing and testing this file
12 years ago
6c050b8440
Fixes error introduced at commit aee475aa55 which caused the sketch not to comile for language option 1. Several defines were removed but still referenced in ultralcd.pde
12 years ago
b9f9f8f7d3
The pre-heat ABS and PLA options in the LCD Menu were broken a while back. The pre-heat worked fine, but the cooling fans were not switching on as intended. This is now fixed.
12 years ago
d38b96fff1
Update Marlin/language.h
12 years ago
9f7f7354f5
Set default language 1
12 years ago
aee475aa55
Update Marlin/language.h
...
Spanish language included. It features the LCD screen messages and a small part of the Serial messages.
12 years ago
9083966c22
Do not use feedrate multiiply on Z and E only moves.
12 years ago
5406c533db
Disable FAST_PWM by default. On some systems it does not work ok.
12 years ago
f92dc91c3d
Enable M503 also when eeprom is disabled
12 years ago
35a1dd081f
no message
12 years ago
5131ab19ca
Fixed Retract in LCD Menu
12 years ago
96f4f90cb3
Added pause and retract lcd menu items
12 years ago
e10355500d
Updated Language.h with pause, resume, and retract
12 years ago
a97c006bbf
Merge pull request #195 from kobaan/Marlin_v1
...
Updated german translations in language.h
12 years ago
f062794a0d
Merge pull request #208 from Enchiridion/Marlin_v1
...
Added support for dual Z axis stepper drivers
12 years ago
57468d3c21
Merge pull request #210 from Dabble63/Marlin_v1
...
Add Duty Cycling to the Heater Bed
12 years ago
6b45e9f167
Add Duty Cycling to the Heater Bed
12 years ago
adee81170d
M206: save values in eeprom
...
Really, we should have a way to adjust the XYZ homing of a machine in
the eeprom. So as the second stage of this, make the M206 home offset
parameters subject to the M500/M501/M502/M503 eeprom commands.
Bump the eeprom version to "V06".
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 years ago
1dba212e18
HOMEAXIS: make into a function
...
Replace the large macro HOMEAXIS with a function. This avoids the
compiler generating three copies of largely identical code. The
saving is 724 bytes of program memory.
We make use of XYZ_CONSTS_FROM_CONFIG to provide convenient
array-shaped access to MAX_LENGTH, HOME_RETRACT_MM and HOME_DIR.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 years ago
7bb326d389
eeprom: provide smaller code for SERIAL_ECHOPAIR
...
SERIAL_ECHOPAIR implies, eventually, two calls to MYSERIAL.print. One
of these has FORCE_INLINE for a per-character loop, and both involve
constructing a method call rather than a simple function call.
Produce better and smaller code by providing three specialised
functions serial_echopair. This saves 672 bytes of program memory
(with EEPROM_SETTINGS and SDSUPPORT enabled).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 years ago
957e966d2d
M206: always use homing ("homeing") offsets
...
Previously the parameters set in M206 would only be used if a G82
command was sent with specific axis home values. This limits its
usefulness.
Really, we should have a way to adjust the XYZ homing of a machine in
the eeprom. So as the first stage of this, make M206 affect every
home command. The values set using M206 are now added to the
configuration variables [XYZ]_HOME_POS.
This is achieved by replacing all uses of [XYZ]_HOME_POS in the code
by a new home_pos[] which includes the adjustment. We also have to
adjust the uses of [XYZ]_{MIN,MAX}_POS similarly - see below.
To allow axis_is_at_home to be written as a function taking an axis
index rather than a macro taking an axis letter, we provide
constant arrays in program memory containing the values of
[XYZ]_{MIN,MAX,HOME}_POS from the compiled-in configuration.
This is done with some helper macros to deal with the declaration
(XYZ_CONSTS_FROM_CONFIG) and definition of the inline function which
does the program memory access.
We also introduce the overloaded function read_pgm_any, whose
instances are produced with DEFINE_PGM_READ_ANY, which allows the
access functions to automatically produce the correct type.
The type- and pointer-massaging code in the access function boils
down, when compiled, to a simple program memory access.
A question arises: if the M206 offset is set, should this adjustment
to the home position shift or change the possible range of movement
permitted by the software endstops ?
The documentation in Configuration.h describes these limits as:
// Travel limits after homing
Since this is a file containing physical limits, and actual suggested
values for these configuration parameters appear to include a certain
amount of slop, I've taken the view that these should be regarded as
nominal physical distances from the limit switches, and that the
permissible travel should be unaffected by M206.
So for example with the (rather unrealistic)
#define X_HOME_DIR -1
#define X_MIN_POS -20
#define X_HOME_POS 0
#define X_MAX_POS 100
no matter the setting of M206 X, the machine would be permitted
to move from 20mm "beyond" the limit switch trigger point in
the negative X direction and 100mm away from the limit switch in
the positive X direction, for a total travel of 120mm.
With M206 X-10 that would be considered to correspond to X coordinates
-30 to +90. With M206 X+10 that would be considered to correspond to
X coordinates -10 to +110.
fixes #200 (in ErikZalm/Marlin).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 years ago
faccb35850
software_endstops: use *_MIN_POS and *_MAX_POS for arcs
...
If [XYZ]_HOME_POS and [XYZ]_MIN_POS aren't 0, these corrections are
wrong. Use the same logic as in Marlin.pde:prepare_move: ie, clamp to
[XYZ]_{MIN,MAX}_POS.
While we're here, put this cut-and-paste code in a function
clamp_to_software_endstops.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 years ago
3f15b7c7b8
Makefile: Better display of size (device memory usage)
...
Run avr-size with the --mcu=... -C option as well. That reports how
much actual device program and data memory is used along with a
percentage fullness.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 years ago
0c35facc94
Makefile: support V=1
...
Often it can be useful to see the actual commands being run by make.
Other projects (eg, the Linux kernel) support this with a "V=1" make
parameter. Do the same here.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 years ago
71404eef29
.gitignore: Add *~, *.orig, *.rej, move to root directory
...
Move the .gitignore out of the Marlin subdirectory so it applies to
the whole tree, and add some missing patterns.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 years ago
a873541ef6
Marlin.pde: include comment for emacs mode
...
Emacs by default doesn't recognise a ".pde" file as C++ source code.
Add the annotation to the top of the file to make it work.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
12 years ago
50cde90324
Added support for dual Z axis stepper drivers
12 years ago
603a5e25b3
Updated german translations in language.h and eliminated a few double lines.
13 years ago
538189cc19
Fixed soft limits when the origin is in the middle.
...
HOME_POS is now always where the endstop is and can be outside the limits.
The limits are now defined by MIN_POS and MAX_POS rather than HOME_POS and MAX_LENGTH.
The Z is axis now homed first if direction is away from the bed.
Saguinololu limit pins change from MIN to MAX according to the homing direction.
13 years ago
686011a548
Fixed typo
13 years ago
cd57bf305b
Merge git://github.com/daid/Marlin into Marlin_v1
...
Added invert step pins to corexy code
13 years ago
ea2c19f978
Added CoreXY support (Thanks Ilan Moyer)
13 years ago
aa65fe22ed
decoupled axes sucessfully at least on pure x or y jog
13 years ago
12de8fff81
Support step motor controllers with active low step pins.
13 years ago
b67dacdc8f
Fixed AD595 define
13 years ago
d3002ef741
corrected retract
13 years ago
0c123950e9
__ header file replace
13 years ago
bf077125b9
added firmware retract. disabled by default
13 years ago
0e5e249ab5
added individual pullup setting option to have finer control in case there is a special z-min sensor, for example
13 years ago
6b14f95b3e
Merge pull request #170 from linagee/Marlin_v1
...
Marlin v1
13 years ago
c7ce99d495
Merge pull request #172 from daid/Marlin_v1
...
Add M401 - Wait for user to press button on LCD (with optional timeout) minor fix in M115.
13 years ago
b7fc14bc65
repaired thermistortable_6 by graphcial fitting of the off-slope values. see issue 179. Erik, I know you asked for no changes, but this file probably is not related and hopefully allright.
13 years ago
9e1021efbe
Fixed SL bug.
13 years ago
e9bec9b6fe
Fixed E1_ENABLE pin for Ultimaker. This was wrong for the 1.5.4 and 1.5.3 PCB (I cannot check the 1.5.6)
13 years ago
fbd282b3ba
Update Marlin/Configuration.h
13 years ago
2e8c5049c5
Update Marlin/thermistortables.h
13 years ago
2d0d8e5272
Small correction.
13 years ago
4d7fe7115f
Changed M401 to M0/M1 as suggested, so they match normal CNC stop commands.
13 years ago
9e9db65c3f
Update Marlin/thermistortables.h
13 years ago
bd966ef389
Update Marlin/thermistortables.h
13 years ago
775da3f103
Added top ratings and extended to ADC=1 for table 3 and 5.
13 years ago
96a4baa0be
Update Marlin/thermistortables.h
13 years ago
2aa9f7b131
Update Marlin/thermistortables.h
13 years ago
c4490f5f3d
Update Marlin/Configuration.h
13 years ago
dd9144994e
Tested May 19 - It works! Verified with separate thermocouple TM-902C also.
13 years ago
4c37d0d9f1
Extended range above 250C. (Operating range states up to 300C)
13 years ago
b59724e42b
Add strigification for extruder amount in M115 report.
13 years ago
16413bb8f2
Last M401 update, refresh the LCD during an M401 wait.
13 years ago
b3941fce5c
Update after testing
13 years ago
d494688565
Do not initialize in the header file.
13 years ago
516ec90242
Add M401 - Wait for user on LCD button press
13 years ago
7244aa7eb7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
de2ca3b2e8
Grammar correction.
13 years ago
c2fc466e1b
Update Marlin/Configuration.h
13 years ago
241f5a4c0e
Update Marlin/thermistortables.h
13 years ago
9f9f498491
Update Marlin/Configuration.h
13 years ago
e31bef31ad
Limit PID autotune PWM to PID_MAX
13 years ago
b2a9ccdb97
Merge pull request #159 from MaikStohn/Marlin_v1
...
Marlin v1 - BUG FIXES / CORRECTIONS
13 years ago
d459fb41b7
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
804e0d6117
Merge pull request #164 from guanix/Marlin_v1
...
Melzi support
13 years ago
ba96059203
add additional dropsegments test
13 years ago
fbd91ab0b5
Fixes #153 for bad call to abs()
13 years ago
b51c06e2b3
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
159ae90874
bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only)
13 years ago
e48f5aa6a7
fixed typo
13 years ago
1efe9ab497
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
13 years ago
602c8ee02b
Melzi support
13 years ago
279d00da9f
Fixed #if for Ultimaker.
13 years ago
451f9cc6d1
Residual in the comments: there are no more mm/minutes but only mm/sec in the planner buffer.
13 years ago
e3fe1f0d00
Made a more granular configuration possible PREVENT_LENGTHY_EXTRUDE. You can now decide to allow/disallow large length of extrusions to be executed.
...
Turning off the protection might be beneficial to those who want to do fast and long reversals.
13 years ago
d88205d89d
Suggestion to improve (TODO), no actual code changed
13 years ago
5aa80e6c05
Made language.h more flexible. Automatically do the right defines based on MOTHERBOARD == 7 ? "Ultimaker" : "Mendel"
13 years ago
b657a18449
Revert "magic PROGMEM defines to avoid hundreds of wrong GCC warnings"
...
This reverts commit 3682d9bd5b
13 years ago
d188ae4c9d
added missing declaration of buttons_init()
...
This is required when moving the buttons_init() function to the
lcd_init() function
13 years ago
3682d9bd5b
magic PROGMEM defines to avoid hundreds of wrong GCC warnings
13 years ago
032df0b2c6
Moved LCD initialization out of constructor
...
Since the class "MainMenu" was used within a static variable the
initialization of the object (constructor call) was done before Arduino
library startup. It always caused a crash when using AVRStudio with
JTAG debugger (caused from calling the LCD initialization / the lot of
I/O work / the stack used during this calls). By moving the LCD_INIT
out of the constructor and using an explicit call inside of Arduino
setup() implementation immediately fixed all problems and the JTAG
debugger runs fine.
13 years ago
bd1ad7c76a
explicit includes to make it compile with AVRStudio/Eclipse
13 years ago
060b38de5c
delete obsolete and wrong code
...
"i" runs from 0 to 4 but "add_homeing" array size is 3 only. On the
other hand the calculated value gets overwritten by either one of the
if choice.
13 years ago
789ba02d43
fixed typo in comment
13 years ago
1874cb71a6
Added option to increase the FAN PWM frequency.
13 years ago
6a5a34e0ff
Small cleanup
13 years ago
e3821bd86f
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
02af69911e
Added temperature window to M109. This is needed for systems with no overshoot PID.
13 years ago
e203b8c754
Merge pull request #154 from daid/Marlin_v1
...
Added 2nd extruder temperature LCD readout and setting.
13 years ago
362ddc4efc
Merge pull request #155 from Atntias/patch-1
...
adding M120 and 121 for turning on and off the endstops only for homing
13 years ago
c27081aa4a
Fix to allow M120/M121
13 years ago
e11e072eca
adding M120 and 121 for turning on and off the endstops only for homing function
13 years ago
8e68c6cf89
Show proper temperature for extruder 2
13 years ago
8503b78876
Added support for 2nd extruder temperature to UltraLCD
13 years ago
3eacb4c16d
Wrap the call to turn off the bed heater in a #if to prevent a compile error on boards that do not have a bed heater
13 years ago
e4d2138dbd
reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time.
...
Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt.
actually, it solves a problem with the UltiControlle
13 years ago
464b755918
added support for the UltiController
13 years ago
44fd8d46d2
fixed quickhome
13 years ago
33bb044d7c
fixed catsting to (int)e in serial error messages.
...
see https://github.com/ErikZalm/Marlin/issues/148
13 years ago
c2557abc03
Merge pull request #138 from triffid/fix-makefile
...
make should rebuild if configuration or Makefile is changed
13 years ago
67cf105bc6
Fixed AUTOTEMP (M109 S215 B260 F1 starts autotemp)
...
Changed SLOWDOWN. IF this does not work ok OLD_SLOWDOWN is the old algo.
13 years ago
8aee9d51b6
Disabled disable_heater in PID_autotune.
13 years ago
414408b2d0
Fix for wrong systax in #ifdef.
13 years ago
77d503fa13
Fix Makefile
13 years ago
cf7c8c458f
Fixed MAX6675
13 years ago
03b0850e63
This breaks temperature readout for pronterface!
13 years ago
ad8bc71d3e
- Fixed a typo
13 years ago
46feae79c6
Fixed typo in arc
13 years ago
4ca2f336f0
Changed default MINIMUM_PLANNER_SPEED -> 0.05
...
Fixed small bug in arcs
M105 prints now actual_temp/target_temp
13 years ago
ae0bf8068b
Fixed arc offset.
13 years ago
0c1b863755
Ignore ":" in comments.
13 years ago
63aec3c56e
Replaced Kill by Stop. If the printer is stopped. Fix the error and use M999 to restart.
...
Moved the PID_dT in the Ki and Kd calculation from the configuration.h to temperature.cpp
13 years ago
8b785f75a6
Merge pull request #123 from buserror-uk/for-upstream
...
For upstream
13 years ago
520f1a54a8
Fix compilation error when PIDTEMP is undefined and ULTIPANEL is defined.
13 years ago
5550e893d5
New board variant, Open Motion Controller
...
Open Hardware board currently used by the group build of http://tvrrug.org.uk
The board can be found at http://solderpad.com/folknology/open-motion-controller/
Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
aa6e6e914e
Makefile: Redone
...
+ Removed most explicit pathnames, use the standard make "VPATH" to let
make find the files for itself.
+ Added a "hardware variant" variable that allows compiging Sanguino and
Gen7 as well as "generic" arduino.
+ Allows overriding the MOTHERBOARD define from the Makefile
+ Removed the 'preprocessor' bit that wasn't needed, now just "include" the
files that are needed, since it allows gcc to show the right file/line
when displaying error/warnings.
+ Uses gcc's own dependency generator to generate the .d files, and
and include these instead of self-patching the makefile
Signed-off-by: Michel Pollet <buserror@gmail.com>
13 years ago
0183e6332a
made prepare->autostart independent of current folder.
13 years ago
1532200435
found error in filenames.
...
One array was too short. This had nothing to do with long filenames, other than if they were 12 characters exactly, which could only happen if the extension and the text before were filled completely
13 years ago
b985e4a134
Fixed compile errors in ultralcd when no ultra_lcd is selected.
13 years ago
2e749d60c3
Added DISABLE_MAX_ENDSTOPS
13 years ago
33f5697888
PPID tune exports more constants.
13 years ago
b44055cc51
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
f5eae52098
Added more manage_inactivity checks
13 years ago
19a47dae4a
Merge pull request #99 from Justblair/master
...
Better pin configuration for rotary encoder in RAMPS boards
13 years ago
910f4e77a2
Added 20MHz support.
13 years ago
7cefad3744
Merge pull request #106 from bgamari/Marlin_v1
...
Make F_CPU dependence of stepper.cpp more explicit
13 years ago
87ff2f8867
Added CONTROLLERFAN. (Controlling a fan to cool down the steppper drivers)
13 years ago
387fe51a56
Do not disable steppers when there are moves in the queue.
13 years ago
421264e58a
Fixed typo
13 years ago
15ad923310
Removed !!!. Stupid arduino bootloader can't handle this.
13 years ago
61e09e6be2
Added FAN_PIN -1 checks
13 years ago
87c4e06c24
Corrected active_extruder when autotemp is used.
13 years ago
7b1e295f34
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
c077316b2b
Added PID autotune. (experimental)
...
M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed.
Put these values in Configuration.h
13 years ago
49b228c4b3
Add instructions to regenerate speed_lookuptable when changing F_CPU
13 years ago
96509494f0
stepper: Clarify comment on timer-counter configuration
13 years ago
6d7e6a11fc
Add create_speed_lookup
13 years ago
ce07c9186d
While Waiting for hotbed to warm up via M190, LCD Display and Click Encoder input freeze until target temperature is reached.
13 years ago
116dc86b8a
Fixed type in e-jerk
13 years ago
02ee9e3d30
Changed Pin Assignment for the RAMPS motherboard so that LCD and Rotary encoder are all wired to AUX-4
...
This simplifies wiring for those with RAMPS 1.3 and 1.4 boards.
13 years ago
e056bf8081
Added E-Jerk
13 years ago
4deeffbc88
Added missing defines to the german section.
...
Translation still needed.
13 years ago
632528aa95
merging with SCUBA82
13 years ago
aac7aa3bf0
Queued fan control. Issue #90
13 years ago
fde51084f3
set SD file delete to M30; switch printime output to M31
13 years ago
21e2bae063
Changed (corrected?) SD_card comment handling.
13 years ago
e509bbf636
Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1
13 years ago
072011a3ef
Added current_block = NULL to quickStop()
13 years ago
2422a857a1
Merge pull request #96 from haxar/Marlin_v1
...
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, ...
13 years ago
f598077af3
Removed vc files
13 years ago
cb0c84e075
Merge remote-tracking branch 'justblair/master' into Marlin_v1
13 years ago
1d5809d458
Merge pull request #88 from daid/Marlin_v1
...
Made plan_buffer_line arguments const...
13 years ago
ed951b1977
Fixed RAMPS 1.2 support (Found and fixed by rrhb)
13 years ago
4879de08e8
The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);".
...
The percent complete now lines up with the temperatures and Z-axis position figures, nicer to read and nicer to look at IMHO.
13 years ago
f278e1c00f
This is in my opinion a much better way of dealing with SD cards than my previous fix.
...
Instead of adding a momentary switch to fake the insertion of the card I have modified the ultralcd menu item:
Card Menu -> Refresh
to reinitialise the card providing that the SDCARDDETECT pin has been set to -1 in the pins.h file. This requires one less switch on the front panel and the refresh menu item is in the most relevent place for a user who wishes to inert a card and then print from it.
It also means that the "Card inserted" messages do not bother the users of these card readers (they dont make sense for users without SCCARDDETECT)
13 years ago
046a8e0039
Added more defines to the language.h file so that nowe most of the text strings are now configured via this file. Still got some hunting down to do to complete this task.
13 years ago
79a466ca26
make analog2tempBed return a precise celsius reading for BED_USES_THERMISTOR, complementing changes to analog2temp in d15f01e
13 years ago
5f3a422e68
added M31 - delete file from sd card
13 years ago
fa2e3a40e9
fixed LCD manual z axis move Feedrate to 70 (was 1700)
13 years ago
a92b3afe64
added german translation;Menue should be in english.. sounds better
13 years ago
9fa586bbed
fixed languages; Preheat_PLA and Preheat_ABS was not defined for non
...
english
13 years ago
00d33e6b82
Typo fix
13 years ago
7d124478fa
Only protect the heater pins for the defined extruders.
...
Changed the way the extruder pins are defined so it doesn't create extra -1 entries in the list.
13 years ago
3d83109028
Fixed general 16x2 LCD build without SD support.
13 years ago
cb02914687
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
13 years ago
10bf2bb8e1
-
13 years ago
d47b666630
Merge branch 'Marlin_v1' of git://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
88d289caa1
Made plan_buffer_line arguments const, which optimizes better and fixes the RUNOUT_PREVENTION feature.
13 years ago
b4833d55c2
Fixed HOME_POS in combination with G28 X0 or G28 Y0
13 years ago
c6f2ec3c82
remove stop_heating_wait
13 years ago
b48d67ce10
Fixed homing
13 years ago
071eec7aa7
Merge pull request #81 from phord/09469add5560ca8a676c42e4bcd499868c33f0dd
...
Clean up and add some trace info
13 years ago
1ebe7d1ab6
Merge pull request #83 from phord/tempfix
...
Add explicit #define for bogus temp override
13 years ago
b65ef8d66c
Add support for upcoming Gen7 v1.4
...
V1.4 moves thermistor power to the always-on 5v line.
The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer
needed on this board. Add a new motherboard type to
support this feature.
13 years ago
740f0c7690
Add explicit #define for bogus temp override
...
The code to ignore the "bad thermistor reading failsafe"
suicide function depends on the existing of the PS_ON pin
feature. But in some boards this shouldn't be the case
Fix this by adding an explicit definition to make our
intentions more clear and separable.
13 years ago
ba8500a236
pins.h: Define Z_MAX_PIN for Gen7 board
...
The Z_MAX_PIN value was defined as no-value, but this causes
the compile to fail. Fix this by setting the Z_MAX_PIN to the
correct value (which happens to be 0 for pin PB0/DIO0/0).
13 years ago
09469add55
Add board reset reporting (from Repetier-Firmware)
13 years ago
f3101e96d9
Add suitable .gitignore to avoid build noise
13 years ago
245dca4bee
Makefile: generic pde=>cpp rule
...
This adds flexibility to the makefile by allowing different pde
targets to be specified for different needs.
13 years ago
97d42ca2b2
SDSUPPORT default disabled
13 years ago
7b14953c99
Fix build on Sanguino based boards with ATmega1284P
13 years ago
286d5003fa
Fixed compiler warning for Sanguino compile
13 years ago
66d50562b6
Merge pull request #76 from iXce/Marlin_v1
...
Fix Makefile
13 years ago
27f595a444
Changed version => RC2
13 years ago
018c567abf
Moved SLOWDOWN function. (jetty840)
...
Included AD595 calibration options. (daid)
13 years ago
4fbda5c3f5
Merge remote-tracking branch 'daid/Marlin_v1' into Test
13 years ago
ce714fe306
Fixes in pins.h
13 years ago
35e57bf149
Added gen6 deluxe.
13 years ago
84ea2d61e8
Moved gen7 boards to motherboard type 10, 11 and 12.
...
Split ramps1.3 in Sprinter like config and multiextruder config.
13 years ago
adc108d79e
Correctly build the produced applet/Marlin.cpp source
13 years ago
5aa9c41ab1
Changed comment mode for detection.
...
Added M221 extuder multiply factor.
13 years ago
00690f7ffd
Fix cast warning in Gen7
13 years ago
01d28c18ab
Fixed casting warning in sanguino
13 years ago
2fd8c248fe
Added Fan control to the pre-heat settings.
...
I find that the PID routine works better when the cooling fan is switched on
at the beginning of a warm up routine. Otherwise when you enable the fan
just before a print, you have a delay as the PIDre-adjusts.
This should also be safer as most cooling fans are directed at the hot -ends
thermal barrier!
13 years ago
d9f2f509d5
Added new menu items under the prepare submenu.
...
Instead of a single pre-heat, now there is pre-heat ABS and PLA options
Added defines to the configuration file to adjust preheat temperatures for both
13 years ago
ae3e7586c6
Added HOME_POS. This adds the posibility to make the center 0
...
Updated the Xsteps ... settings via the LCD menu
13 years ago
df1437bd86
Changed display format for some numbers.
13 years ago
8816ef1c64
Small fixes after merge
13 years ago
d298dd121f
merged SBUBA82 and Justblair
13 years ago
2cc9a89830
Merge remote-tracking branch 'SCUBA82/Marlin_v1' into Marlin_v1
13 years ago
a0a1f81913
various changes
13 years ago
8a8ea50f33
fixed manual axis movement lcd option
13 years ago
b976692d0f
Removed VS project files for tidyness stakes
13 years ago
fe940a142d
Added a structure that will allow easy translations/modifications to the LCD menu.
...
Signed-off-by: Blair Thompson <mail@justblair.co.uk>
13 years ago
b3fb09a20c
change preheat to ABS values of nozzle 227 and be 105 C
...
next try for manual axis movement
13 years ago
a05a261b72
Added a workaround. Ramps SD card does not have sdcarddetect. My temporary solution is to add a momentary swtich
...
that pulls down the SDCARDDETECT pin and mimicking the pull and reinsert ofa a SD card
13 years ago
1b6765ed12
Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface
13 years ago
1ff99ae25f
ATMega1284P support for Arduino IDE
...
replace $ARDUINO_HOME/hardware/tools/avr/etc/arduino.conf with this file
13 years ago
e661578c84
support for GEN7 1.1,1.2 and 1.3
13 years ago
73344e69c1
Added temperature offset/gain settings for AD595.
13 years ago
d309565b56
Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
13 years ago
0e3631ff4b
smaller changes
13 years ago
fa2e1be0ca
changed default EXTRUDE_MINTEMP to 170.
13 years ago
7699f250e3
Fixed small merge bug
13 years ago
11518a987f
merged with triffid fork
13 years ago
13e185d330
removed unused HEATING_EARLY_FINISH_DEG_OFFSET
...
Simplified stepper inactive time
13 years ago
b58eae7657
Corrected e-length calculation in planner
13 years ago
2a77c84c8f
Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.
13 years ago
d47a3e5950
Changed check i mtion_conrol
...
if (millimeters_of_travel == 0.0) => if (millimeters_of_travel < 0.001)
(thanks mooselake)
13 years ago
f87c80889f
Fixed M109 timer overflow (reported by triffid)
13 years ago
154de69c02
Print configuration.h version during startup (thanks hairykiwi)
13 years ago
6ef8459494
Corrected distance calculation. (thanks jv4779)
13 years ago
598eb1d4f1
Fixed compilation for gcc-4.6.2 with avr-lib-1.8.0 (thanks daid)
13 years ago
9173a5713b
Teensylu support.
13 years ago
da040fd393
Fixed ultimaker heater 1 pins. (Thanks daid)
13 years ago
bdb70c0509
Warning for 10k thermistor
13 years ago
5113513cb2
RC 1
13 years ago
d8a0c6450f
Split the configuration file in two parts.
...
One for common settings.
One for advanced settings.
13 years ago
4cc8e37bf1
lcd menue "move_axis" added
13 years ago
b5fae1104b
fixed sUICIDE_PIN disable
13 years ago
f9c5333f97
Made "stop heating wait" optional.
...
Default off.
13 years ago
292ddd2edb
Fix Z_LATE_ENABLE
13 years ago
25cd8af536
added arduino ide GEN7 support Files
13 years ago
14702089ee
-disable TEMP Min MAX Kill while using PS_ON Pin
...
ON GEN7 there is no temperature reading when power is off.. so Marlin
would kill itself. There seems to be an update from "Traumflug" on GEN7
using standby VCC for thermistors.
13 years ago
b51e8bf7e5
-disabled CARDDETECT if PIN is set to -1
...
- redo disable Beeper if PIN is set to -1
13 years ago
3183a14755
-added Configuration for GEN7 which worked for me
13 years ago
5edef148fe
-disalbe beeper if BEEPER_PIN = -1
13 years ago
13e2ad2831
- added info for using GEN7 configuration
13 years ago
59cc5f889e
- added support for ATMega1284P
13 years ago
a11f3b2d2f
- Pins for modified GEN7 assigned
...
- Added support for ATMega1284
13 years ago
abb7e63906
fixed z-disable bug.
13 years ago
9f139d6e0e
Added MAX6675 support. (Thanks to gregfrost)
...
Needs some work to remove the blocking in read max6675.
13 years ago
e45e5c68bb
Added support for Gen3+ (Pins file only)
...
Added late z enable. (blddk request)
Only calculate look ahead if >2 moves in buffer.
Removed some FORCE_INLINE to save memory.
Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years ago
9c918a497b
more work on Makefile - actually rebuilds if Makefile or Configuration.h are altered, also much cleaner output
13 years ago
ab01658fd2
local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes
13 years ago
42bedb3f60
PROGMEM elements must be const
13 years ago
a991bde523
enable auto-reset before programming, disable afterwards
13 years ago
3e575533c5
get M81 working
13 years ago
2ae2ead97b
help residency not overflow
13 years ago
71dc82e0b4
my local configuration
13 years ago
5aadc2f5ca
cardreader needs to include some other files
13 years ago
8d0916af13
allow Marlin to actually compile with Makefile pulled from Sprinter and a few other modifications
13 years ago
6cc6029d7a
M109 EOL fix when TEMP_RESIDENCY_TIME is undefined; printer interface (pronterface) could not see target extruder heater temperature to continue print
13 years ago
157aa7f2fd
m115 eol fix
13 years ago
7aeb45303d
small mistake
13 years ago
cee5f9020a
added suicide pin for a power supply to the arduino that is only active if the arduino is holding high for an output.
13 years ago
3814bbb529
made sd code only compile with SDSUPPORT defined. safes 10k of codespace
13 years ago
729cde4475
fix autostart failure if in wrong directory
13 years ago
396270a0de
fix duplicated definition of MOSI MISO pins in case motherboard==33
13 years ago
11f2dafc4e
one step closer to a functional makefile..
13 years ago
8463e39a4a
starting with sanguino arduino 1.0 compatibility
13 years ago
2bc160a978
add wiring.h, that can be used to overwrite:
...
arduino-0023/hardware/arduino/cores/arduino/wiring.h
this is necessary if the avr libraries are recent, but arduino is old. Alternative: newer arduino
13 years ago
57f9359a41
simplified the includes, makefile now works with arduino23
13 years ago
3c1a4aac2b
header file simplification
13 years ago
212515148e
added m240 photography support. default off
13 years ago
6735025428
cooldown
13 years ago
415aadf704
lcd panel bed support
...
advance and ultipanel not any more in default config
13 years ago
554cc1718d
Fiexed E_ENABLE_PIN errors
13 years ago
617968ab76
G92 fix
13 years ago
84d9cf7339
merging
13 years ago
e017228569
Merged multiple extruder support.
...
Soft PWM. (Sanguinololu can also have PID temperature control)
Interrupt save WRITE for addresses > 0x0FF
13 years ago
3320a5b37d
make autotemp compatile for use without pid
13 years ago
06411d5c9e
ultralcd can now also stop the wait loop for the hot-end m109 heating when stopping sd prints.
13 years ago
82c99625fa
instant stop of sd prints from the panel.
13 years ago
01001b89d2
repaired nozzle runout prevention to not collide with automatic stepper disabeling.
13 years ago
88ee053af0
heating up santity, formarly knows as "watchdog", but renamed due to the existance of the real watchdog, works now.
13 years ago
b1d84d879b
st_synchronize back to normal..
13 years ago
f6fe7143e4
Merge pull request #29 from k-eex/Marlin_v1
...
Fix M201 not saving settings in all places, so the changes did not get written into EEPROM
13 years ago
dde4b40fa9
disable steppers in runout prevention
13 years ago
2bc5e7ec9e
prevent too long extrudes, or too cold extrudes
13 years ago
aa4f9a6474
better values.
13 years ago
87fd249c43
made runout prevention independent of tempeorarily set esteps
13 years ago
1ec0c3b68a
extruder runout prevention.
13 years ago
5b4625f79c
added a partial release option to "m84" aka "stepper release". If you do tiny layers, you might want to keep the z-axis powered to not loose height positioning after homeing.
13 years ago
cc4a9cdb69
added autostart procedure trigger to the ultralcd menu
13 years ago
61c943b4bf
fixed the st_synchronize. it would have continued if there is only the last move of the buffer being stepped.
13 years ago
bae1e422f6
Fix M201 not saving settings in all places, so the changes did not get written into EEPROM
13 years ago
754d2d69b2
z homing sound fix, for now until the actual cause is found..
13 years ago
986f0ba76c
moved <stdio.h> to more dominant location.
13 years ago
460b788d78
repaired homing position setting.
13 years ago
4fd75dc813
Working version of multiple extruders (up to 3)
...
- The temperature control is pretty much complete
(not sure what to do w/ autotemp though)
Changed the pins assignment to clearly separate bed and extruder heaters
and temp sensors, changed a bit how termistor tables are handled.
- The steppers control is rudimentary
(only chanages what pins it uses depending on the active_extruder var,
but that's enough for switching extruder in the start.gcode in the
the profiles)
- Tested only w/ RAMPS 1.4
13 years ago
12e8edcac3
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
cf50ba140f
added M503 to display eeprom storage, and renamed eeprom routings. This version is compatible with the qtmarlin eeprom-tab.
13 years ago
89e832c295
Update endstops only for homing. (use less resources when not used)
13 years ago
b99c49ec3b
Add option to only check endstop when homing
13 years ago
95a0b28acb
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
af22e9cd38
Some advance modifications
13 years ago
7714b98da7
solved some compiler warnings that are now visible in arduino 1.0.
...
Found a couple of unused variables, that I commented.
Tried to solve the program memory warning message, and failed.
13 years ago
dfd240b260
overworked autotemp, removed one layer of nesting from the ultralcd.
13 years ago
4f909963e4
make QUICKHOME configureable
13 years ago
6b86f15686
More 2nd extruder implementation. (Not usable)
...
Advance (not tested)
13 years ago
0bc9daa4f7
make it compile with arduino 1.0 ; function is still untested.
13 years ago
b0c3871750
more fixing of the sanguino math round problem
13 years ago
9c57453168
removed stream.h referenece from marlinserial.
13 years ago
59205ac5fc
preliminiary implementation for the early heating finish.
...
Might be replaced by something more clever, e.g. by erik, and does not yet support the second extruder or the bed.
its kind of not so cool, because you need 6 more ints.
Maybe isheating() should use the degrees directly, as it is not used in time-critical anyways.
Then it would be much easier. to have the offsets without additional variables.
13 years ago
7a4be21b4f
made it compile if arduino decides to include files in a differnt order. DEC HEX and stuff now defined in MarlinSerial.h
13 years ago
716e89b87c
first homing move diagonal towards home switches.
13 years ago
d00b7e5587
repaired compiliation in windows
13 years ago
e4ab0e5982
more inlines
13 years ago
8cb29921a0
possible stepper release after sd printing
13 years ago
044886b4a0
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
b19c8b74b9
force inline
13 years ago
6d95644c0d
Moved M88 into M84. (M84 E)
13 years ago
311627141b
Merge branch 'smallopt' into Marlin_v1
...
Conflicts:
Marlin/temperature.h
13 years ago
7216a12856
Disabled M88 for boards that don't have seperate enable pins.
13 years ago
98805c9228
Added M88 command. (Request from Action68)
13 years ago
85da81e673
inlineing of small functions in serial
13 years ago
b9ad0bb2ce
removed unecessary indirect register adressing in serial.
13 years ago
dd5ca68c87
get rid of indirect ringbuffer calls, made some inlines, removed virtual and streaming class requirements.
13 years ago
dd5296ad4d
Fixed temperature reading bug.
...
(When using the lower and upper adc input bank)
13 years ago
f75f426dfa
Removed interrupt nesting in the stepper ISR.
...
Add serial checkRx in stepper ISR.
Copied HardwareSerial to MarlinSerial (Needed for checkRx).
13 years ago
2d9a715655
first naive attempt to have a offset in the homeing procedure. Does not enable to move into regions not allowed by endstops.
13 years ago
d2f034ba84
lcd message from gcode, m117
13 years ago
6aecf80278
add autotemp support to the lcd
13 years ago
b128d25f27
overlooked some inlines..
13 years ago
26a1de1e44
force inline
13 years ago
f8e170a44b
planner optimization by inline functions
13 years ago
aad4b75b94
First parts 2nd extruder
13 years ago
a0dc66f7bf
Home retract distance configureable per axis.
13 years ago
6d6f323535
make an option if sd-card stop should release the steppers.
13 years ago
4d6a5c29df
disable steppers as routine in stepper.cpp
13 years ago
74d0032e25
cooldown blocking selectable by #define.
13 years ago
191f36b493
slowdown
13 years ago
c54a807824
overworked ultralcd a bit
13 years ago
a6823a84e1
another typo
13 years ago
57e163e989
typo
13 years ago
b58787a367
now velocities are also set in mm/sec in gcode.
13 years ago
71ca78982b
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
235051253a
overworked lcd+eeprom to have only mm/sec and PID including pid_dt
13 years ago
27654bfe69
Fixed variable (removed 0x)
13 years ago
cdf0bd4e63
Fixed config bug when EEPROM was disabled
13 years ago
6ac9b2e761
Fixed residency time bug. (Thanks to Sound :-) )
13 years ago
ac8adabb2b
Small nominal speed improvement.
13 years ago
0e0e4945d8
Removed ISR overtaken message from ISR routine
13 years ago
c0f8c9fd72
Seperate ENDSTOP_INVERTING for X Y and Z
...
Added simple endstop filter.
Corrected M114 count display.
13 years ago
5535e51bf6
Yes, thats the beta.
13 years ago
8b14a8ad34
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
924bab1a03
less lcd flickering
13 years ago
379ea642e1
make tuneing sub-menu.
13 years ago
959d82e81e
Small temperature disable bug.
13 years ago
15bb3f284e
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
4e5becfc51
Added endstop reporting
13 years ago
eeb4f029db
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
b21d5193f2
made ultralcd compatible with folders.
13 years ago
2e43f9c809
Changed min max temperature code.
13 years ago
cd2268f10a
code cleanup in ultralcd.
13 years ago
0e7fee9a9b
Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
915ef2d4a1
Added software endstops
13 years ago
e87df99e22
update mcode documentation
13 years ago
8a1e719a3f
overworked config file
13 years ago
5ad1d19384
make it compile without sd_support
13 years ago
7a2d1f5aeb
add M17, so the enable stepper button works in repg.
13 years ago
e02af3e66a
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
537b5c155d
Fixed arc flowrate.
13 years ago
953d830bba
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
2a6afee832
make it compile without autotemp
13 years ago
f52e1a9571
autotemp working, default=disabled.
13 years ago
6e6fdb9a4e
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
6841a10446
Fixed max/min temperature bug
13 years ago
8a08b8e07e
trying to get autotemp to work.
13 years ago
f0154de5b3
found bug that disabled printing from root.
13 years ago
70650c331d
corrected the ultimaker default values, the previous had a calculation error: see: http://groups.google.com/group/ultimaker/browse_thread/thread/91906788639703cf
13 years ago
9d90220537
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
869cee74e6
host-based sd card printing seems now to work with folders
13 years ago
70abca195a
overworked cardreader for folder support; not finished yet.
13 years ago
ff69e0a772
Changed max/min temp init. Removed second uart from sabguino core
13 years ago
1e5e141ac9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
edb5ea7efa
the normal config again..
13 years ago
5df5727e93
removed some debugging comments
13 years ago
64f2121ab1
updated to sdfatlib2010902
13 years ago
b15902d3b5
Fixed bug in configuration.h
13 years ago
e63e224a33
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/Marlin.pde
13 years ago
e7dca8614b
Advance experiments. Not working yet.
13 years ago
46f80e82d9
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
...
Conflicts:
Marlin/ultralcd.h
13 years ago
a9c7da06e3
and changed ultipanel to have the mm/sec and not mm/min
...
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
Conflicts:
Marlin/Marlin.pde
Marlin/ultralcd.h
13 years ago
02b9eceead
show sd%
13 years ago
7919a40d06
watchdog,percent done,
13 years ago
805d37f77b
Fixed some small planner bugs
13 years ago
5fd41ae872
Some fixes in planner
13 years ago
95126c09c0
Added slowdown
13 years ago
331e82dcd3
Buffer size > 16
13 years ago
2643ae93d6
Added modified Sanguino files
13 years ago
c00eefb824
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
1d0452f10c
250000 baud
13 years ago
c57906b627
fixed bug with adjusting ki in realtime.
13 years ago
ac82411c73
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
13 years ago
65934eee9c
A lot of changes in the planner code
13 years ago
9980ceb4a3
added a m400, that finished all moves,
...
and the mechanism so that if an endstop is hit it the ISR, the steps_to_be_taken are stored, and some current_block data that will be deleted in the next move
If the normal loop() then finds such an event, the position is calculated (floats would have taken too long in the ISR) A serial message is generated.
13 years ago
ff592b056a
heater power repair.
13 years ago
e9adfa27b5
re-enabled heaterpower as storage for the current storage of the heater PWM duty cycle.
...
the M301 now returns the current PID settings of the machine.
M105 returns heating pwm duty cylce as "@:"
13 years ago
36958ee305
minor changes and first not-well working version of autotemp
13 years ago
ba8a53a40f
Streaming.h is gone. It conflicted with PROGMEM. And saving memory is more important than nicer code, imho
13 years ago
27361e7cd0
beautified the config. ordered it into thematic sections.
13 years ago
ab154d5592
project progmem finished: total change with ultipanel: 2456 byte free ram initial. now: 4374 ram.
13 years ago
7b70caab7c
made progmem mainly, found one bug in cardreader, added a empty class for cardreader in case no sd support.
13 years ago
72ace55e6a
better visibility of public/private/imported variables
13 years ago
977fd2b2c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
907daa49af
made loop counters uint8_t most were int(16_t) before
13 years ago
e3af73ee0c
Thermistor name problem
13 years ago
0b43761c3a
preprocessor magic to have a single source principle
13 years ago
156763d027
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
fc0064e525
made cardreader more selfsustained
13 years ago
d3bfffcb6e
Corrected thermistor naming
13 years ago
01df04e02c
first compile with the cardreader class
13 years ago
163efdf1c7
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
13 years ago
87aaf0f70a
static'ified Marlin.pde.
13 years ago
5cf349a24a
Fixed some arc bugs
13 years ago
79d1bfb5c0
made many possible variables static, so they cannot be used extern.
13 years ago
76b3f805c0
Added teensylu pins
13 years ago
1d171e9e52
reformating and some minor bugs/things found on the way.
13 years ago
900e0c9bf2
overworked the serial responses. Quite difficult, since many texts are Pronterface protocol.
13 years ago
1740a83e11
correcting commit errors.
13 years ago
7cc358b56b
wrong file location
13 years ago
e8092898b1
watchdog into dedicated file
13 years ago
2afb7bd4cf
refactured temperature.cpp so that there are now abstract functions to access temperatures.
13 years ago
0b82465168
First arcs version. (Arcs not working ok)
13 years ago
2e8e8878e5
Corrected temp variables.
13 years ago
04d3b5537f
Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1
...
Conflicts:
Marlin/Configuration.h
Marlin/EEPROMwrite.h
Marlin/Marlin.h
Marlin/Marlin.pde
Marlin/temperature.cpp
Marlin/temperature.h
Marlin/thermistortables.h
13 years ago
d15f01e1b4
Temperature changes
13 years ago
ea86a5e10f
moved the variables in the ISR, thats the most normal use case of static.
13 years ago
b9ea0651ec
Revert "this is not working. Do you maybe know why?"
...
This reverts commit 8bcdb9f5f0
13 years ago
8bcdb9f5f0
this is not working. Do you maybe know why?
13 years ago
40e8081623
changed end of line to windows, which seems to be the majority of developers main platform.
13 years ago
00674af3a8
merge from the branch bkubicek/Marlin/zalmmerge
13 years ago
d7c4f0780b
Added M42, M80 and M81
13 years ago
95d3d9847c
M109 now equal to sprinter
13 years ago
bf879ceaa9
Added thermistor tables
13 years ago
094afe7c10
Merged Marlin, Marlin non gen6 and Ultimaker changes
13 years ago
0b1423c303
Fixed crashes.
13 years ago
27664c6da6
Software endstps added
13 years ago
8e017b81ab
Sync with non-gen6 version
13 years ago
b5f6482dce
Fixed small feedrate bug.
...
Copied Camiels comments in the Configuration.h file
13 years ago
0024a26ccf
Fixed lookup table bug.
13 years ago
5a1787b2f4
Fix M109
13 years ago
26bf57e22c
first-commit
13 years ago
f850af5c1c
Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
13 years ago
750f6c33e3
first commit
13 years ago
Scott Lahteine