368 Commits (e7004550c4bcdf07f5f03db93ed3a6d05ed312d1)

Author SHA1 Message Date
Scott Lahteine 34b73426e5 Apply #ifdef/#ifndef where possible 5 years ago
Scott Lahteine 4078f2672e Apply shorthand option macros 5 years ago
Tanguy Pruvot d59d9b5973 Alfawise - LK1/LK2/LK4 and BLTouch (#15118) 5 years ago
ETE-Design c8e096785f Gantry: Enable Filament Change (#15122) 5 years ago
Scott Lahteine 8778e12342 Fix some missed misspellings 5 years ago
thisiskeithb 2747ab7643 Ender-3 default TMC currents (#15115) 5 years ago
thisiskeithb 25cf7dee40 Disable Tevo Tarantula Pro PIDTEMPBED (#15089) 5 years ago
Bob Kuhn ba91bca1eb TMC SPI daisy chain support (experimental) (#15081) 5 years ago
thisiskeithb f5a1fabd38 Clarify TMC2209 Sensitivity vs. Others (#15092) 5 years ago
Robby Candra 38983fdfa9 Add 'Back' Button for Touch TFT 320x240 (#15060) 5 years ago
AlexandrZloy 0ebaea94be Add stallGuard threshold for X2 (#15042) 5 years ago
Scott Lahteine 3ac76f0489
Invariant Marlin bootscreen (#15057) 5 years ago
Scott Lahteine d2f211c7e1 Gantry followup 5 years ago
ETE-Design 9d12788a9a ADIMLab Gantry - Spelling Correction (#15043) 5 years ago
thisiskeithb 1769f43226 Fix CR-10/10S/Mini/5S Bed Thermistor Types (#15040) 5 years ago
Scott Lahteine d6a16525c2
New Language: Vietnamese (#13892) 5 years ago
Marcio Teixeira da601d5114 Update USB_FLASH_DRIVE_SUPPORT (#15021) 5 years ago
Scott Lahteine 20fc66f875
ADIMLab Granty v1 / v2 (#15017)
* # This is a combination of 18 commits.
# This is the 1st commit message:

Add Support for ADIMLab Granty

# The commit message #2 will be skipped:

# Update Configuration.h

# The commit message #3 will be skipped:

# Add files via upload
#
# Add Support for ADIMLab Granty

# The commit message #4 will be skipped:

# Create Configuration.h

# The commit message #5 will be skipped:

# Delete Configuration.h

# The commit message #6 will be skipped:

# Create Test.h

# The commit message #7 will be skipped:

# Add files via upload

# The commit message #8 will be skipped:

# Delete Test.h

# The commit message #9 will be skipped:

# Delete Configuration.h

# The commit message #10 will be skipped:

# Delete Configuration_adv.h

# The commit message #11 will be skipped:

# Add files via upload
#
# Add ADIMLab Pins

# The commit message #12 will be skipped:

# Add files via upload
#
# Add Bootscreen

# The commit message #13 will be skipped:

# Update Configuration.h
#
# Add Bootscreen

# The commit message #14 will be skipped:

# Update pins.h
#
# Add ADIMLab Board

# The commit message #15 will be skipped:

# Update boards.h
#
# Add ADIMLab Granty

# The commit message #16 will be skipped:

# Update Makefile
#
# Add ADIMLab Granty

# The commit message #17 will be skipped:

# Update boards.h

# The commit message #18 will be skipped:

# Update Makefile

* Add Support for ADIMLab Granty

* Optimize bootscreen

* Update Makefile

Updated Description

* Update boards.h

Updated Description

* Update pins_HJC2560C_REV2.h

Updated Description

* Update Configuration.h

Added Author + Custom_Machine_Name

* Create _Bootscreen.h

Add Bootscreen

* Add files via upload

Add ADIMLab Granty v1

* Update boards.h

Add ADIMLab Granty v1

* Update Makefile

Add ADIMLab Granty v1

* Update pins_HJC2560C_REV2.h

* Consolidate Granty configs

* config updates
5 years ago
Scott Lahteine d527c46481 Delta: Reduce default MIN_STEPS_PER_SEGMENT 5 years ago
Scott Lahteine 334777c201 config updates 5 years ago
Scott Lahteine 62d2a65025 Consolidate Granty configs 5 years ago
Scott Lahteine 09ee5a5da1 Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_granty_fix_15017 5 years ago
ETE-Design c3d1671b6d
Add files via upload
Add ADIMLab Granty v1
5 years ago
ETE-Design 778466a2ed
Create _Bootscreen.h
Add Bootscreen
5 years ago
ETE-Design 42f35491e0
Update Configuration.h
Added Author + Custom_Machine_Name
5 years ago
ETE-Design 4be98221f6 ADIMLab Granty pins/config (#14919) 5 years ago
Scott Lahteine 1fb3c4055d Optimize bootscreen 5 years ago
Scott Lahteine f7aac7a5b0 Add Support for ADIMLab Granty 5 years ago
ETE-Design de122c9bbe # This is a combination of 18 commits.
# This is the 1st commit message:

Add Support for ADIMLab Granty

# The commit message #2 will be skipped:

# Update Configuration.h

# The commit message #3 will be skipped:

# Add files via upload
#
# Add Support for ADIMLab Granty

# The commit message #4 will be skipped:

# Create Configuration.h

# The commit message #5 will be skipped:

# Delete Configuration.h

# The commit message #6 will be skipped:

# Create Test.h

# The commit message #7 will be skipped:

# Add files via upload

# The commit message #8 will be skipped:

# Delete Test.h

# The commit message #9 will be skipped:

# Delete Configuration.h

# The commit message #10 will be skipped:

# Delete Configuration_adv.h

# The commit message #11 will be skipped:

# Add files via upload
#
# Add ADIMLab Pins

# The commit message #12 will be skipped:

# Add files via upload
#
# Add Bootscreen

# The commit message #13 will be skipped:

# Update Configuration.h
#
# Add Bootscreen

# The commit message #14 will be skipped:

# Update pins.h
#
# Add ADIMLab Board

# The commit message #15 will be skipped:

# Update boards.h
#
# Add ADIMLab Granty

# The commit message #16 will be skipped:

# Update Makefile
#
# Add ADIMLab Granty

# The commit message #17 will be skipped:

# Update boards.h

# The commit message #18 will be skipped:

# Update Makefile
5 years ago
Scott Lahteine 5e777601f3
Add TURBO_BACK_MENU_ITEM option (#14991) 5 years ago
MaukCC 8664b8e97b Adding HMS434 machine (#14931) 5 years ago
Tim Moore 67f8ba6fed Allow pullup/downs on power loss pin (#14986) 5 years ago
thisiskeithb 19e21a8f10 Wanhao Duplicator i3 Mini config updates (#14908) 5 years ago
Scott Lahteine bc93ac53b5 Fix #define typo in configs 5 years ago
Scott Lahteine c8e476ad60 Embed some items in HAS_LCD_MENU 5 years ago
Ludy 6715fd159c Animated Marlin boot screen (#14961) 5 years ago
Marcio Teixeira 8bdb3d9970 Add CONTROLLERFAN_SPEED_Z_ONLY (#14956) 5 years ago
J.C. Nelson 1bcc5c98a9 MalyanLCD: Pause, resume, more ExtUI (#14852) 5 years ago
Marcio Teixeira 274934ad81 Add LULZBOT_TOUCH_UI (#14967) 5 years ago
Marcio Teixeira 179d6c4ed1 Add STARTUP_SCRIPT option. M17 parity with M18. (#14953) 5 years ago
Tanguy Pruvot 4cc103958e Alfawise Flash EEPROM, Z Servo Probe (#14877) 5 years ago
Joseph Bozarth 0fbb26c28f M16 - Expected Printer Check (#14924) 5 years ago
thisiskeithb 5ea5d71258 Tevo Michelangelo config updates (#14895) 5 years ago
Tim Moore 77f637763c Overlord configs. Fix buzzer, redundant temp. (#14833) 5 years ago
InsanityAutomation 922b597f94 Fix Ender 3 chopper setting (24V) (#14851) 5 years ago
Scott Lahteine 4268c1f1a5 Tweak U20 config 5 years ago
Scott Lahteine 1fe195926f Update configs with new sensorless options
Followup to #14044
5 years ago
Tim Moore e3660bca25 Overlord printer thermistor (#14815) 5 years ago
George Fu f89eb8bf35 Fysetc Cheetah updates (#14800) 5 years ago
Tim Moore 940c59d9da Overlord i2c LCD with LEDs and buzzer (#14801) 5 years ago
Robby Candra 128eed6b57 Option to reverse select direction/buttons (#14693) 5 years ago
pinchies d98b9d54f1 JGAurora A5S & A1 touch support (#14768) 5 years ago
Scott Lahteine bc58e678bd More general FSMC display option 5 years ago
Scott Lahteine c942ca130f More general TOUCH_BUTTONS comment 5 years ago
Scott Lahteine e349b1c920 Bring some configs up to date 5 years ago
rafaljot e44fccf3d2 Add support for M575 (#14757) 5 years ago
MarcelMo f8aa52346f Configurable Z move distance (#14593) 5 years ago
Marcio Teixeira eefe3f595a New options: Bootscreen as Info, game Easter-egg (#13829) 5 years ago
Scott Lahteine 6b02b89ab4 Update serial sub-unit descriptions 5 years ago
mikeshub 1579091c20 PID loop improvements (#14746)
* Fix macro evaluation in `temperature.cpp`
* Improve bed PID, PID debug output
* Add min PID power define
5 years ago
Giuliano Zaro 290466578f Adafruit Grand Central M4 (#14749) 5 years ago
Eric Ptak 59e97e5e52 FYSETC Cheetah 1.2 (#14723) 5 years ago
InsanityAutomation 2351592abf Overridable TMC serial pins, update TMC2209 docs (#14751) 5 years ago
Scott Lahteine 5c3ec6306f
Max7219 side-by-side arrangement (#14702) 6 years ago
Tanguy Pruvot dca0c3d02a Fix SPI comments, clean up U20 pins (#14700) 6 years ago
Tim Moore e5aa453293 Add support for 2 Neopixel strips (#14667) 6 years ago
Tanguy Pruvot 977cfa4494 Fix a few recent (STM32F1 DOGM, SPI) warnings (#14669) 6 years ago
wookie666 00e2f6da8f Improve magnetic dock switching toolhead (#14663) 6 years ago
Tanguy Pruvot f0be92259b PIO env, Travis test for STM32F407VE (#14674) 6 years ago
Scott Lahteine 1ea9a36d11
FYSETC BLTouch config and more (#14668) 6 years ago
Scott Lahteine 3d153486da Fysetc rename Part 2 6 years ago
Scott Lahteine 5c15f6f64b Fysetc rename Part 1 6 years ago
thisiskeithb 522df57a45 Tevo Michelangelo configuration (#14577) 6 years ago
thisiskeithb 523feeee3c Tevo Tornado configuration (#14576) 6 years ago
thisiskeithb 02859eb2b1 Remove Ender-3 README.md (#14632) 6 years ago
thisiskeithb 3d75490b6e Set correct Ender-5 bed size (#14633) 6 years ago
Tanguy Pruvot 81d629bc47 Robin & Longer3D SPI TFT driver (#14595) 6 years ago
Tanguy Pruvot 45bde333d5 Initial Longer3D LK1/2 (Alfawise U20/U20+/U30) support (#14597) 6 years ago
Scott Lahteine 1204f2fca8 Fix some config spacing 6 years ago
thisiskeithb bcbd2ff21c Fix Ender-5 Z axis settings (#14605) 6 years ago
InsanityAutomation d2f20803ba Allow nozzle clean with limited Axis (#14619) 6 years ago
Ludy 70586d3a6c Update (c) comments (#14584) 6 years ago
Scott Lahteine 3218c4b33f Shorten some config descriptions 6 years ago
thisiskeithb 42be684e69 Wanhao Duplicator i3 Mini support (#14559) 6 years ago
Scott Lahteine 84d0bc5c17 OLED LCD section 6 years ago
Emilio Moretti be37c38aa2 Fix Ender-2 LCD contrast
Changed the default to overcome the changes in:
5018fdacbe
This commit exposed a bug because the Ender-2 was using a MINIPANEL lcd
and getting default values that were too low, so the text was too weak.
However, the panel should be MKS_MINI_12864, since it
explicitly sets the correct contrast without relying in the defaults.
6 years ago
Vanessa Dannenberg 4fa8053638 RPW-Ultra thermistor table (#14517) 6 years ago
Scott Lahteine b6546ea33a Add include guards to some headers 6 years ago
Tim Moore eb6dec03bd Simplify power supply naming logic (#14488)
Co-Authored-By: Tim Moore <tim.moore@lightbend.com>
Co-Authored-By: AnHardt <github@kitelab.de>
6 years ago
Scott Lahteine 371969b531 Remove deprecated SCARA option 6 years ago
thisiskeithb d6265df962 115K baud for Ender-3 and -5 (#14471) 6 years ago
Aliaksei Kvitsinski 2f932a11b3 Park heads with electromagnet (#14023) 6 years ago
thisiskeithb 4b9f6d531b Add links to Junction Deviation heading (#14272) 6 years ago
Tanguy Pruvot 24655a6bf3 Touch-MI Menu and Manual Deploy option (#14290) 6 years ago
m0oml 688c53220d Creality3D CR-20 configurations (#14262) 6 years ago
Phr3d13 34c8204d25 STM32F1 SD EEPROM Emulation Fixes (#14261) 6 years ago
Scott Lahteine 14fb683682 Update examples 6 years ago
Scott Lahteine f39d025a80 Update default/Configuration_adv.h 6 years ago
thisiskeithb 7f05f5e002 Creality3D Ender-5 configuration (#14416) 6 years ago
Scott Lahteine b3f42d2519 Update SD host config comment 6 years ago
Scott Lahteine 872e172bcd Remove bootscreen timeouts matching default 6 years ago
Scott Lahteine 93cd66ac11 Tweaky change from (C) to (c) 6 years ago
Scott Lahteine d7d80418ae
Singleton for cutting tools (#14429) 6 years ago
Tim Moore 8ce84fa44f Add temperature-based auto power options (#14397) 6 years ago
Scott Lahteine 00cc1079af Add missing chamber auto fan options 6 years ago
Andy Shaw 064177154c Update SD card connection / sharing options (#14325) 6 years ago
J.C. Nelson 30a3db4f22 Fix Malyan M200 config and protocol (#14394) 6 years ago
Eric Ptak 8934b32f1b Fysetc AIO II / Cheetah STM32F1 (#14407) 6 years ago
InsanityAutomation aa0383a83b Enhance IDEX toolchange auto-return w/ no park, full control (#14117) 6 years ago
MrMabulous c41b005f33 Add Extra Probing option, discarding outliers (#14338) 6 years ago
Tobias Frost eeaef2410a Support DGUS Display with DWIN OS (#13253) 6 years ago
InsanityAutomation a9acd2f497 G34 configurable angle limit (#14321) 6 years ago
Scott Lahteine a31cb910f5 Tweak some config spacing 6 years ago
thisiskeithb 19d4a9ab77 Tevo Tarantula Pro configurations (#14335) 6 years ago
Scott Lahteine 4df4c47994
Add TMC2209 support (#14249) 6 years ago
Tanguy Pruvot ed0c70f0a0 SKRmini followup - Fysetc config updates (#14327) 6 years ago
Scott Lahteine c461af2f3a Reverse encoder/menu in configs 6 years ago
Scott Lahteine dd06017f64 Bring configs up to date 6 years ago
thisiskeithb da5bdea324 Artillery X1 - Disable Linear Advance (#14311) 6 years ago
Scott Lahteine aacb904e1f Adjust some config comments 6 years ago
pinchies 3021097888 Add JGAurora A5S and A1 (STM32F103ZET6) (#14291)
- Now compiles and works correctly with changes to HAL timers and watchdog.
- Does NOT include awesome work on touch screen function.
- Does have working LCD and SD-based EEPROM.
6 years ago
Tanguy Pruvot f2cfa408b7 Touch-MI probe by hotends.fr (#14101)
A simple Z probe using a magnet to deploy a probe. See https://youtu.be/E7Ik9PbKPl0 for the sensor description...
6 years ago
Scott Lahteine 9722038ad3 Ender 3 baud to match Creality3D 6 years ago
mb300sd bf8bfb5c66 Add Coolant Control M7/M8/M9 (#10745) 6 years ago
Scott Lahteine f7792c0192 Group manual move options 6 years ago
Scott Lahteine 2a21a9a062 Update some configs 6 years ago
thisiskeithb f93c60a6f0 Bring Sidewinder X1 config up to date (#14271) 6 years ago
Kaushik Vemparala c88d9ae282 Option to leave heaters set on SD abort (#14251) 6 years ago
thisiskeithb 892f0e75ea Initial EVNOVO (Artillery) Sidewinder X1 Configs (#14065) 6 years ago
Phr3d13 a373d3f557 Geeetech A10 example (#14250) 6 years ago
mikeshub a3f034b95e FFCP updates. Update XY soft endstops on tool_change (#14125) 6 years ago
InsanityAutomation b7eeb5b13b Move BLTouch options to adv config (#14131)
Plus other BLTouch and menu enhancements.
6 years ago
Scott Lahteine 0ca2073625 ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED => SD_ABORT_ON_ENDSTOP_HIT 6 years ago
teemuatlut cccc51ee0e TMC Square Wave Stepping mode (#14195) 6 years ago
InsanityAutomation 4138b1f9ae Option to disable Case Light brightness control (#14165) 6 years ago
Scott Lahteine fa3b5fb059 Uppercase pins filename 6 years ago
InsanityAutomation f6ec00d776 Update thermistor and working config 6 years ago
InsanityAutomation 123e58d9c3 Heated Chamber for Graphical LCD (#14190) 6 years ago
InsanityAutomation 49e83dd7c8 BLTouch V3.1 changes (#14104) 6 years ago
Scott Lahteine 14fe41f6b2 Update Z probe offset comment 6 years ago
Scott Lahteine 7cce6b8d68 Bring configs up to date (MANUAL_FEEDRATE) 6 years ago
Scott Lahteine 1210b73530 Geeetech A10M/A20M example updates 6 years ago
Scott Lahteine beb2ed145e List AZTEEG_X5_MINI SPI pins
Followup to earlier commit
6 years ago
Ludy fafd73a3af Update copyright in headers (#14092) 6 years ago
Scott Lahteine 9bf65eacaa Remove old adv config heading 6 years ago
Bob Kuhn 1dad6e754b Neopixel background LED option (#14025) 6 years ago
FanDjango 85fb33a060 BLTOUCH tweaks, new v3.1 command (#14015) 6 years ago
Martin Zeman 737d3d9283 Ender-3: Add feedrate for E manual move (#13996) 6 years ago
Scott Lahteine 785c01f2bc Use US spelling of 'behavior' 6 years ago
chai-md 940ff8e7c8 Improve LV8729 stepping (#13776) 6 years ago
InsanityAutomation 3eee880967 Anet E16 example config (#13982) 6 years ago
Martin Zeman 529c111572 Fix A8 config author (#13974) 6 years ago
Martin Zeman 9cd9d39319 Add Anet A8 Plus example configuration (#13967) 6 years ago
GUEST.it beb9cc91f6 More fixes to Geeetech A10M/A20M standard config (#13958) 6 years ago
GUEST.it 6b96eaa15b Fix E-steps/mm for Geeetech A10M/A20M (#13954) 6 years ago
InsanityAutomation 6811e2921b BLTouch v3 / 3DTouch Interoperability & performance (#13814) 6 years ago
Tanguy Pruvot 11adcf1ce3 Add'l PLR options, AVR strstr_P compat (#13880) 6 years ago
InsanityAutomation 5dcb25664f Option to Auto-Initialize EEPROM (#13935) 6 years ago
Stephan 483822f3aa Fix some THERMAL_PROTECTION_CHAMBER issues (#13678) 6 years ago
doggyfan 23a8707ef1 Configurable Thermistor (#13888) 6 years ago
Giuliano Zaro e2a77ed881 Bring chamber temp to completion (#13837) 6 years ago
ushills 3cad0f08d9 Geeetech I3 Pro B DEFAULT_AXIS_STEPS_PER_UNIT options (#13896) 6 years ago
ushills 1ec9953e7e Update I3 Pro B calibration routine (#13907) 6 years ago
InsanityAutomation 3fcab8dbf1 Option to disable fans during pause (#13820) 6 years ago
Robby Candra 0181e57417 Add a minimum Z change option to power-loss recovery (#13859) 6 years ago
Scott Lahteine bf54251a10
Finish, improve, clean up FYSETC_MINI_12864 revisions (#13871) 6 years ago
Scott Lahteine 9372e2603c Simpler neopixel comment 6 years ago
Ludy 8a6308b498 Fix config regression
Fix bad commits from around db89fc03
6 years ago
Scott Lahteine 9ccbd382e7 Update Watchdog description 6 years ago
Bob-the-Kuhn db89fc0304 Revert "bring my copy up to date"
This reverts commit 503905c628.
6 years ago
Bob-the-Kuhn 503905c628 bring my copy up to date 6 years ago
Bob-the-Kuhn 73726d56b3 Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 6 years ago
Scott Lahteine 6ff81a33c1 Provide JSON values for SOFT_PWM_SCALE 6 years ago
Scott Lahteine 69c333ead9 More universal Formbot pins
Replace `ROXYs_TRex` with pre-defines of the relevant pins at the configuration level.
6 years ago
Bob-the-Kuhn 520585c5ed Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 6 years ago
Robby Candra 7ca1fea22b Option to pause probe deployment only when triggered, for manually-deployed allen-key probe (#13698) 6 years ago
jmdearras 5f49b65c1f Move LPC SD options to configs, add MKS_MINI_DISPLAY to SKR boards (#13712) 6 years ago
Bob-the-Kuhn 9dd4252b39 Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 6 years ago
Stephan 84273557f9 Move and update heated chamber settings (#13671)
Co-Authored-By: the-real-orca <stephan.veigl@gmail.com>
6 years ago
chai-md 2adc37becc MAGNETIC_SWITCHING_TOOLHEAD (#13629) 6 years ago
Scott Lahteine cee3b172b9
Fix Marlin splash screen logic (#13646) 6 years ago
Scott Lahteine 3656ef4a2d Rename, step 2 6 years ago
Scott Lahteine 6b8611ad56 Rename, step 1 6 years ago
Scott Lahteine 5018fdacbe
Support FYSETC_MINI_12864_PANEL (#13365) 6 years ago
Scott Lahteine 0e3c9e726d Set default Raptor runout/caselight pins 6 years ago
Scott Lahteine 5e38d70697 Fix M217 report label, general cleanup 6 years ago
Scott Lahteine 9abe9aff56
Confirm before starting SD print (#13616) 6 years ago
Scott Lahteine a2b3ad6d0a Don't override RGB LED pins, by default 6 years ago
swilkens e9d9cf2b5b [2.0.x] Reduce all Creality homing speeds (#13595) 6 years ago
Roxy-3D 9cee81d47e Option to show babysteps total since G28 (#13580) 6 years ago
Scott Lahteine 3221658a78 Adjust park position description 6 years ago
Alexander Gavrilenko 3c47e1b4d1 Support Black STM32F407VET6 with RAMPS-like shield (#13524) 6 years ago
Marcio Teixeira 27a4927ed1 Add option to move away from endstop after homing. (#13557)
Add option to move away from endstop after homing.
- Add `ENDSTOP_BACKOFF` for printers with a recessed Z home button (Lulzbot TAZ 6).
- Also prevents chattering when sensorless homing with axes against bumpers.
6 years ago
reloxx13 2d5b93e850 Change to CHOPPER_DEFAULT_24V for Ender 3 (#13565) 6 years ago
Robby Candra 46445a5a16 Event G-code for Stop SD Print (#13547)
Co-Authored-By: 7eggert <7eggert@gmx.de>
Co-Authored-By: robbycandra <robbycandra.mail@gmail.com>
6 years ago
Scott Lahteine 8b7c3eec83 Games, for fun (and stress-testing) (#13464) 6 years ago
Scott Lahteine 5de7b5b35e
Games, for fun (and stress-testing) (#13464) 6 years ago
InsanityAutomation 7240e3a68f Allow G26 with no heated bed (#13511) 6 years ago
Scott Lahteine b46ca9aa94 Less timely comment, tweak conditions 6 years ago
InsanityAutomation eb91f08725 Update descriptions and dont call unneeded functions 6 years ago