ea13a77dcb
Fixed Z-Probes NO/NC for Anycubic Kossel ( #12083 )
6 years ago
ab9d5eb38d
Add Bootscreen Animation ( #12077 )
6 years ago
26208a5c2f
Clean up some boot screens
6 years ago
9b6be0ae0f
Fix lite status screen SD %
6 years ago
af3bf6c956
Tweak config spacing
6 years ago
a44ef27897
Outdent singlenozzle toolchange code
6 years ago
d338e4d875
Fix singlenozzle toolchange cold extrusion test
6 years ago
25b980dddb
Remove erroneous Pin 12 definition
...
There is no switchable Power Supply. Don't put it on Pin 12.
(Pin 12 is actually FAN1)
6 years ago
ddaef1a60c
Clean trailing whitespace
6 years ago
1407afad73
Move SENSITIVE_PINS to its own file
6 years ago
45e738876a
Add stepper MS3 support
...
Co-Authored-By: TheLongAndOnly <thelongandonly@users.noreply.github.com>
6 years ago
d43d4e4219
Refactor PRINTER_EVENT_LEDS, apply to M303 ( #12038 )
...
Co-Authored-By: Giuliano Zaro <gmagician@users.noreply.github.com>
6 years ago
d8d76cd2ba
[2.0.x] Italian language update ( #12060 )
6 years ago
e8d2cf4fb5
EEPROM followup (tmc_stepper_current_t)
6 years ago
50cbca4c55
Hide some menu items when busy
6 years ago
3cb5517ddb
Make singlenozzle tool-change honor no_move ( #12056 )
...
...Set no move earlier so it applies
6 years ago
d332fcb8fa
Fix firmware-retract compile errors ( #12061 )
6 years ago
43940d59ed
Fix trailing spaces
6 years ago
b2c1cd7eda
Allow cold change of active extruder ( #12055 )
...
Followup to #11994
6 years ago
d556dc1865
Fix and improve EEPROM storage ( #12054 )
...
* Clean up Temperature PID
* Improve EEPROM read/write/validate
* Group `SINGLENOZZLE` saved settings
* Group planner saved settings
* Group filament change saved settings
* Group skew saved settings
* Group `FWRETRACT` saved settings
6 years ago
9b5c1a5e77
Fix EEPROM checksum bug
...
Addressing #12048
6 years ago
272d4a5167
Apply #pragma once
6 years ago
07d33849b0
Fix unused var warning, apply ENABLED
6 years ago
a3e8cb1e44
[2.0.x] Ender-4 small improvements in Configuration ( #11843 )
6 years ago
cf5284cdf2
Add SD Firmware Update capability ( #12043 )
...
Co-Authored-By: timoxd7 <timoxd7@users.noreply.github.com>
6 years ago
0bd54392b7
Use uint8_t in EEPROM code
6 years ago
ce82015d5f
Fix include in G80
6 years ago
cef1de89d0
Fixed incorrect axis index. ( #12051 )
6 years ago
d6d48e63fb
Allow #defined TYPE arg to ultralcd menu macros ( #12041 )
...
Previously, it was not possible for the TYPE argument to ultralcd menu macros to itself be a #defined value. This made it difficult to create variables to set many related menu items to a common precision that could be easily changed.
6 years ago
2ef7175b42
Update Ender-2 BED_MAXTEMP ( #12042 )
...
Also added details to the README to make sure the Ender-2 status is properly documented.
6 years ago
5f6aabccbe
Tweak M48 spacing
6 years ago
ec9aa4f468
[2.0.x] Miscellaneous fixes ( #12039 )
...
* Allow override of soft SPI pins in `pins_*.h`
* Add default case to avoid compiler warning.
* Additional pin definitions for Archim 2.
* Einsy Retro has same timings as Einsy Rambo.
6 years ago
906a24fa81
Extensible user interface API ( #11193 )
6 years ago
ee253991d4
Various fixups for single-nozzle filament swap ( #12036 )
6 years ago
8dbb305e8e
Fix "Missing separator" errors. ( #12035 )
...
- Makefiles require tabs (not spaces) before shell commands.
- Other indentation can either be space or tabs.
6 years ago
55e810d512
Fix G80 compilation
6 years ago
d5017e2788
Add status screen with 4 nozzles
6 years ago
7db0113b53
Improve E_AXIS_N macro
6 years ago
191df5e17d
Correct PWM_PIN behavior for STM32 HALs ( #12027 )
6 years ago
f2ecf8d510
Add option to control Solenoids under PARKING_EXTRUDER ( #12028 )
6 years ago
74cd6cb4fc
Single nozzle filament change ( #11994 )
6 years ago
bfcf570d68
Try ISR_ALIASOF for Endstop Interrupts
6 years ago
c0d9058e25
Shorten an Italian menu title ( #12034 )
...
…and change a multi-use "back" menu item.
6 years ago
dffb4c63dc
[2.0.x] TMC2660 followup ( #12029 )
...
* Don't react to s2g on TMC2660. False positives
* Init with sensorless probing as well
6 years ago
d6b0fbd771
Use uint8_t for all fan speeds ( #12032 )
6 years ago
cb7844c8d4
Save PROGMEM on serial prefixes ( #12033 )
...
With default config and `EEPROM_SETTINGS`, saves over 200 bytes of PROGMEM.
6 years ago
07db08e39d
Fix EXTRUDER_AUTO_FAN_SPEED comment
6 years ago
ca0e308105
Fix up some units comments
6 years ago
65b8f3821b
Suppress temperature.h compile warning
6 years ago
c447d75916
Add support for TMC2660 ( #11998 )
6 years ago
cf0b9eb37c
no need to use destination in do_pause_e_move
6 years ago
e8d677620c
Use NUM_SERVOS in EEPROM code
...
Fix #12015
6 years ago
0fcdfdeed6
Followup to #12017
6 years ago
acac2adfc8
Add support for MeCreator2 ( #12017 )
6 years ago
49823a4939
Fix broken jerk handling ( #12019 )
...
Fix #12004
6 years ago
52a37913c1
Extend and apply some corrections
6 years ago
77b9a41f1f
Add G-code extensions to example configs
6 years ago
e09c144674
Add CNC-like G-code options
6 years ago
33056046a3
STM32 non-generic PWM_PIN and USEABLE_HARDWARE_PWM ( #12016 )
6 years ago
d5141c4e03
Fix up leading/trailing whitespace
6 years ago
03fc4d31d0
Makefile support for 32-bit Archim board and new TMC library ( #11997 )
...
* Support new TMC library and 32-bit Archim board
- Added IS_MCU flag
- When IS_MCU flag is 1, AVR compiler will be used
- When IS_MCU flag is 0, ARM compiler will be used
- Added support for new TMC library
- Added support for a 32-bit Archim board, which could probably be used as a basis for other 32-bit boards.
6 years ago
65b36642f8
Fix Anycubic Kossel config
6 years ago
fc326b3dde
Add USB_FLASH_DRIVE_SUPPORT to examples
...
Co-Authored-By: marcio-ao <marcio@alephobjects.com>
6 years ago
2067619a26
Add USB_FLASH_DRIVE_SUPPORT
6 years ago
07fe8d28be
[2.0.x] Partial Italian revert ( #12008 )
...
- Use a comma for decimals just in one message has not been a good idea.
- Full comments translation
6 years ago
517b4f4cd4
Fix lightweight UI hotends display
6 years ago
72a750e0eb
[2.0.x] Update Italian language ( #11996 )
6 years ago
bb561baf9e
Tweak some config comments
6 years ago
fcf6d127fd
STM32 timer simplification ( #11995 )
...
Prescalers aren't calculated for the given target frequency.
Stepper timer should run at 2 Mhz and temperature timer at 72 Khz.
6 years ago
8daadd2c8c
Fix TMC_DEBUG undefined report_tmc_status ( #11993 )
6 years ago
c40ea1f0fd
Update EEPROM_VERSION
...
And set EEPROM_OFFSET to 0, since the historical 100 skipped bytes are never used.
6 years ago
1358bd9319
Make MAX_EXTRUDERS always 6
6 years ago
001f26b642
Template struct simplification for serial ( #11990 )
6 years ago
348004c34f
STM32F7 HAL using the official STM32 Arduino Core ( #11750 )
6 years ago
3e58b3a5d4
Followup to #11943
6 years ago
c3229e1b34
Migrate to a new TMC library ( #11943 )
6 years ago
2abf3d258d
Korean language translation support ( #11987 )
6 years ago
d6955f25b2
Expand serial support in DUE/AVR hals exploiting the templated MarlinSerial classes ( #11988 )
6 years ago
f6f2246f59
Templatized serial classes ( #11982 )
6 years ago
ee53f7d813
Revert header reorg.
6 years ago
d619ba2685
Tweak STM32F4 config
6 years ago
d777cef837
fixed minimum macro ( #11986 )
6 years ago
e3f7b69105
Add PROBING_STEPPERS_OFF ( #11984 )
...
Co-Authored-By: houseofbugs <houseofbugs@gmail.com>
6 years ago
0e5bcdf695
Make DISABLE_INACTIVE_EXTRUDER a simple switch
6 years ago
0dedb3e139
Reorganize some core headers ( #11983 )
6 years ago
ab4549d2bc
[2.0.x] Add simultaneous retraction for mixing extruder ( #11941 )
6 years ago
c75f5a376b
Tweak some comments
6 years ago
f4c625d3a1
Ensure MIN/MAX overrides
6 years ago
3019713402
Reorganize some enums
6 years ago
606a4362b3
Reduce STM32F4 compile warnings
6 years ago
b3154b2120
Apply MOVE_Z_WHEN_IDLE to example configurations
...
Co-Authored-By: dot-bob <gibben@gmail.com>
6 years ago
b0fd8f2d74
Add option to move Z on double-click when idle
6 years ago
389376c40e
Clean up softspi.h
6 years ago
e78bdd654d
Clean up BABYSTEP options
6 years ago
8ae113ff36
Show zprobe_zoffset when BABYSTEP_HOTEND_Z_OFFSET is disabled ( #11973 )
6 years ago
2e98437392
Clean up main menu ( #11972 )
6 years ago
6d862b2916
Home before level corners, if needed ( #11976 )
...
…and add a consistent homing screen for all LCD pre-homing.
6 years ago
11ac75edcb
Use PGM_P for PSTR pointers ( #11977 )
6 years ago
4d5566a6b7
Add filament runout sensor menu item ( #11971 )
6 years ago
8489673cea
Adjust some HAL formatting
6 years ago
fb8a07660a
Followup to minmax patch
...
Co-Authored-By: Palatis <palatis@gmail.com>
6 years ago
3c40933713
Remove trailing spaces, old comment
6 years ago
a3ec805c97
Anycubic Kossel Linear+: corrected DELTA_DIAGONAL_ROD ( #11964 )
6 years ago
b30ca652ae
Replace MIN# / MAX# with variadic MIN / MAX ( #11960 )
6 years ago
e10f730478
Tweak vector_3::apply_rotation
6 years ago
e2ab78d876
Fix SERIAL_PORT_2 sanity check
6 years ago
a644d8cb93
Avoid copies in vector and matrix ( #11959 )
6 years ago
693865a649
Fix some whitespace
6 years ago
9903305dda
Merge pull request #9582 from tcm0116/2.0.x-sensorless_probing
...
[2.0.x] Add TMC2130 sensorless probing
6 years ago
14df753086
Correction for block->mix_steps
...
Fix #11484
6 years ago
2ecfda80ac
Improve support for JTAG/SWD pins reuse ( #11963 )
...
STM32 can reuse JTAG and SWD pins separately. Add `DISABLE_DEBUG` option to disable both interfaces and retain `DISABLE_JTAG` to disable JTAG only.
6 years ago
bb47009656
Apply sensorless changes to example configs
6 years ago
3286325044
Add TMC2130 sensorless probing
6 years ago
7d5c336c56
Corrections for dylsexic TMC
6 years ago
d89d8fe852
Fix Busy State in temperature.cpp
...
Fix #11954
6 years ago
70e7a465d8
[2.0.x] Fix compile error ( #11951 )
...
Fix compile error intruduced with M109 modification
6 years ago
935b120949
Anycubic Kossel: probe closer to the edge ( #11950 )
6 years ago
1410e79e7f
Ensure M109 handles autotemp
6 years ago
e4389f7d23
Standard methods to wait for heating ( #11949 )
6 years ago
bdc9889d3a
Fix a sanity check
6 years ago
321f9140d1
Followup to #11904
6 years ago
23114aeb81
Fix garbled M119 output. Honor NUM_RUNOUT_SENSORS ( #11948 )
6 years ago
1667ed9d1c
Pause should use ECHOLNPGM
6 years ago
93839e2f73
Add option to enable/disable autoretract altogether ( #11904 )
6 years ago
ad21a4f07b
Tweaks to HAL format and order
6 years ago
b682a1961a
Tweak STM32F7 TMC2660 class
6 years ago
a0a3b23e35
Reduce Raptor bootscreen by 144 bytes
6 years ago
95d793456b
Add Formbot Raptor config, fix other Formbot configs ( #11926 )
6 years ago
d016b572e3
[2.0.x] Add pin configuration for Fysetc F6 ( #11932 )
6 years ago
84926b1d5a
HAL general support for DISABLE_JTAG option ( #11211 )
...
Some STM32-based boards may use multiplexed JTAG pins as IO. Up to now the `DISABLE_JTAG` option (defined in pins files) was only supported for AT90-based boards. This commit generalizes the code and adds support for boards based on STM32F1 and STM32F4.
6 years ago
c575c5d5f6
Bring example configs up to date ( #11939 )
6 years ago
6b1a4f30a8
Fix case of T-Rex 3 _Statusscreen.h
6 years ago
ab7bfa86e2
Fix case of T-Rex-3 _Statusscreen.h
6 years ago
241168926d
Update some configs
6 years ago
cb6454118c
Workaround for Pronterface M29
6 years ago
eeab4141db
[2.0.x] Anycubic Trigorilla 14 pins tweak ( #11869 )
6 years ago
cb9dc56630
Add GT2560 v3 support ( #11914 )
6 years ago
f2e630a05e
Stow probe on probing failed ( #11936 )
...
Prevents probe from being left down should probing fail and print job continue
6 years ago
0b602ae101
[2.0.x] Fix Anycubic Kossel with Probe V1, stuck LCD message after stow ( #11929 )
6 years ago
dc11131656
[2.0.x] fix possible race condition ( #11923 )
...
Fix some commits done in #11900
6 years ago
d6b9327c11
Followup for Endstop Noise Threshold
...
Followup to #11912
6 years ago
aa6e8e9325
Tweak some config comments
6 years ago
5490a664f5
Expose: Homing Validation and Endstop Noise Threshold ( #11912 )
6 years ago
cee34f7290
Followup for BABYSTEP_HOTEND_Z_OFFSET ( #11916 )
6 years ago
884ad75cb8
Update config files
6 years ago
18e456d38d
[2.0.x] fix home endstop bug (DON'T MERGE, needs discussion) ( #11900 )
6 years ago
6742026568
Followup for 6 extruders
6 years ago
04bdff4115
Add a blank line
6 years ago
ccbd045f02
Fixed warning about comparing signed to unsigned ( #11909 )
6 years ago
1104054d73
2.0 IDEX Independent z offset and other fixes ( #11862 )
...
* Add Formbot Raptor board
Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>
* Add a second Z probe Z offset
Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>
* Modify method to utilize live adjustment of hotend z offset
Should probably move config option to babystepping and rename as it may now apply to all multiextruder systems
* Move config item and catchup other code to current method
6 years ago
217e0efd20
General option PAUSE_BEFORE_DEPLOY_STOW ( #11905 )
6 years ago
849dea92a8
Move probe extras below probe types
6 years ago
a2b0260f0f
Update Sublime files
6 years ago
a4cdffdd69
Support for manually deployed fixed probes ( #11899 )
6 years ago
ddcbf80f23
Followup for Z_TRIPLE_ENDSTOPS
6 years ago
c411e7eb0d
[2.0.x] Squelch compiler warnings seen with -Wall ( #11889 )
6 years ago
83105590a0
Better default values for Mesh Inset
6 years ago
4163c1a514
Fix end stop and Z-probe reporting logic
6 years ago
ea9eb2fc8f
Fix servo angles in config-store
6 years ago
d3d6be8210
Add MAX7219 reverse units option ( #11860 )
6 years ago
beab9733f8
Remove extra clauses in config-store
6 years ago
5a74b12b45
Followup to #11769
6 years ago
f38570ac55
Add custom user menu title ( #11769 )
6 years ago
17494099a9
Fix parking_extruder_tool_change
...
Fix #11872
6 years ago
140caf99b8
E0_CS_PIN moved from A13 to A15 on RAMPS-FD v2.2 ( #11865 )
6 years ago
10590c2f80
Fix some fan conditionals
6 years ago
e4ee607fc8
Fix Dual X FRS in M600
...
Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>
6 years ago
bae8f82ba8
[2.0] Fix Mixing Extruder mixing factors ( #11861 )
6 years ago
c5e5cc5e9f
Fix some trailing whitespace, macros
6 years ago
54bd124665
2.0.x: Fix normalize_mix() ( #11856 )
...
Mix factors needed to be updated consistent with the recent Stepper/Planner code refactor.
6 years ago
5fbfbde532
Fix example file to pull in correct pins file
6 years ago
378f354939
IDEX Scaled Duplication is still under development
...
Take it out of the menu until it is tested and working.
6 years ago
65045ba54b
tmc_util fix part 2
...
Followup to 115abf9
6 years ago
09a2bee8aa
Support more filament runout sensors in M119 ( #11851 )
6 years ago
115abf9c53
Fix syntax error in front of `tmc_axes`
6 years ago
0780913848
IDEX Improvements ( #11848 )
6 years ago
39732838b4
Tweak indent of Chinese languages
6 years ago
53bd0b55cb
Followup for 6 extruders
6 years ago
1718eff54a
Code changes supporting up to 6 extruders
6 years ago
f5c210d33d
Config changes supporting up to 6 extruders
6 years ago
d948c6e867
RADDS Extension Board V3 support
6 years ago
c437bb08f1
Overhaul of the planner ( #11578 )
...
- Move FWRETRACT to the planner
- Combine leveling, skew, etc. in a single modifier method
- Have kinematic and non-kinematic moves call one planner method
6 years ago
8323a08642
Clean up some whitespace
6 years ago
6286afd456
Add Triple-Z options to example configs
6 years ago
1a6f2b29b8
Add support for Triple-Z steppers/endstops
6 years ago
bc06406d7d
Fix Anycubic Kossel config (probe crash) ( #11832 )
6 years ago
66f83d33e6
Fix some config comments
6 years ago
84ed9b5a63
Send "G33 S P1" for Delta Height Calibration ( #11831 )
6 years ago
215eee4fe5
Use 'friend' to access set_directions
6 years ago
ff51e7322d
Fix for Stepper::set_directions() compilation error ( #11838 )
6 years ago
809b232fa2
Fix stepper directions after M501/M502
...
See https://github.com/MarlinFirmware/Marlin/issues/11103#issuecomment-421387611
Co-Authored-By: tcm0116 <tcm0116@users.noreply.github.com>
6 years ago
f79a5a9dee
Tweak spacing of L6470 options
6 years ago
c37d3ae97d
[2.0.x] Fix NOZZLE_PARK_FEATURE for Anycubic Kossel ( #11812 )
6 years ago
4fb2134f00
Fix non-sensical values for Zonestar themistor table ( #11817 )
...
Values taken from Zonestar firmware for P802QA with a Melzi board. Timestamps from the firmware package are from April 2016.
6 years ago
b220a825a7
Fix raw_filwidth_value error
6 years ago
1933d5d6fb
Fix SD autostart with no LCD
6 years ago
8bce5370c7
Updated slovak translation ( #11807 )
6 years ago
64d629ba2a
[2.0.x] Italian language fix ( #11796 )
6 years ago
8584d3697d
Fix servo count define conflict
...
`MAX_SERVOS` => `NUM_SERVO_PLUGS`
6 years ago
06949ae510
Fix MSG_FILAMENT_CHANGE_HEAT_1 for small LCD
6 years ago
d882717d98
Save some PROGMEM with constexpr ( #11798 )
...
When possible, make `active_extruder` a `constexpr` to save some PROGMEM.
6 years ago
4f883d5971
[2.0.x] Extruder-Distinct Linear Advance K Factors ( #11789 )
6 years ago
fe9f088d60
[2.0.x] Anycubic LinearPlus, Trigorilla 1.4 ( #11730 )
6 years ago
b6aae2b322
Tweak RAMPS_FD_V1 pins
6 years ago
7391e23332
Fix RigidBoard FAN_PIN collision
6 years ago
53b8c3bd66
Add EXTERNAL_CLOSED_LOOP_CONTROLLER to examples
6 years ago
1b6bc19427
Add external closed loop controller support
6 years ago
2ebfe90be9
Add custom preheat temp to filament change ( #11475 )
6 years ago
69d0ed5791
[2.0.x] Fix ambiguous function call (SERIAL_PROTOCOL_F) when using Arduino_Core_STM32 ( #11747 )
6 years ago
d32c4efc77
Fix some trailing whitespace
6 years ago
bc1ba998b2
[2.0.x] Fix undefined symbol 'g29_in_progress' ( #11781 )
6 years ago
bad225dc04
Fix mesh leveling compile errors ( #11768 )
6 years ago
d783400330
Updates to STM32F7 HAL, for completeness ( #11770 )
6 years ago
72af8e0f02
Patch extruder_advance_K edit menu
...
Fix #11776
6 years ago
7e8c073fba
Fix extruder stops extruding with LA ( #11758 )
6 years ago
0c01099f17
hop_amount => current_hop
6 years ago
eafd62308e
Use TMC2208Stepper v0.2.5 ( #11714 )
6 years ago
e25d2ae4a2
[2.0.x] SWITCHING_TOOLHEAD ( #11623 )
6 years ago
f417408df1
[STM32F1] Fix HAL for new PlatformIO ( #11749 )
6 years ago
3d7f2c1fde
Fix directory name to be consistent ( #11745 )
6 years ago
a9c98a0e47
Create _Bootscreen.h
6 years ago
9f85d3a9cb
Create _statusscreen.h
6 years ago
e2e7b1d705
Break out support of the T-Rex 3
6 years ago
67996c2b66
Break out support for the T-Rex 3
6 years ago
9c8d9d282f
Break out support for Formbot T-Rex3 from previous versions
6 years ago
e3aac59637
Create pins_FORMBOT_TREX3.h
6 years ago
f580247581
Create pins_FORMBOT_TREX2.h
6 years ago
073857646b
seperate the T-Rex2 and T-Rex3 support
6 years ago
fe4fc2883b
Add support for Formbot T-Rex3
6 years ago
2a61c9a939
Various fixups to configs, spacing, etc.
6 years ago
b3efbc6e6e
Add MANUAL_E_MOVES_RELATIVE to more configs
6 years ago
679e4602fe
Add MANUAL_E_MOVES_RELATIVE to examples
6 years ago
beb51c2d58
Show manual extrusion moves as relative in LCD
...
- Implements FR#11724
- Old behavior can be restored by commenting out MANUAL_E_MOVES_RELATIVE
6 years ago
d10f29ae2e
Pass segment length in G2-G3
6 years ago
dcfde2317f
Pass segment length in prepare_kinematic_move_to ( #11737 )
6 years ago
d5379ee9d6
Fix search for white space in enqueued commands
6 years ago
8d5bea073b
Assume one Max7219 unit if not specified
6 years ago
9651ceb36b
Correct spelling of #endif
6 years ago
b213a89ef5
Sanity-check NOZZLE_PARK_POINT
6 years ago
86ee74731e
Comment for RADDS + RRDFGSC
6 years ago
ae1271b2ae
RADDS: Update Full Graphic Display Pins ( #11731 )
6 years ago
650d4313c4
Bring some configs up to date
6 years ago
530a13ab6c
[2.0.x] SECURITYFIX missing max temp error when PID is used ( #11717 )
6 years ago
12fded46c2
Correct some FR strings
...
Co-Authored-By: pipersw <pipersw@users.noreply.github.com>
6 years ago
aefc2f7cf9
Add Anet A2 and A2 Plus Configurations ( #11677 )
6 years ago
72fdb6bab3
Fix SWITCHING_NOZZLE zdiff ( #11683 )
6 years ago
8b837dc3ad
No need for last \n in G-code items
6 years ago
d1ceaf5550
[2.0.x] Followup to IDEX changes ( #11707 )
6 years ago
d62f4df0b7
Disable LCD Pins used by new Max7219 hook up if in that mode
6 years ago
fa772c31bf
Provide more options for Max7219 connection on Formbot
6 years ago
Kevin Velickovic