Paweł Stawicki
44cdebb8f1
Add software spi support for max6675
8 years ago
Paweł Stawicki
191fec009f
Add digipot i2c control for MCP4018
8 years ago
Scott Lahteine
e5b16081cb
Update TinyBoy2 configurations
8 years ago
Scott Lahteine
1855534f20
Config files cleanup
8 years ago
Scott Lahteine
c26a315d0b
Additional missed patches
8 years ago
Scott Lahteine
39617e10b8
Patch configs comment formatting
8 years ago
Scott Lahteine
c54f6cf23d
Updates to support 5 extruders
8 years ago
Scott Lahteine
2b88ccd0aa
Apply UBL mesh bounds to remaining configs
8 years ago
Scott Lahteine
60be3d264b
Macros to print floats, hiding imprecision
8 years ago
Scott Lahteine
b356d73239
Merge pull request #6278 from thinkyhead/pr_delta_angles
...
Followup to additional delta trim options
8 years ago
Jimmy Envall
f78d44e91a
Added support for delta tower angle corrections.
8 years ago
Scott Lahteine
d3b4d84586
Merge pull request #6277 from thinkyhead/pr_roxy3d_rcbugfix
...
Unify UBL Command Parsing
8 years ago
Scott Lahteine
d4ce839351
Cleanup following Pins Debug update
8 years ago
Scott Lahteine
c7a8f7970b
Formatting / cleanup
8 years ago
Scott Lahteine
29d4ec8257
Support 5 extruder auto fans
8 years ago
Scott Lahteine
824f3c1c0d
Fix up configuration comments
8 years ago
Scott Lahteine
995ed90248
Clean up Filament Width Sensor comments
8 years ago
Scott Lahteine
5a7b810fdd
General comment cleanup
8 years ago
Scott Lahteine
0027c22839
Drop extraneous calls to lcd_update
8 years ago
Scott Lahteine
d6db7a9b03
patch "step_remaining"
8 years ago
Scott Lahteine
cbc2331187
Use LCD_MESSAGEPGM over lcd_setstatuspgm
8 years ago
Scott Lahteine
3729510b1e
Set and check main parameter values, report all errors
8 years ago
Roxy-3D
34d3ed9ab1
These items were removed from the UBL Command Parsing
...
Having these items randomly (and errorniously) disappear cost me several
hours of work yesterday.
8 years ago
Scott Lahteine
15edb41cee
Patches to UBL
8 years ago
Roxy-3D
14cf527bb8
Getting setup for debugging
8 years ago
Scott Lahteine
f8408036f2
Merge pull request #6264 from thinkyhead/rc_five_extruders
...
Support up to 5 extruders in Marlin
8 years ago
Bob-the-Kuhn
f7fc49c3a3
Finish name change
...
DAC_STEPPER_DFLT wasn't changed to DAC_MOTOR_CURRENT_DEFAULT in all
places on PR #6124
8 years ago
Scott Lahteine
832064e4f2
Implementation changes to support 5 extruders
8 years ago
Scott Lahteine
04050237f0
Header and pins changes to support 5 extruders
8 years ago
Scott Lahteine
2a84122edd
Configuration changes to support 5 extruders
8 years ago
Scott Lahteine
edf18977c1
Patch pins files hotends/e-steppers sanity check
8 years ago
Scott Lahteine
dc84678fc1
Fix HOTEND_STATUS_ITEM for graphical display
8 years ago
Scott Lahteine
a0de5d94e2
Merge pull request #6258 from benlye/benlye-bilinearfix2
...
Better fix for bilinear Z offset and G29 Z (update to #6251 )
8 years ago
Scott Lahteine
b23aef5b8d
Merge pull request #6190 from Bob-the-Kuhn/Stop-and-Kill-prints---round-2
...
Message for every KILL and STOP (also need delays)
8 years ago
Roxy-3D
945303c0d5
eleminate bootscreen.h
8 years ago
Roxy-3D
ef3da3971e
Update ubl.h
8 years ago
Roxy-3D
8644dc170b
get synchronized to current file names
8 years ago
Roxy-3D
1451b7eacf
UBL's Grid Based Leveling code
...
Pretty much... The code is in place. Still more work to do. But it
has a lot of hooks and variables in other code, so commit and merge
before I pick up a million 'Conflicts'.
8 years ago
Bob-the-Kuhn
549055f20c
Merge pull request #6124 from Bob-the-Kuhn/MCP4728-consistency
...
MCP4728 consistency & fix ultralcd.cpp (PRINTRBOARD Rev F and RIGIDBOARD V2)
8 years ago
Bob-the-Kuhn
a77875c9d2
Merge pull request #6114 from Bob-the-Kuhn/try2-add-BLTouch-retry
...
Another BLTouch retry place (replaces PR #6108 )
8 years ago
Bob-the-Kuhn
3b9ff2cb12
Merge pull request #5676 from Bob-the-Kuhn/configuration.h
...
Configuration.h - reword Z PROBE section
8 years ago
Bob-the-Kuhn
6643d553f6
# This is a combination of 2 commits.
...
# This is the 1st commit message:
MCP4728 consistency & fix ultralcd.cpp
The MCP4728 DAC controls the stepper motor current strenth on the
PRINTRBOARD Rev F and RIGIDBOARD V2 boards.
PR #5792 on 9 FEB 2017 implemented default drive percentages but only on
the RIGIDBOARD V2.
This change moves the default settings to Configuration_adv.h.
Also, ultralcd.cpp won't compile because of a type def conflict.
Changed it to match the one in stepper_dac.cpp
===========================================================
reword stepper curent section for clarity
===========================================================
change name & improve comments
===========================================================
changed name from A4JP to SCOOVO_X9H per PR #6139
# This is the commit message #2 :
fix typo
8 years ago
Bob-the-Kuhn
a44b3432c1
add BLTouch retry to a second place & add/update delays
...
=================================================
implement requested changes
=================================================
remove delays (they're in another PR) & move return
8 years ago
Bob-the-Kuhn
a5abc61fb9
Merge pull request #6219 from Bob-the-Kuhn/Servo-probe-and-toggle-pins
...
M43 - add Toggle utility and Z servo utility (replaces PR #5864 )
8 years ago
Bob-the-Kuhn
3b8926bd09
improved wording, consolidation of info, BLTouch warning
...
==============================================
clarified BLTouch calculation & changed comment delimitters/flags
I found it hard to pickout the various sections in this area so I
changed most comments from // style to /** ... */
Made the BLTouch calculation simpler and clarified the units of measure
for the result.
============================================
add changes to example configurations
============================================
add TinyBoy2 to this PR & add BLTouch Delay
8 years ago
Scott Lahteine
55d296aaf0
pinsDebug with more features, uses less RAM
...
I've just uploaded a major change to pinsDebug.
The big change was creating an array in FLASH that contained every
active pin definition. That reduced the RAM memory usage considerably
but increased the FLASH usage.
Creating the array requires going through the pin list twice. Rather
than having two copies of it in the code I moved the list out to another
file (pinsDebug_list.h) and then just did two #includes.
From the user’s view they’ll see the following changes:
1. Now reports all the names assigned to a pin
2. The port is now reported in addition to the pin number.
3. When PWM0A & PWM1C share a pin, both PWMs are reported
4. More PWM/Timer info is reported
One new item that may cause some concern is the usage of the LINE
predefined preprocessor macro. It may not be available if the Arduino
IDE goes to a different compiler.
Includes support for 1284 & 1286 families.
Memory usage changes when enabling PINS_DEBUGGING:
ATmega2560
FLASH
. without 52576
. with new 64592
. with old 62826
. new-out 12016
. old-out 10250
. new-old 1766
.
RAM
. without 2807
. with new 2875
. with old 3545
. new-out 68
. old-out 738
. new-old -670
==================================================================
minor changes - mostly formatting
1) added newline to end of teensyduino file
2) changed flag name from TEENSYDUINO to TEENSYDUINO_IDE. Got warnings
about redefining TEENSYDUINO
3) removed some trailing spaces
reduce PROGMEM size & update pin list
Reduced PROGMEM usage by
1) converting often used macro to a function
2) moved as much as possible into the function
This required creating two arrays of address pointers for the PWM
registers.
==================================================================
update with new M3, M4, M5 pin names
==================================================================
report I/O status for unused/unknown pins
8 years ago
Scott Lahteine
e116723b8b
Adjust indentation in ubl.h
8 years ago
Scott Lahteine
1b3a26f2f5
Rename all UBL files with a ubl_ prefix
8 years ago
Scott Lahteine
d13991ae18
Use same config name for all mesh dimensions
8 years ago
Bob-the-Kuhn
f9686a108c
add Z servo test and toggle pins to M43
8 years ago
Scott Lahteine
62cbaa302e
Z_DUAL_ENDSTOP - make offset a configuration item
...
The offset for Z_DUAL_ENDSTOP (z_endstop_adj) is already in Marlin.
This PR just makes it a configuration item.
z_endstop_adj is initialized in two places so both had to be modified.
8 years ago
Scott Lahteine
c9e35004e7
pinsDebug with more features, uses less RAM
...
I've just uploaded a major change to pinsDebug.
The big change was creating an array in FLASH that contained every
active pin definition. That reduced the RAM memory usage considerably
but increased the FLASH usage.
Creating the array requires going through the pin list twice. Rather
than having two copies of it in the code I moved the list out to another
file (pinsDebug_list.h) and then just did two #includes.
From the user’s view they’ll see the following changes:
1. Now reports all the names assigned to a pin
2. The port is now reported in addition to the pin number.
3. When PWM0A & PWM1C share a pin, both PWMs are reported
4. More PWM/Timer info is reported
One new item that may cause some concern is the usage of the LINE
predefined preprocessor macro. It may not be available if the Arduino
IDE goes to a different compiler.
Includes support for 1284 & 1286 families.
Memory usage changes when enabling PINS_DEBUGGING:
ATmega2560
FLASH
. without 52576
. with new 64592
. with old 62826
. new-out 12016
. old-out 10250
. new-old 1766
.
RAM
. without 2807
. with new 2875
. with old 3545
. new-out 68
. old-out 738
. new-old -670
==================================================================
minor changes - mostly formatting
1) added newline to end of teensyduino file
2) changed flag name from TEENSYDUINO to TEENSYDUINO_IDE. Got warnings
about redefining TEENSYDUINO
3) removed some trailing spaces
reduce PROGMEM size & update pin list
Reduced PROGMEM usage by
1) converting often used macro to a function
2) moved as much as possible into the function
This required creating two arrays of address pointers for the PWM
registers.
==================================================================
update with new M3, M4, M5 pin names
==================================================================
report I/O status for unused/unknown pins
8 years ago
Scott Lahteine
4abd53f65a
Adjust indentation in ubl.h
8 years ago
Scott Lahteine
f5c5c1f771
Rename all UBL files with a ubl_ prefix
8 years ago
benlye
f1d50ac1dc
Fixing bilinear Z offset and G29 Z
...
The fix in #6251 for bilinear Z offset was flawed and broke the Z parameter of G29 for bilinear levelling. This is reverted and a different fix is used for the double-addition of the Z-probe offset to the bilinear correction grid.
8 years ago
Scott Lahteine
eb1e6aa29b
Use same config name for all mesh dimensions
8 years ago
Scott Lahteine
c961dd084d
Add hidden option to output Bilinear grids in JSON
8 years ago
Scott Lahteine
df7b4252fd
Reduce M420 code for UBL slightly
8 years ago
Scott Lahteine
8866158d03
Add LEVELING_DATA as a capability
8 years ago
benlye
0a2b4f3486
Fix bilinear levelling z offset
...
Since run_probe was altered to return the probe Z position rather than the nozzle Z position bilinear levelling has been broken because the Z-offset has been applied twice - once in the run_probe function, and then again in the G29 code for bilinear levelling.
8 years ago
Scott Lahteine
44a849bdce
Fix broken M206/M428/G92 offsets
8 years ago
Roxy-3D
52978e5ba5
Fix spelling mistake when UBL's mesh is Inactive
8 years ago
Roxy-3D
0423e93c42
Fix M421 AUTO_BED_LEVELING_BILINEAR and AUTO_BED_LEVELING_UBL
...
M421 was not connected up for AUTO_BED_LEVELING_BILINEAR.
M421 needed to migrate mesh data to new UBL EEPROM layout.
8 years ago
Scott Lahteine
3412950abc
Merge pull request #6209 from thinkyhead/rc_psu_zero
...
Power Supply 0 as "General"
8 years ago
Roxy-3D
3e9e94801f
Fix problem described in issue # 6175
...
As it turns out... an unsigned int can not go to less than 0, so the
loop never terminates.
8 years ago
Scott Lahteine
289e3d6844
Merge pull request #6215 from thinkyhead/rc_bed_false_alarm
...
Fix thermal runaway when nonexistent bed temp is set
8 years ago
Scott Lahteine
948728e63b
Fix line-endings in UBL_G29
8 years ago
Scott Lahteine
699310d1d2
Fix: Thermal runaway if nonexistent bed's temp is set
8 years ago
Scott Lahteine
c56eec29f0
Configurable delay for BLTouch servo emulation
8 years ago
Scott Lahteine
deaad78df9
Merge pull request #5678 from Bob-the-Kuhn/G38-optional-double-tap
...
G38 bug fix, made double touch optional & reverted to Z_MIN_PROBE
8 years ago
Scott Lahteine
5bce731962
Fix LCD preheat menus
8 years ago
Scott Lahteine
4c72167af3
Prevent a warning on echo_command
8 years ago
Scott Lahteine
9b5fd9522e
Fix formatting, order for a UBL change
8 years ago
Tannoo
54173c80ad
Power Supply 0 as "General"
8 years ago
Scott Lahteine
a2775d0c70
can wstring be removed?
8 years ago
Scott Lahteine
de4e19f17e
Patch MarlinSerial to match up with 32-bit version
8 years ago
Scott Lahteine
2cbc7b4b73
Relocate serial macros and functions
8 years ago
Scott Lahteine
eaa66f3c46
Indent MarlinSerial code
8 years ago
Scott Lahteine
7a7a80e6c5
status_printf => lcd_status_printf_P
8 years ago
Scott Lahteine
0e6ec34228
Use PSTR versions of lcd_status... to save SRAM
8 years ago
Scott Lahteine
34e2420b9b
Apply const args, clean up find_closest_circle_to_print
8 years ago
Scott Lahteine
e19fbd27ce
Minor spelling patch
8 years ago
Scott Lahteine
790a3e9a8c
Remove extraneous check of UBL_G26_MESH_EDITING
8 years ago
Scott Lahteine
7310110ec0
Fix logic of UBL::fade_scaling_factor_for_z
8 years ago
Scott Lahteine
1a775cecac
Revert behavior of enqueue_and_echo_commands_P
8 years ago
Scott Lahteine
79d42d87c1
Syntax cleanup
8 years ago
Scott Lahteine
b47fd31c37
Revert some changes to UBL
8 years ago
Bob-the-Kuhn
185337e787
add delays to allow stop & kill messages to get out
8 years ago
Scott Lahteine
63abb65146
Update description of PINS_DEBUGGING
8 years ago
Scott Lahteine
73e193da1d
Implement LCD_BED_LEVELING for PROBE_MANUALLY
8 years ago
Scott Lahteine
fcadc7bb1a
Implement the "manual" option for ABL
8 years ago
Scott Lahteine
9e22184936
Add a "manual" option for ABL
8 years ago
Scott Lahteine
541165e878
Merge pull request #6181 from thinkyhead/rc_ubl_further_fixes
...
Further adjustments to UBL code
8 years ago
Scott Lahteine
b19a15fa7f
Within applied to UBL
8 years ago
Scott Lahteine
342ee458ae
Additional UBL fixes, optimizations
8 years ago
Scott Lahteine
a5e085cbea
Have run_probe() return probe Z, not nozzle Z
8 years ago
Scott Lahteine
4487d22d56
Apply FIXFLOAT macro
8 years ago
Scott Lahteine
6cac0f43eb
MBL fiddle
8 years ago
Scott Lahteine
25a6bfa7ed
Add and apply WITHIN macro
8 years ago
Scott Lahteine
81136c1e82
Merge pull request #6177 from thinkyhead/rc_tinyboy
...
Support for TinyBoy 2 3D printer (and its OLED display)
8 years ago
Scott Lahteine
93aad54dc1
Clean up code, remove _now command function
8 years ago
Stefan Brüns
6ba6c92a81
Add example configuration for TinyBoy L10/L16
...
The TB2 is a Indiegogo funded 3d printer. It uses a MKS SMELZI V1.0
main board (based on MELZI, i.e. Sanguinololu). I comes as a complete kit,
including display and panel.
Two variants exists, L10 and L16, with a height of 100 and 160 mm.
The heating function of the provided bed can enabled by soldering a
thermistor and some wires to it.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
Stefan Brüns
0fe57ad4f5
Add Support TinyBoy2 OLED/Encoder panel
...
The OLED is driven by an SSD1306, connected to the board via
I2C, the rotary encoder is connected to 3 GPIO pins.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
Scott Lahteine
65ca6472ba
Make G26 compatible with G92 and M206
8 years ago
Scott Lahteine
4902fd4e95
More data in UBL class, make it a static class
...
- Make all `unified_bed_leveling` data/methods static
- Move some UBL-related variables into the class
- Replace `map_[xy]_index_to_bed_location` with `mesh_index_to_[xy]pos`
8 years ago
Scott Lahteine
edbc024d76
Disable UBL_G26_MESH_EDITING by default
8 years ago
Scott Lahteine
9e4bd6b3b5
Further repairs to UBL, comments, spacing
8 years ago
Bob-the-Kuhn
f3618c3337
Reduce UBL RAM usage by making G26/G29 optional
8 years ago
Scott Lahteine
c9eb1d6ab7
Make MBL a static class, use lookup for index-to-point conversion
8 years ago
Scott Lahteine
de9d2cddc3
Merge pull request #6152 from thinkyhead/rc_cleanup_6150_etc
...
UBL cleanup, optimization
8 years ago
Scott Lahteine
9217e4b8ec
Various UBL cleanups and bug fixes
8 years ago
Scott Lahteine
9924199802
Merge pull request #5908 from thinkyhead/rc_fix_slowdown
...
General minor cleanup
8 years ago
Scott Lahteine
0e71e7b2fb
Cleanup to planner.cpp
8 years ago
Scott Lahteine
f105cad43c
Marlin: Slight cleanup to Marlin_main.cpp
8 years ago
Scott Lahteine
499f9e04e1
Marlin: Temperature soft-PWM cleanup
8 years ago
Scott Lahteine
7ddd94dc61
Merge pull request #5994 from StefanBruens/fix_Makefile_errors
...
Fix makefile errors, cleanup
8 years ago
Scott Lahteine
af09095f03
Merge pull request #6154 from thinkyhead/rc_fil_sensor_vs_sd
...
Show Filament Width on LCD when SD is disabled
8 years ago
Remo Kallio
d38b1bc4b1
Show filament width sensor values in LCD constantly if SD card support is not enabled.
8 years ago
Scott Lahteine
e3459ec178
Merge pull request #5989 from MagoKimbra/rc_fix_delta_angles
...
Fix delta_angles
8 years ago
Scott Lahteine
f49aec057f
Tweak "can not" => "can't" in RUMBA pins
8 years ago
Scott Lahteine
0a23a1bb3b
Dynamic feedrate on SCARA, converting target mm/s to deg/s
8 years ago
Roxy-3D
d8724bb546
Get G29's P1 (Automated Probing) working again.
...
Incorrect optimizations of data types and ternary operators caused some
issues.
8 years ago
Scott Lahteine
c7f6ee9c93
Board A4JP should be SCOOVO_X9H
8 years ago
Scott Lahteine
a9fc30ae2e
Use safe_delay to ensure watchdog reset
8 years ago
Roxy-3D
171904b6c7
Make G29 What command print reliably and fix G29 P1 bug Waldo found
8 years ago
Roxy-3D
9d3ac66f73
Map clean up of UBL
...
UBL's maps are cleaner. And with a 1 value, G29 O 1 will generate a
map suitable to be Cut & Pasted into Excel so a Suface Map can be
generated.
8 years ago
Roxy-3D
9a1949a91e
Cleaned up G26 ready to replace existing one at MarlinFirmware/Marlin
8 years ago
Roxy-3D
aec85ad45a
Start of process to get UBL running again.
...
The wait_for_user change totally broke UBL. But there is stuff wrong
now in the thermal code and/or LCD Panel code.
8 years ago
Scott Lahteine
b47eaf14ae
Merge pull request #6109 from thinkyhead/rc_soft_pwm_dither
...
PWM dithering followup
8 years ago
Scott Lahteine
34d1c41b5f
Merge pull request #6111 from benlye/benlye-patch-echo_command
...
Fix type conversion issue with echo_command
8 years ago
benlye
6a601aca35
Fix type conversion issue with echo_command
...
With the the current definition of echo_command I cannot compile RCBugFix (Arduino IDE 1.8.1) with the error "invalid conversion from 'const char*' to 'char*'". This change resolves that.
8 years ago
Scott Lahteine
009a6ddd39
Adjust bilinear grid in M851
8 years ago
Scott Lahteine
eab7854a73
Merge pull request #6074 from thinkyhead/rc_immediate_shove
...
Immediate commands take precedence
8 years ago
Stefan Brüns
5699e2b881
Add SOFT_PWM_DITHER to other configurations
8 years ago
Scott Lahteine
5a2abeca78
Merge pull request #6100 from thinkyhead/rc_soft_pwm_dither
...
Enhancement of PWM, with dithering
8 years ago
Scott Lahteine
043be2856b
Use "& 0x3F" instead of "% 64"
8 years ago
Stefan Brüns
6a040a6967
SOFT_PWM: Do not switch off heaters twice on pwm_count wraparound
...
After wraparound, pwm_count <= pwm_mask holds, thus soft_pwm_X <= pwm_count
guarantees soft_pwm_X < pwm_mask is true, and the heater will be switched
off in the first branch.
Do not evaluate the pwm conditions a second time, this reduces the
instruction count (4 instructions per PWM) and text size (6 byte).
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
Stefan Brüns
0a74774af1
soft_pwm: avoid useless refetches of pwm_count
...
The compiler is not able to reuse the value of pwm_count, but reloads it
on every evaluation, if is stored in a static variable, as it cannot prove
it will be unchanged. A variable with local scope may not be modified from
the outside, so its value can be reused.
Doing so reduces text size and instruction count.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
Stefan Brüns
35a55d5757
SOFT_PWM: Implement dithering if SOFT_PWM_SCALE is 1 or more
...
If dithering is enabled, the remainder of the soft_pwm_X duty value at
turnoff time is added to the next cycle. If e.g. the duty is set to 9 and
SCALE is set to 2, the PWM will be active for 8 counts for 3 cycles and
12 counts on each fourth cycle, i.e. the average is 9 cycles.
This compensates the resolution loss at higher scales and allows running
fans with SOFT_PWM with significantly reduced noise.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
Stefan Brüns
2aed66a955
temperature: Fix SOFT_PWM off by one
...
A 128 step PWM has 127 intervals (0/127 ... 127/127 duty). Currently, a
PWM setting of 1/127 is active for 2/128, i.e. double the expected time,
or, in general n+1/128 instead of n/127.
Fixes issue#6003.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
Scott Lahteine
b5711a99a2
Patches to bring UBL closer to compliance
8 years ago
Scott Lahteine
d076c1b604
Apply some general cleanup to code
8 years ago
Scott Lahteine
d1e6b0e21a
Reduce STEP_PULSE_CYCLES code slightly
8 years ago
Scott Lahteine
783338a0b8
Add UBL_MESH_EDIT_ENABLED to configs
8 years ago
Scott Lahteine
8d54ffbf05
Adjust vector_3 code with const, some optimization
8 years ago
Roxy-3D
8ee2612ebb
The hex nibble routine can print again!
...
The code to print a hex nibble got broke. SERIAL_ECHO( (char) ) isn't
suitable for its use.
8 years ago
Roxy-3D
b8e4a6970b
Get UBL up and running again
...
All the changes to get the code into compliance with Marlin coding
standards made UBL sick. This pretty much gets UBL back up and
running.
8 years ago
Roxy-3D
5de1da2b3c
Make UBL honor the #define ENABLE_LEVELING_FADE_HEIGHT option
8 years ago
Scott Lahteine
8f9face956
Merge pull request #6088 from rafaljot/patch-3
...
Update Marlin_main.cpp
8 years ago
Scott Lahteine
782634b6c9
Merge pull request #6081 from Sebastianv650/MIN_STEPPER_PULSE_for_Babystepping
...
Add MINIMUM_STEPPER_PULSE ability to babystepping
8 years ago
Scott Lahteine
af2ea23e9c
EXTRUDER_RUNOUT_PREVENT uses buffer_line_kinematic
8 years ago
Scott Lahteine
cd882b88db
#if defined => #ifdef / PIN_EXISTS
8 years ago
Scott Lahteine
e244399766
Additional cleanup of UBL code
8 years ago
Bob-the-Kuhn
0934563b97
G38 optional double touch
...
Made the double touch portion a conditional compile based on the
PROBE_DOUBLE_TOUCH flag.
==============================================
Bugfix
The current G38 only stopped a move if it involved the Z axis.
Moved all the G38 code to it's own section and put it where it would
always be executed no matter what axis was moving or if the endstop was
enabled.
Also added a comment to configuration_adv to alert the user the double
tap had to be turned on.
==============================================
Change G38 back to using Z_MIN_PROBE
There's no Z_MIN endstop if Z_DUAL_ENDSTOPS is enabled and you have them
set to the top of the gantry.
G38 started out as using the Z_MIN_PROBE pin. I don't remember why we
changed it to the Z_MIN endstop.
8 years ago
Scott Lahteine
cc3204509c
UBL patch from Bob-the-Kuhn
8 years ago
Scott Lahteine
b904b5ae8d
Audible feedback for settings store/load/reset
8 years ago
Sebastianv650
bf57eb2447
Protect Babystepping against other ISRs
...
Especialy against stepper ISR.
This is even more important when a minimum pulse width is set,
increasing the runtime of a babystep.
8 years ago
Sebastianv650
80830919dc
Add MINIMUM_STEPPER_PULSE ability to babystepping
8 years ago
rafaljot
6da949bbf0
Update Marlin_main.cpp
...
Sometimes after killing heaters are still on.
8 years ago
Roxy-3D
72f7b14e66
Make G29's Interactive Mesh Editor Work
8 years ago
Roxy-3D
3fd74b121f
Get G29's Interactive Mesh Editor running
...
G29 P4 R O should work now.
8 years ago
Roxy-3D
1d58558bec
Spelling fix
8 years ago
Scott Lahteine
2573f4dd05
Merge pull request #6052 from thinkyhead/rc_lift_on_pause
...
Add PARK_HEAD_ON_PAUSE feature / M125
8 years ago
Scott Lahteine
48c6284c91
Immediate commands take precedence
8 years ago
Roxy-3D
76c270fdf2
Allow FWRETRACT with UBL Enabled
...
The retraction flag in UBL's G26 was conflicting with the FWRETRACT option.
All fixed!
8 years ago
Roxy-3D
c377c59d47
Allow G29 P1 R to generate the mesh
...
Fix the logic change that happened when UBL got merged.
8 years ago
Scott Lahteine
ff0dd162b7
PARK_HEAD_ON_PAUSE implementation
8 years ago
Scott Lahteine
26473cab6d
Add PARK_HEAD_ON_PAUSE feature
8 years ago
Scott Lahteine
4cf51157b3
Use XYZE rather than NUM_AXIS
8 years ago
Scott Lahteine
4c7f14752a
Add disable_e_steppers function
8 years ago
Scott Lahteine
8eb29f91e6
Patch filament change options and beep code
8 years ago
Scott Lahteine
56c9dfc83b
Merge pull request #6066 from thinkyhead/rc_felix_fix
...
Update Felix config for UBL
8 years ago
Scott Lahteine
9b2b53f63a
Merge pull request #6042 from thinkyhead/rc_fix_toolchange_z
...
Move Z last in tool-change for SWITCHING_EXTRUDER
8 years ago
Scott Lahteine
f98fb6b38e
Update Felix config for UBL
8 years ago
Scott Lahteine
7cabe81373
Merge pull request #6057 from thinkyhead/rc_followup_6054
...
Followup 6054 with some cleanup
8 years ago
Scott Lahteine
4bca27ab89
Fix Kelvin conversion
...
Thanks to @ospalh -- #6056
8 years ago
Scott Lahteine
143ab8f329
Remove Roxy's personal configurations
8 years ago
Scott Lahteine
2512871a36
Patch configs UBL followup
8 years ago
Scott Lahteine
27b5666e15
Move Allen Key probe definition to the top
8 years ago
Scott Lahteine
77cf648ed3
Move menu selection past static items in 1 screen
8 years ago
Scott Lahteine
2c630a1b5c
Merge pull request #6054 from thinkyhead/rc_ubl_renewal
...
UBL for RCBugFix — cleanup, rebase, patch
8 years ago
Scott Lahteine
0492a3a8f1
Merge pull request #6027 from Bob-the-Kuhn/add_kill_info
...
Message for every KILL and STOP
8 years ago
Scott Lahteine
6618346148
Patches to work around "register spill" compiler bug
8 years ago
Scott Lahteine
be7dd90382
Add Thermistor 75: MGB18 silicon pad
8 years ago
Scott Lahteine
b0a9c82c31
Fix single-char echo and pinMode usage
8 years ago
Scott Lahteine
fb60aa3736
UBL implementation
8 years ago
Scott Lahteine
238b8fd2a3
UBL core and support files
8 years ago
Scott Lahteine
cf94688925
Univeral Bed Leveling - configuration
8 years ago
Scott Lahteine
03aa424ccb
Merge pull request #6053 from thinkyhead/rc_clean
...
Remove extraneous whitespace
8 years ago
Scott Lahteine
af644871bf
Merge pull request #6045 from thinkyhead/rc_remove_raw_kinematics
...
Remove delta optimization concepts… for now
8 years ago
Scott Lahteine
77491dd924
Remove extraneous whitespace
8 years ago
Scott Lahteine
b865b21d32
Can't use Z fade height with DELTA
8 years ago
Scott Lahteine
1e57b0c269
Remove delta interpolation concept
8 years ago
Scott Lahteine
e46898f8e5
Remove kinematic optimizations
8 years ago
Scott Lahteine
11f1fdfab4
_lcd_level_bed_position => manual_probe_index
8 years ago
Scott Lahteine
0e410c9dfd
Software endstop options as simple switches
8 years ago
Scott Lahteine
d01b915085
Implement soft_endstops_enabled for clamping
8 years ago
Scott Lahteine
e4649c9044
Add HAS_SOFTWARE_ENDSTOPS macro
8 years ago
Scott Lahteine
3e927ff204
Replace MBL Z hacking
8 years ago
Scott Lahteine
4e53124681
Merge pull request #6039 from Bob-the-Kuhn/M114-sync-with-stepper
...
M114 - wait for move completion before reporting position
8 years ago
Scott Lahteine
734f9ea133
Merge pull request #6040 from thinkyhead/rc_sanity_use_assert
...
Simplify some sanity checks with static_assert
8 years ago
Scott Lahteine
f02af83d42
Remove some extraneous spaces
8 years ago
Scott Lahteine
672e45652e
Improved solution to tool-change bug
8 years ago
Scott Lahteine
23f1cfb46f
Fix stuck CHDK pin as suggested in #6041
8 years ago
Scott Lahteine
0b22069e82
Merge pull request #6021 from Bob-the-Kuhn/BUG-FIX--Switching-extruder-tool-change-Z-height
...
Bug Fix: Switching extruder tool change leaves Z in wrong position
8 years ago
Scott Lahteine
e7e4500629
Simplify some sanity checks with static_assert
8 years ago
Bob-the-Kuhn
34ff0c3439
M114 - wait for move completion before reporting position
8 years ago
Bob-the-Kuhn
b31604a492
Message for every KILL and STOP
...
No more mystery halts & resets
Moved messages to language.h
Added current command to inactive timeout message
8 years ago
Kai
13b44d019b
Update language_de.h
...
Addition of missing strings to match language_en.h
8 years ago
Bob-the-Kuhn
685ed5393a
Bug Fix: Switching extruder tool change leaves Z in wrong position
...
The tool_change function saves the current_position to the destination
array soon after starting. Later in the switching extruder section, the
destination array is modified when moving the Z axis up & down. A later
section of tool_change moves the head back to the “original location”
using the destination array. This later section assumes that the
destination array hasn’t been modified.
The fix is to save the destination Z position and then restore it after
the Z movements have completed.
Going back to using the current_position array for the switching
extruder Z axis moves (and leaving the destination array untouched)
doesn’t fix the problem.
This bug was introduced by the “Make tool_change kinematic compatible”
commit # 847429eff4
which was merged on 10
Oct 2016 as part of PR 4982.
This bug was discovered in Issue 5966.
8 years ago
Scott Lahteine
51353f8fea
Merge pull request #6000 from trivalik/NoWorkspaceWarning
...
prevent warning with define of NO_WORKSPACE_OFFSETS
8 years ago
MagoKimbra
a4a9bd8bc9
Fix BUG set_position_mm
...
Set postion must have axis and not E_AXIS + active_extruder.
8 years ago
Trivalik
71ac6f9d42
prevent warning with define of NO_WORKSPACE_OFFSETS
8 years ago
Stefan Brüns
9ba6c051a1
Makefile: add nozzle.cpp too CXXSRC list
...
The file is required by the optional NOZZLE_PARK_FEATURE.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
Stefan Brüns
9cc8d495b8
Makefile: remove no longer existing search paths
...
ArduinoAddons has been removed from Marlin, remove any references to it.
Replace HARDWARE_SRC and HARDWARE_DIR with its expanded equivalents.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
Stefan Brüns
bf563e62c1
Makefile: add printcounter.cpp too CXXSRC list
...
The file is required by the optional PRINTCOUNTER feature.
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
Stefan Brüns
ddecc1441d
Makefile: Fix linker error
...
Instantiation of the static singleton instance thermalManager in general
requires locking, but we know its safe to do without.
Add -fno-threadsafe-statics to avoid using locking primitives, which
result in linking errors:
undefined reference to `__cxa_guard_acquire'
undefined reference to `__cxa_guard_release'
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
8 years ago
MagoKimbra
37a26dfc09
Fix delta_angles
8 years ago
Scott Lahteine
2defb1d748
Use SET_INPUT_PULLUP where appropriate
8 years ago
Scott Lahteine
58b3e98878
Use arrays for delta tower parameters
8 years ago
Scott Lahteine
47242a40bb
Apply updated changes for delta_tower_angle_trim
8 years ago
Jimmy Envall
00b6b3da79
Added support for delta tower angle corrections.
8 years ago
Scott Lahteine
5a456c832a
Apply TMC2130 to example configurations
8 years ago
Scott Lahteine
45f949d833
TMC2130 Library: @teemuatlut replaces @makertum
8 years ago
Scott Lahteine
33f8a8a344
Merge pull request #5973 from thinkyhead/rc_circle_pattern
...
Add circle pattern to nozzle clean
8 years ago
Scott Lahteine
94b3e0a483
Merge pull request #5959 from benlye/benlye-fixm48
...
Remove extra carriage return in M48 V1 output
8 years ago
Scott Lahteine
a9a1971295
Merge pull request #5972 from thinkyhead/rc_cooldown_before
...
Fix preheat menu formatting
8 years ago
Scott Lahteine
6aa81255a9
Patch and clean up "flsun" kossel. Followup to #5911 .
8 years ago
Scott Lahteine
b2270b3f3e
Apply prior nozzle clean update
8 years ago
Marek Pikuła
7698c5617a
Added circle nozzle cleaning parameters to example configurations
8 years ago
Marek Pikuła
6836b94eea
Added circle pattern for nozzle cleaning feature
8 years ago
Scott Lahteine
3b75518ef6
Merge pull request #5911 from aphex3k/flsun_kossel_mini
...
Configuration.h and Configuration_adv.h for the kossel mini by flsun
8 years ago
Scott Lahteine
3830778852
Apply NO_WORKSPACE_OFFSETS to lcd menu
8 years ago
Scott Lahteine
7e3aab889d
Fix preheat menu formatting
8 years ago
Scott Lahteine
fea0d3f20f
Endstop and temp-isr general cleanup
8 years ago
Scott Lahteine
aef08e8780
Compact some macro substitutions
8 years ago
Scott Lahteine
2f620f86d9
Merge pull request #5970 from thinkyhead/rc_cooldown_before
...
Preheat Hotend Only menu items
8 years ago
Scott Lahteine
02de8e6f18
Merge pull request #5957 from MagoKimbra/rc_stepper_indirection_fix
...
Stepper indirection fix tmc driver
8 years ago
Scott Lahteine
6c5312559c
Menu item to preheat only the hotend
8 years ago
Scott Lahteine
9d0142e8ae
Move Change Filament above Cooldown
8 years ago
Scott Lahteine
0c55095c5e
Move Cooldown above Preheat
8 years ago
Scott Lahteine
c15c65f18a
Merge pull request #5971 from thinkyhead/rc_fix_e_factors
...
Patch DISTINCT_E_FACTORS bug
8 years ago
Scott Lahteine
bfb0007573
Patch DISTINCT_E_FACTORS bug
8 years ago
Scott Lahteine
be98016674
Merge pull request #5963 from thinkyhead/rc_no_offsets_optim
...
New option: NO_WORKSPACE_OFFSETS
8 years ago
Scott Lahteine
8e89a802f7
Document PROTOCOL_VERSION
8 years ago
Scott Lahteine
87b03b16bd
Use a macro for array copies
8 years ago
Scott Lahteine
e141f3a03f
Optimize coordinate transformation
...
Pre-compute the combined position shift and home offset to save a
single float fetch-and-add per conversion. Great for delta/scara and
bed leveling.
8 years ago
Scott Lahteine
5f7e85398b
Implement NO_WORKSPACE_OFFSETS
8 years ago
Scott Lahteine
05abe853f9
New option: NO_WORKSPACE_OFFSETS
8 years ago
Scott Lahteine
20addc6e32
Merge pull request #5955 from thinkyhead/rc_eeprom_fail_better
...
Display a message for EEPROM version mismatch
8 years ago
benlye
dead89062a
Update Marlin_main.cpp
...
Remove unnecessary line break from M48 V1 output.
8 years ago
MagoKimbra
ae277aebc6
Stepper indirection fix tmc driver
8 years ago
Scott Lahteine
8f4e4b1995
Display a message for EEPROM version mismatch
8 years ago
Scott Lahteine
177ad245f6
Merge pull request #5953 from thinkyhead/fix_fc_e_index
...
Fix submenu hotend status display
8 years ago
Scott Lahteine
cea3ea772c
Fix submenu hotend status display
8 years ago
Scott Lahteine
b27f69ba51
Merge pull request #5813 from thinkyhead/rc_fix_makrpanel
...
Fix MAKRPANEL assignments
8 years ago
Scott Lahteine
1ef6ccd919
Merge pull request #5951 from thinkyhead/rc_print_2d_array
...
Reduce code size (40b, or 166b with bilinear subdivision)
8 years ago
Scott Lahteine
53f5086905
Fix MAKRPANEL assignments
...
MAKRPANEL is a DOGLCD+ULTRA_LCD+NEWPANEL so customize its pins within
that block.
8 years ago
Scott Lahteine
98c7b682ca
General cleanup, const usage, var naming
8 years ago
jes
369bfc8a1e
Reduce code size (40b, or 166b with bilinear subdivision)
8 years ago
Scott Lahteine
0d13412105
Fix "Heating..." message
8 years ago
Scott Lahteine
5065636023
Merge pull request #5934 from thinkyhead/rc_advance_ed_ratio
...
LIN_ADVANCE: Fixed E/D ratio option
8 years ago
divendres
75ad82baab
Update Catalan language
8 years ago
Scott Lahteine
34253497d4
Babysteps code tweak
...
As suggested by https://github.com/MarlinFirmware/Marlin/pull/5887#issuecomment-283832163
8 years ago
Scott Lahteine
fb4aead2b1
Clean up and finish #5887
8 years ago
Scott Lahteine
b3e2bd6f29
Reduce E_D_ratio code
8 years ago
Sebastianv650
de6c40ed8f
Add option to fix E/D ratio
...
Work around for slicers producing buggy gcode.
8 years ago
Scott Lahteine
eeb490221f
Remove BEEPER_PIN override in pins_RIGIDBOARD.h
...
Resolves #5926 . This override is no longer needed since the RAMPS LCD controller pins were fixed.
8 years ago
Roxy-3D
11e892bd84
Merge pull request #5887 from Roxy-3D/RCBugFix
...
Double Click of Encoder Wheel Jumps to Z-BabyStepping
8 years ago
Scott Lahteine
cbeff12f8a
Merge pull request #5933 from teemuatlut/lcd_days_hours
...
Fix formatting of SD print time hours above one day
8 years ago
Scott Lahteine
8a4e9d08a3
Merge pull request #5931 from thinkyhead/rc_core_endstop_fix
...
Fix CoreYX / YZ / ZX endstop logic
8 years ago
teemuatlut
9175d16660
Fix formatting of print time hours above one day
8 years ago
Scott Lahteine
b6d9eb229f
Extend Core endstop commentary
8 years ago
Bob-the-Kuhn
c5e08e8761
CoreYX/YZ/ZX needs different endstop logic than CoreXY/YZ/XZ
...
In the endstop testing section, add the "reverse" logic in addition to "normal" core handling.
In CoreXY/YZ/XZ steppers rotating the same direction gives X movement. Opposing directions produces Y movement.
In CoreYX/ZY/ZX this is reversed. Same = Y, Opposite = X.
----
Fixes the issue where the Y endstop was being checked when moving in the X direction, etc.
8 years ago
Scott Lahteine
c759c26cca
Make LCD_TIMEOUT_TO_STATUS configurable
...
As suggested in
https://github.com/MarlinFirmware/Marlin/issues/5570#issuecomment-283059
065
8 years ago
Michael Henke
47729918fc
enable ENSURE_SMOOTH_MOVES
8 years ago
Michael Henke
330b981912
created Configuration.h and Configuration_adv.h for the kossel mini sold by flsun
8 years ago
Colin Gilgenbach
48b7e0f8d8
Nozzle Wipe Vertical Zig-Zag
...
- Add configuration support for zigzags in either the X or Y axis, for
wipe pads significantly longer in one dimension.
- Add configuration for default number of zig-zag triangles, vs. a
magic number in `Marlin_main.cpp`.
- Update description of auto nozzle wiping to match functionality
8 years ago
Scott Lahteine
f17b81b765
Add MAPPER_C2C3 to French language
8 years ago
Roxy-3D
7e607b06eb
Better comments on DOUBLE_CLICK_TIME_WINDOW
8 years ago
Scott Lahteine
34cba42104
Use PSTR for MSG_HEATING
8 years ago
Roxy-3D
584d147a02
fixup the indentation
8 years ago
Roxy-3D
e443e0e2a9
Fix scoping issues for double click to Z-Babystepping
8 years ago
Roxy-3D
17d1cd7c09
Double Click of Encoder Wheel Jumps to Z-BabyStepping
8 years ago
Roxy-3D
48d862377a
Double Click of Encoder Wheel Jumps to Z-BabyStepping
8 years ago
Scott Lahteine
cfdc189796
Merge pull request #5856 from thinkyhead/rc_fix_bad_comment
...
Remove non-applicable comment on MANUAL_Z_HOME_POS
8 years ago
dot-bob
cd68380ce6
Add status_printf to print messages to the lcd status line.
...
Also add a hotend indicator to the heating message displayed on the lcd status line.
8 years ago
Scott Lahteine
012aff6823
Merge pull request #5862 from thinkyhead/rc_fix_a_thing
...
Finish reducing of ABL_BILINEAR_SUBDIVISION
8 years ago
Scott Lahteine
b9187020c4
Finish reducing of ABL_BILINEAR_SUBDIVISION
8 years ago
Scott Lahteine
e282b72151
Remove non-applicable comment on MANUAL_Z_HOME_POS
8 years ago
Scott Lahteine
57f92a4632
Apply DISTINCT_E_FACTORS to sync_from_steppers
...
Followup to #5840
8 years ago
Scott Lahteine
4da8b1494b
Merge pull request #5854 from thinkyhead/rc_fixup_m600
...
M600 cleanup and bugfix
8 years ago
Scott Lahteine
dd02dba6e6
Merge pull request #5840 from MagoKimbra/rc_fix_lin_advanced_step_to_mm
...
Fix steps_to_mm for active extruders
8 years ago
Scott Lahteine
6e0b3fcc08
Optimize M600 heater status LCD items
8 years ago
Scott Lahteine
44b4e116bd
Commentary / style in gcode_M600
8 years ago
Scott Lahteine
561904345f
Tweak config ordering for M600
8 years ago
Scott Lahteine
284d6de9da
Remove some old code comments
8 years ago
MagoKimbra
3685224c1a
Fix steps_to_mm for active extruders
8 years ago
Scott Lahteine
4578c573fe
Pause the print job timer while in M600
8 years ago
Scott Lahteine
bfe6f71794
Simplify filament_change_beep function
8 years ago
Scott Lahteine
8289ea1316
Use a short name for the filament "endstop"
8 years ago
Scott Lahteine
d9dcef8a87
Spacing, coding standards
8 years ago
Scott Lahteine
931914e679
Apply M600 updates to all configs
8 years ago
Roxy-3D
8bf0b496b9
Improve M600 with timeout, wait for heatup.
8 years ago
Tannoo
c40fe2113c
Fix for broken MBL
...
LCD call was waiting forever, causing the system to hang.
8 years ago
Scott Lahteine
4d4745c0eb
Parenthesize some menu defines for safety
8 years ago
Scott Lahteine
47f9883b0f
Dynamic allocation for SDCARD_SORT_ALPHA
8 years ago
Scott Lahteine
a561bd5e3a
New feature: SDCARD_SORT_ALPHA
8 years ago
Scott Lahteine
c04d6b5aa6
Merge pull request #5829 from thinkyhead/rc_fix_isr_reentry
...
Combine fixes for LIN_ADVANCE and temperature ISR
8 years ago
Scott Lahteine
467f01435f
Merge pull request #5816 from thinkyhead/rc_abl_virt_reduce
...
Reduce memory use by ABL_BILINEAR_SUBDIVISION slightly
8 years ago
Scott Lahteine
97b6fb6381
Reduce / optimize LIN_ADVANCE code
8 years ago
Sebastianv650
271ced7341
Prevent re-entering of temperature ISR
...
If Marlin is inside the temperature ISR, the stepper ISR is enabled. If
a stepper event is now happening Marlin will proceed with the stepper
ISR. Now, at the end of the stepper ISR, the temperatre ISR gets enabled
again. While Marlin proceed the rest of the temperature ISR, it's now
vulnerable to a second ISR call.
8 years ago
Sebastianv650
1b59766fcb
Cleanup position_float
...
Hopefully fixes Marlin #5481
8 years ago
Scott Lahteine
a950c31e2d
Merge pull request #5815 from thinkyhead/rc_pulses_per_step
...
Give encoder pulse/steps conditionals their own block
8 years ago
Scott Lahteine
7176de8605
Merge pull request #5814 from thinkyhead/hotend_loop_always
...
Make HOTEND_LOOP more consistent, let compiler optimize it
8 years ago
Scott Lahteine
adec219ca5
Merge pull request #5811 from thinkyhead/fix_two_strings
...
No space after X: or A: in M114 output
8 years ago
jes
eaa829b58c
Reduce memory use by ABL_BILINEAR_SUBDIVISION slightly
8 years ago
Scott Lahteine
1c99ca82d8
Give encoder pulse/steps conditionals their own block
8 years ago
Scott Lahteine
e44294bb4d
Make HOTEND_LOOP more consistent, let compiler optimize it
8 years ago
Scott Lahteine
701f4a6d9d
Merge pull request #5729 from Bob-the-Kuhn/guaranteed-BLTouch-detection
...
guaranteed BLTouch detection
8 years ago
Scott Lahteine
c15b9a6a06
No space after X: or A: in M114 output
8 years ago
Scott Lahteine
e1702816f6
Fix SD_CHECK_AND_RETRY condition
...
Addressing #5806
8 years ago
Scott Lahteine
1bc5be3bdf
Cast DELTA_PRINTABLE_RADIUS to float in sq()
...
Addressing #5625
8 years ago
Bob-the-Kuhn
0369f97ec1
guaranteed BLTouch detection
...
To guarantee that the 5mS pulse from a BLTouch is recognized you need to
have the endstops.update() routine run twice in that 5mS period.
At 200 steps per mm, my system has problems below a feedrate of 120 mm
per minute.
Two things were done to guarantee the two updates within 5mS:
1) In interrupt mode, a check was added to the temperature ISR. If the
endstop interrupt flag/counter is active then it'll kick off the endstop
update routine every 1mS until the flag/counter is zero. This
flag/counter is decremented by the temperature ISR AND by the stepper
ISR.
2) In poling mode, code was added to the stepper ISR that will make sure
the ISR runs about every 1.5mS. The "extra" ISR runs only check the
endstops. This was done by grabbing the intended ISR delay and, if it's
over 2.0mS, splitting the intended delay into multiple smaller delays.
The first delay can be up to 2.0mS, the next ones 1.5mS (as needed) and
the last no less than 0.5mS.
=========================================
BLTouch error state recovery
If BLTouch already active when deploying the probe then try to reset it
& clear the probe.
If that doesn't fix it then declare an error.
Also added BLTouch init routine to startup section
8 years ago
Scott Lahteine
1e4d4e5915
Fix typo in language_uk
...
Thanks to @pavlus for this one
8 years ago
Scott Lahteine
7fe7a0c8be
Merge pull request #5793 from thinkyhead/rc_adjust_probe_output
...
Adjust probe_pt() terminal output to respect probe z-offset
8 years ago
Scott Lahteine
633c253bc1
Merge pull request #5792 from thinkyhead/rc_default_dac_vals
...
Default DAC values for RigidBoard V2
8 years ago
Florian Heilmann
7bbc31704c
Adjust probe_pt() terminal output to respect probe z-offset
8 years ago
Scott Lahteine
a245656db3
Merge pull request #5713 from gege2b/RCBF-French
...
French translation : Added missing strings as well as missing accents
8 years ago
jaysonkelly
713931338a
Default DAC values for RigidBoard V2
8 years ago
Bob-the-Kuhn
ae706233a8
pinsDebug for 644/1284 & USB646/1286 families
...
added conditional compilation for PWMs 1C & 3C
add Teensyduino compatibility
==========================================
changes per review - minor formatting changes
1) remove non-printable character at the end of line 687
2) split a really long comment into two lines
3) got rid of some trailing spaces
============================================
Made pinsDebug_Teensyduino.h the same between this PR and PR 5668 which
is for a re-written pinsDebug.h file.
The changes were:
1) added copyright @ GNU license header
2) a blank line crept in.
8 years ago
Gege2B
22dfcc9a71
French translation : Added missing strings as well as missing accents
8 years ago
Scott Lahteine
9b5515926a
Merge pull request #5696 from thinkyhead/rc_volumetric_default
...
Allow enabling volumetric filament on config load
8 years ago
Robert Kirk
0d147ead66
Allow enabling volumetric filament on config load
8 years ago
AnHardt
fa26767efe
Replace all remaining 'boolean' with 'bool'
8 years ago
AnHardt
f6858d9974
Fix M110 without leading N
...
Store N in the right variable.
This is too rarely used.
"mea culpa, mea culpa, mea maxima culpa"
8 years ago
Scott Lahteine
0c0c840ba8
Merge pull request #5683 from emartinez167/EMartinez-Changes
...
Updates to some incorrectly ended strings in the Spanish translation
8 years ago
Kai
25dae3bccc
Update language_de.h
...
Small corrections
8 years ago
emartinez167
7292145f4e
Fix for some wrong strings
...
On last commit, some strings were ended with the incorrect character.
This fixes it.
8 years ago
Scott Lahteine
93a9aa6b76
Merge pull request #5682 from thinkyhead/rc_spanish_jan
...
Updates to Spanish language
8 years ago
Scott Lahteine
7a9c1a279b
Merge pull request #5681 from thinkyhead/rc_prevent_boot_loop
...
Reset watchdog in SD init to prevent reboot
8 years ago
Scott Lahteine
e409c7f9e8
Merge pull request #5645 from esenapaj/From-microseconds-to-milliseconds
...
From "microseconds" to "milliseconds"
8 years ago
emartinez167
020c6af7b0
Updates to Spanish language
...
Add missing Spanish language definitions.
8 years ago
Hans Raaf
d29cc8f7bc
Reset watchdog in SD init to prevent reboot
...
If the watchdog is enabled and bootscreen + SD card checks take too long, Marlin may hang at boot time because of the reset loop. We have this happen all the time with the Anet board if no SD card is inserted.
8 years ago
Scott Lahteine
7743849608
Merge pull request #5680 from thinkyhead/rc_configs_puhlease
...
code_value_float tweak
8 years ago
Scott Lahteine
16357fbfdf
Merge pull request #5619 from Ocarthon/RCBugFix
...
Disable SD Detect for K8400
8 years ago
Scott Lahteine
e57c0fce66
Move MOSFET changes above #include for RIGIDBOARD
...
Correction to #5629
8 years ago
Scott Lahteine
c376f6a2cb
code_value_float tweak
8 years ago
Scott Lahteine
fb3c30e24c
Fix lcd_wait_for_homing causing menu to block
...
As a showcase function for how to do waiting in the lcd menu, this function should be preserved.
8 years ago
Scott Lahteine
f8ae0fd29f
Merge pull request #5647 from manianac/RCBugFix-PrepareMenuFix
...
Fix empty Prepare menu
8 years ago
Robert Kirk
aab5118c6a
Remove error causing break command
...
Use index macro instead of e
8 years ago
esenapaj
d38e335272
From "microseconds" to "milliseconds"
...
delay() is milliseconds
8 years ago
Philip Standt
8ae2bc7e2e
Disable SD Detect for K8400
8 years ago
Scott Lahteine
4061fca1ad
Sanity checks for FILAMENT_CHANGE_FEATURE and FILAMENT_RUNOUT_SCRIPT
8 years ago
Scott Lahteine
5ab7b91615
Comment on filament runout sensor config
8 years ago
Scott Lahteine
922c67f17d
Merge pull request #5588 from thinkyhead/rc_remove_biv25
...
Drop biv2.5 delta configurations
8 years ago
Scott Lahteine
8c6c048551
drop biv2.5 delta configurations
8 years ago
Scott Lahteine
92dbeebf40
Define ADV_NEVER, ADV_RATE
8 years ago
Robert Kirk
306c184b1a
Allow M600 when dryrun debugging
8 years ago
Scott Lahteine
fe2ea2906f
Merge pull request #5573 from thinkyhead/rc_unify_stepper_isr
...
LIN_ADVANCE with unified stepper ISR
8 years ago
Sebastianv650
84c685f8b5
First draft of Unified Stepper / E Advance ISR
8 years ago
Scott Lahteine
83021d82c6
Merge pull request #5502 from AnHardt/symbol-strings
...
Add symbol-strings
8 years ago
Scott Lahteine
036eccfd6e
Merge pull request #5572 from Kaibob2/patch-5
...
Update language_de.h
8 years ago
Scott Lahteine
b794b76836
Merge pull request #5567 from AnHardt/fix5194
...
Fix 5194
8 years ago
Scott Lahteine
451ba5df01
Merge pull request #5516 from esenapaj/Suppress-warning
...
Suppress warning
8 years ago
Scott Lahteine
92dbc63949
Merge pull request #5571 from esenapaj/Update-Japanese-translation
...
Update Japanese translation
8 years ago
Kai
ade72535c4
Update language_de.h
...
Added tarnslation for
```
#define MSG_DEBUG_MENU
#define MSG_PROGRESS_BAR_TEST
```
8 years ago
esenapaj
ab6b005867
Suppress warning
8 years ago
AnHardt
61f15ef7e7
Fix 5194
...
I have been a bit too radical in cleaning up this section.
8 years ago
esenapaj
60515ff700
Update Japanese translation
...
・Add new translation
8 years ago
Scott Lahteine
1e419655f3
Followup to #5550 - spacing before "mm"
8 years ago
Scott Lahteine
1a26ce1cdc
Merge pull request #5550 from FHeilmann/patch-2
...
Allow negative retract values in the LCD
8 years ago
Scott Lahteine
bec30c89e7
Merge pull request #5522 from esenapaj/Add-description-for-dual-x
...
Add description for choice of DEFAULT_DUAL_X_CARRIAGE_MODE
8 years ago
Scott Lahteine
7739c0affa
Change "+mm" to "mm" in most languages
...
- Japanese and Chinese still need update
8 years ago
Scott Lahteine
1cba425308
Allow negative recover-swap length from LCD
8 years ago
Scott Lahteine
298a8c6a3c
Merge pull request #5561 from thinkyhead/rc_no_case_light
...
Support for M335 case light "no case light"
8 years ago
Scott Lahteine
644f45cbd8
Merge pull request #5563 from akaJes/m600
...
FILAMENT_CHANGE_FEATURE allowed in idle mode
8 years ago
Scott Lahteine
0d2fc13516
Place "Level Bed" closer to "Auto Home"
8 years ago
Scott Lahteine
b031d28ebf
Encoder events should not skip stripes
8 years ago
Scott Lahteine
22881f38b9
Fix updating of "bool" menu items
8 years ago
Scott Lahteine
eb68715b94
No "Cooldown" menu if heaters are off
8 years ago
Jesus
4ed976b5ff
m600 fixes
8 years ago
Damien
4e2639942b
Support for M335 case light "no case light"
8 years ago
Scott Lahteine
18ba31e9b5
Add Debug Menu with LCD_PROGRESS_BAR_TEST as an example
8 years ago
Scott Lahteine
03af5961b0
Hide (or remove) custom character change on boot screen
8 years ago
Scott Lahteine
1642f5ed31
Add macro to some en strings
8 years ago
Scott Lahteine
dbb2d56c89
Correct comment on watchdog timer
8 years ago
Scott Lahteine
41a30923f3
Merge pull request #5559 from thinkyhead/rc_minimum_gcc_version
...
Throw an error for gcc before 4.7
8 years ago
Scott Lahteine
6d6a1db6ec
Apply const to _EEPROM_writeData value param
8 years ago
Robert Kirk
f724ef5820
Have bed leveling status output current status, not requested.
8 years ago
Scott Lahteine
20218e553d
Merge pull request #5527 from MagoKimbra/rc_configuration_store_fix_size
...
Fix size
8 years ago
Scott Lahteine
dcfbe2bd3c
Throw an error for gcc before 4.7
8 years ago
Scott Lahteine
82fde7df2e
Merge pull request #5512 from AnHardt/speed-compare-bbr
...
Optimize handling of block_buffer_runtime()
8 years ago
Scott Lahteine
8986225752
Spacing, cleanup in speed_lookuptable.h
8 years ago
Scott Lahteine
e12c8e5cac
Split up thermistor tables
8 years ago
Florian Heilmann
a7334fd2a0
Allow negative retract values in the LCD
...
This can already be done via G-Code, so adding the capability to the LCD should be straight forward.
8 years ago
AnHardt
292eb365c6
Optimize handling of block_buffer_runtime()
...
millis_t is long - divisions take for ever.
Return a kind of millisecond instead of microsecond -
divided by 1024 instead of 1000 for speed. (2.4% error)
That does not matter because block_buffer_runtime is
already a too short estimation.
Shrink the return-type.
8 years ago
esenapaj
6854f44bf2
Add description for choice of DEFAULT_DUAL_X_CARRIAGE_MODE
8 years ago
Scott Lahteine
3f6f036f7c
Merge pull request #5524 from thinkyhead/rc_optional_dogm_splitup
...
Report EEPROM data size, not final index
8 years ago
MagoKimbra
86ba7e4542
Fix size
...
Fix size for writeData and readData.
For bilinear grid 11 x 11 for example, size is 4 (float) x 11 x 11 = 484. uint8_t max is 255.
8 years ago
Scott Lahteine
f9f75c8016
Fix USE_RAW_KINEMATICS in prepare_kinematic_move_to
8 years ago
Scott Lahteine
87921f390a
Clarify what are "logical" positions in the planner
8 years ago
Scott Lahteine
a4f10f59c3
Write the E parameter length correctly
8 years ago
Scott Lahteine
2e904cb4f9
Merge pull request #5514 from esenapaj/Update-Japanese-translation
...
Update Japanese translation
8 years ago
Scott Lahteine
0b6817e0f9
Merge pull request #5505 from android444/patch-4
...
Update for translations language_pl.h
8 years ago
Scott Lahteine
3bd76f60e4
Report EEPROM data size, not final index
8 years ago
Scott Lahteine
78d6d6e076
Merge pull request #5452 from thinkyhead/rc_save_your_mesh
...
Save Bed Leveling to EEPROM
8 years ago
Scott Lahteine
0d0aa6c20d
Patch type for max_acceleration_mm_per_s2 save/restore
8 years ago
Scott Lahteine
d4f5418802
Merge pull request #5517 from esenapaj/Fix-for-PR-#5255
...
Fix for the PR #5255 (Case light menu (3rd attempt))
8 years ago
Scott Lahteine
fa7010b0a1
Merge pull request #5515 from esenapaj/Remove-unnecessary-tabs-and-spaces
...
Remove unnecessary tabs and spaces
8 years ago
Scott Lahteine
6d7b1cdf6c
Add M421 for ABL Bilinear
8 years ago
Scott Lahteine
32e65dc429
Extend `M420` to print state and, with `V`, the matrix / mesh
8 years ago
Scott Lahteine
d04258753b
Don't throw away the bed level matrix on G28
8 years ago
Scott Lahteine
8f0f225d10
Save ABL Planar Matrix to EEPROM
8 years ago
Scott Lahteine
e2429a9da1
Generalize Bed Leveling flag in EEPROM
8 years ago
Scott Lahteine
e42fd7813a
Save ABL Bilinear Grid to EEPROM
8 years ago
Scott Lahteine
492b68f8e3
Better EEPROM read/write error handling
8 years ago
Scott Lahteine
55722c09da
Use "UNPROBED" for un-probed bed_level_grid points
8 years ago
Scott Lahteine
2643404ac8
Throw an error in M420 if can't enable
8 years ago
Scott Lahteine
b1539394fd
Use planner.unapply_leveling to undo tilt in G29
8 years ago
Scott Lahteine
04636f78eb
Re-enable MBL/ABL after M48
8 years ago
Scott Lahteine
9b41638672
Minor tweak to G29 grid points
8 years ago
Scott Lahteine
daa2cad21f
Fix comment on G29 to include 'Z'
8 years ago
Scott Lahteine
8244fefcc2
Tweak call to `reset_bed_level` in G29
8 years ago
Scott Lahteine
0995a5d734
Fixup reset_bed_level
8 years ago
Scott Lahteine
1b2fb2bdc7
ABL_GRID_POINTS_* => ABL_GRID_MAX_POINTS_*
8 years ago
esenapaj
d486361c69
Fix for commented section of Config_RetrieveSettings()
8 years ago
esenapaj
88157ba529
Fix for the PR #5255 (Case light menu (3rd attempt))
8 years ago
esenapaj
069c6b38dd
Remove unnecessary tabs and spaces
8 years ago
esenapaj
9c8116aedf
Update Japanese translation
...
・Add new translation
8 years ago
AnHardt
57b1275cde
Add symbol-string to _de
...
Add symbol-string for _de
to reduce the frquencey of regenerating 'mappers' and 'fonts'
with the new utf-system.
8 years ago
android444
3363d2c937
Update for translations language_pl.h
8 years ago
Scott Lahteine
06af3b62ba
Move HOLLOW_FRAME options to config_adv
8 years ago
Scott Lahteine
67ca6c7bfe
Codestyle tweaks to ultralcd.cpp
8 years ago
Scott Lahteine
8d9fcd8e6f
Merge pull request #5495 from AnHardt/autoadjusting_display-updates
...
Adaptive screen updates for all kinds of displays
8 years ago
Scott Lahteine
77a360912d
Merge pull request #5491 from yhfudev/devel-rcbugfix-language-headers
...
UTF-8 language header files
8 years ago
AnHardt
d0e24e0876
Adaptive screen updates for all kinds of displays
...
The target here is to update the screens of graphical and char base
displays as fast as possible, without draining the planner buffer too much.
For that measure the time it takes to draw and transfer one
(partial) screen to the display. Build a max. value from that.
Because ther can be large differences, depending on how much the display
updates are interrupted, the max value is decreased by one ms/s. This way
it can shrink again.
On the other side we keep track on how much time it takes to empty the
planner buffer.
Now we draw the next (partial) display update only then, when we do not
drain the planner buffer to much. We draw only when the time in the
buffer is two times larger than a update takes, or the buffer is empty anyway.
When we have begun to draw a screen we do not wait until the next 100ms
time slot comes. We draw the next partial screen as fast as possible, but
give the system a chance to refill the buffers a bit.
When we see, during drawing a screen, the screen contend has changed,
we stop the current draw and begin to draw the new content from the top.
8 years ago
yhfudev
2dbd38ce16
tag the utf-8 strings
8 years ago
Scott Lahteine
94ffb58da7
Prevent retract un-hop at wrong height
8 years ago
Scott Lahteine
0772c8e55f
Merge pull request #5487 from thinkyhead/rc_easier_move_axis
...
Rearrange Move Menu, Fix up Delta Calibration
8 years ago
Scott Lahteine
b2c8de856b
Merge pull request #5478 from AnHardt/stepspermm
...
Replace ftostr62sign with ftostr62rj
8 years ago
Scott Lahteine
1fd8185d37
Merge pull request #5492 from thinkyhead/rc_fix_language_es
...
Fix multiple definitions of message macros in the language-es.h
8 years ago
yhfudev
1cdffdede7
fix multiple definitions of message macros in the language-es.h
8 years ago
Scott Lahteine
b67f8cb499
Merge pull request #5490 from jbrazio/update-bqhp2
...
Update the bq Hephestos 2 example configuration
8 years ago
Scott Lahteine
93b2833347
Move Menu: Select axis first, resolution after
8 years ago
Scott Lahteine
48aa0f6475
Merge pull request #5475 from AnHardt/utf-mapper-tr
...
utf8-mapper for Turkish
8 years ago
Scott Lahteine
b9ee0d7bd3
Merge pull request #5488 from thinkyhead/rc_fade_compiler_warn
...
Patch fade_factor compiler warning
8 years ago
Scott Lahteine
641e0936d4
Patch up Delta Calibration Menu
8 years ago
Scott Lahteine
b4dbf4d18a
Non-reentrant "Moving..." screen to safely wait in LCD
8 years ago
Scott Lahteine
7b625e0048
Patch fade_factor compiler warning
8 years ago
Scott Lahteine
6fa8fd15e2
Add negative temperatures for Thermistor 1
...
Changes from #5485 by @AndKe
8 years ago
Scott Lahteine
2b5d424394
Use handle_reprapworld_keypad for keypad handling
8 years ago
Scott Lahteine
887ed73c9b
Expose delta_clip_start_height for use by others
8 years ago
João Brázio
3f75edb1d6
Updated bq Hephestos 2 example configuration
8 years ago
Daniel Martinez
b796e7031d
Update Aragonese translation
8 years ago
AnHardt
cd2b74e88d
Replace ftostr62sign with ftostr62rj
...
`ftostr62sign()` is used only when displaing/editing
Steps/mm. A sign is not needed - the value is always positive.
Because the number part is long there is no't much place for the values name.
With this PR the is one more char for the name possible.
8 years ago
AnHardt
795541f87e
utf8-mapper for Turkish
...
The non utf8 version of turkish is a bit unhandy.
Delete `language_tr.h`
Rename `language_tr_utf.h` to `language_tr.h`
Provide a propper utf8-mapper for Turkish and use it.
8 years ago
Scott Lahteine
7c71bb2900
Merge pull request #5471 from thinkyhead/rc_planner_report_m503
...
Patch to show E factors in M503
8 years ago
Scott Lahteine
39401b7472
Patch to show E factors in M503
8 years ago
Scott Lahteine
6b50230022
Merge pull request #5447 from thinkyhead/rc_update_dutch
...
Dutch cleanup, ordering, placeholders
8 years ago
Scott Lahteine
2c97c11731
Merge pull request #5454 from thinkyhead/rc_fix_delta_g29
...
Fix G29 starting height on DELTA
8 years ago
Scott Lahteine
8239c45b30
Merge pull request #5448 from thinkyhead/rc_eeprom_bump
...
EEPROM: Prolong life. Better support for `DISTINCT_E_FACTORS`.
8 years ago
Scott Lahteine
21ed43df5f
New Dutch terms
8 years ago
Scott Lahteine
4bc6536f54
Move to safe zone on DELTA if using do_blocking_move_to*
8 years ago
Scott Lahteine
6f389158d7
Compile less code with EEPROM off
8 years ago
Scott Lahteine
f2301a2a04
Add e-stepper count to EEPROM (for planner vars)
8 years ago
Scott Lahteine
53c9fca0f6
Only write to EEPROM when a byte changes
8 years ago
AnHardt
13eebd11cf
volatile_block_buffer_runtime_us
...
`block_buffer_runtime_us` is mangled in the planner and in the stepper-ISR.
So it needs to be volatile and interrupt protected.
8 years ago
Scott Lahteine
8383f35b40
Merge pull request #5445 from thinkyhead/rc_reduce_jerk_code
...
Slightly shrink jerk and advance code
8 years ago
Gege2B
40453c1b9a
Update french translation (LIGHTS str)
8 years ago
Scott Lahteine
fc2fc828b3
Prettify LIN_ADVANCE code with the positive condition
8 years ago
Scott Lahteine
1929502e15
Add const to some variables
8 years ago
Scott Lahteine
2da4d22520
Pretty up ADVANCE code
8 years ago
Scott Lahteine
af024e1d7c
Pretty up coast / reverse jerk code
8 years ago
Scott Lahteine
3f3b5c86d8
Slightly shrink code for jerk-based reduction of safe_speed
8 years ago
AnHardt
87fe20b5f5
Simplify long_move()
...
We are not really interested in, if there are blocks.
All information we need is in `block_buffer_runtime_us`.
8 years ago
Scott Lahteine
574d9c7d3d
Merge pull request #5432 from Kaibob2/patch-2
...
Update language_de.h
8 years ago
Scott Lahteine
f089279263
Merge pull request #5431 from esenapaj/Suppress-warnings,-etc
...
Suppress warnings, etc
8 years ago
Scott Lahteine
d92ccb230c
Merge pull request #5438 from AnHardt/patch-long_move
...
Patch long_move()
8 years ago
AnHardt
706b240251
Patch long_move()
...
While the last move in the planner_buffer is running
it's duration is already subtracted from block_buffer_runtime_us.
8 years ago
esenapaj
a298a58684
Remove redundant "E"
8 years ago
Kai
390a6d976a
Update language_de.h
...
#define MSG_ENDSTOP_ABORT doesn't fit in Display
See https://github.com/MarlinFirmware/Marlin/issues/5401#issuecomment-265714487
8 years ago
esenapaj
e9393c3634
Suppress warnings, etc
...
・Suppress warnings
・Remove unused variable "did_update"
8 years ago
Scott Lahteine
da6a094424
Sanity-check inverting and pullups for Z probe and Z endstop
...
`Z_MIN_ENDSTOP_INVERTING` must match `Z_MIN_PROBE_ENDSTOP_INVERTING`
when using `Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN`.
This is easy to overlook.
8 years ago
Scott Lahteine
3fb43c11fc
Fix compile error with LCD_I2C_VIKI
8 years ago
Scott Lahteine
aa241c63b3
Include M205 note in configurations
8 years ago
Scott Lahteine
c8a95ec514
Merge pull request #5413 from MagoKimbra/rc_fix_mesh
...
Fix Mesh without Fade Height
8 years ago
Scott Lahteine
35ad9626f1
Merge pull request #5410 from thinkyhead/rc_polish_update
...
Update Polish language, reduce filament change messages
8 years ago
Scott Lahteine
01e5d46ea7
Patch some planner compile errors
8 years ago
MagoKimbra
5383212a28
Fix Mesh without Fade Height
8 years ago
Scott Lahteine
dbe1dc1452
Merge pull request #5406 from Rigid3D/RCBugFix
...
Turkish Translation Update
8 years ago
Scott Lahteine
4783a59249
Remove filament-change empty lines from languages
8 years ago
Scott Lahteine
1705099c3e
Save space by not defining unused filament change message lines
8 years ago
android444
9b1f4b514b
Update Polish language
...
Translation of messages in English to Polish.
8 years ago
Robert Marko
84f7e1de04
Updates to Croatian language
8 years ago
esenapaj
08cdaaf19b
README and Version for 1.1.0-RCBugFix
...
Sync with RC8
8 years ago
Mehmet Sutas
f4663cb677
Update language_tr_utf8.h
8 years ago
Mehmet Sutas
b4fd115d4e
Update language_tr.h
8 years ago
Scott Lahteine
83c5026db1
Ignore homing button when SD printing
...
As suggested in #5404 by @android444
8 years ago
Scott Lahteine
312caef472
Merge pull request #5398 from thinkyhead/rc_croatian_cleanup
...
Fix Croatian spacing, extra #endif
8 years ago