1999ac415c
Formatting Changes
...
Fixes for some code formatting changes and commenting out the
ADAFRUIT_ST7565 define that was left defined.
10 years ago
41f8cdb3a6
ADAFRUIT_ST7565
...
Added support for new display type
10 years ago
21ff773832
rework out_bits
10 years ago
6c27eaf864
Merge pull request #2101 from thinkyhead/code_style
...
Code style and a dangling "else"
10 years ago
d580a0d186
Use "+=" in plane rotation
10 years ago
2f3a410cb0
Fix a potential hanging "else" bug
10 years ago
b83e3f0905
Combine "Bed X: " strings
10 years ago
7dfb8becdb
Adjust some names and types in Marlin_main.cpp
10 years ago
c966aa26ff
Comments in Marlin_main.cpp
10 years ago
c54a2ea042
Adjust spacing in Marlin_main.cpp and stepper.*
10 years ago
072625ccad
Update headings in Marlin_main.cpp and stepper.cpp
10 years ago
16032f149f
Rename to codenum as a consistency
10 years ago
273a4a253f
Merge pull request #2096 from thinkyhead/cherry_picking3
...
Hide M117 with no LCD
10 years ago
64825a3d1e
Merge pull request #2095 from thinkyhead/cherry_picking2
...
Add gcode_line_error to reduce code size
10 years ago
ca79282eaf
Hide M117 with no LCD
10 years ago
ce218cafdb
Add gcode_line_error to reduce code size
10 years ago
46d59784ad
Rename preocess_command to process_next_command
10 years ago
513077c317
Minor change to fan kick
10 years ago
76438195f0
NO_TIMEOUTS and ADVANCED_OK off by default
10 years ago
d2563804c8
Add LF to file errors
10 years ago
e114662cfa
Adjust SdBaseFile spacing
10 years ago
98e91f5253
Allow lsDive to recurse with minimal stack usage
10 years ago
19166a92e4
Merge pull request #2057 from Wurstnase/serial_wait
...
add plan buffer remaining for 'P' and block buffer remaining 'B'
10 years ago
95f5a68006
Merge pull request #2074 from thinkyhead/lcd_xyz_unknown
...
Display unknown XYZ on the LCD as "---"
10 years ago
e97fcafd0e
Merge pull request #2076 from thinkyhead/mendel_inverting
...
Use MSG_OK in M105
10 years ago
0f6cd3640b
Drop extraneous ok_to_send
10 years ago
0ce355d9e7
Use MSG_OK in M105
10 years ago
a366e57385
Merge pull request #2075 from thinkyhead/mendel_inverting
...
Use Mendel default for INVERT_Y_DIR
10 years ago
7b3acfbb6f
Merge pull request #2072 from thinkyhead/better_arc_code
...
Consolidate arc code, remove motion_control.*
10 years ago
78beef2d73
Use Mendel default for INVERT_Y_DIR
10 years ago
1a4a09c26f
Display unknown XYZ on the LCD as "---"
...
- Also show 2 digits past decimal for Z on DOGM
10 years ago
68ce419147
Note on segment size
10 years ago
8b92249f18
Bring arc_offset into auto scope
10 years ago
80807b2d71
Consolidate arc code, remove motion_control.*
10 years ago
f65833931d
Formatting tweaks
10 years ago
fcfd99c1ae
Add comments to lcd_control_temperature_menu
10 years ago
d693e0f378
Use WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1 as difference limit
10 years ago
6697a8f375
Watch the heater a little longer
10 years ago
5693a6e3c9
Fix heating error message
10 years ago
747fd5801c
Merge pull request #2055 from thinkyhead/thermal_unified
...
Combine thermal runaway and watch-period
10 years ago
6e5572228d
Merge pull request #2064 from thinkyhead/wait_before_g28
...
Split up prepare_move by type
10 years ago
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
Ed Boston