Age | Commit message (Collapse) | Author |
|
* Add bootloader size
Bootloader size needs to be 6144 to allow QMK to jump to the correct location with bootmagic
* Include dz60rgb v2.1
Add boot loader size to this pcb also
|
|
|
|
Co-authored-by: Michael Wamsley <wamsl@Michaels-MacBook-Pro.local>
|
|
|
|
|
|
Co-authored-by: Ryan <fauxpark@gmail.com>
|
|
With the 'lufa-ms' bootloader LTO is needed so the keyboard can be built
with Configurator.
|
|
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
|
|
* Set bootloader to stm32-dfu for STM32F303
* Set bootloader to stm32-dfu for STM32F0x2
* Set bootloader to stm32-dfu for STM32F4x1
* Set bootloader to stm32duino for sowbug
* Delete redundant bootloader_defs headers
* Add some missing MCU name comments
* Move APM32 dfu-suffix overrides underneath bootloader
* Remove redundant STM32_BOOTLOADER_ADDRESS defines/rules
|
|
* Add Per Key functionality for AutoShift (#11536)
* LED Matrix: Reactive effect buffers & advanced indicators (#12588)
* [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626)
* [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625)
* LED Matrix: Split (#12633)
* [CI] Format code according to conventions (#12650)
* feat: infinite timeout for leader key (#6580)
* feat: implement leader_no_timeout logic
* docs(leader_key): infinite leader timeout docs
* Format code according to conventions (#12680)
* Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403)
* Fix default ADC_RESOLUTION for ADCv3 (and ADCv4)
Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers
(that macro should not have been there, because ADCv3 has CFGR instead of
CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS
if it is defined (that name is used for ADCv3 and ADCv4).
* Update ADC docs to match the actually used resolution
ADC driver for ChibiOS actually uses the 10-bit resolution by default
(probably to match AVR); fix the documentation accordingly. Also add
both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names
differ according to the ADC implementation in the particular MCU).
* Fix pinToMux() for B12 and B13 on STM32F3xx
Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and
B13 pins were wrong.
* Add support for all possible analog pins on STM32F1xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx
(they are the same at least for STM32F103x8 and larger F103 devices, and
also F102, F105, F107 families). Actually tested on STM32F103C8T6
(therefore pins C0...C5 were not tested).
Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages,
cannot be supported at the moment, because those pins are connected only
to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1.
* Add support for all possible analog pins on STM32F4xx
Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally
F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are
apparently the same for all F4xx devices, except some smaller devices may
not have ADC3.
Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using
various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested.
Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices
which don't have ADC3 also don't have the GPIOF port, therefore the code
which refers to Fx pins does not compile.
* Fix STM32F3xx ADC mux table in documentation
The ADC driver documentation had some errors in the mux table for STM32F3xx.
Fix this table to match the datasheet and the actual code (mux settings for
B12 and B13 were also tested on a real STM32F303CCT6 chip).
* Add STM32F1xx ADC pins to the documentation
* Add STM32F4xx ADC pins to the documentation
* Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600)
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
* eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671)
* Add support for MCU = STM32F446 (#12619)
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
* Format code according to conventions (#12682)
* Format code according to conventions (#12687)
* Add STM32L433 and L443 support (#12063)
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
* Include L443 in compatible microcontrollers
* Update config bootloader jump description
* Update ChibiOS define reasoning
* Update quantum/mcu_selection.mk
* fix git conflict
* Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613)
* Fix bad PR merge for #6580. (#12721)
* Change RGB/LED Matrix to use a simple define for USB suspend (#12697)
* [CI] Format code according to conventions (#12731)
* Fixing transport's led/rgb matrix suspend state logic (#12770)
* [CI] Format code according to conventions (#12772)
* Fix comment parsing (#12750)
* Added OLED fade out support (#12086)
* fix some references to bin/qmk that slipped in (#12832)
* Resolve a number of warnings in `qmk generate-api` (#12833)
* New command: qmk console (#12828)
* stash poc
* stash
* tidy up implementation
* Tidy up slightly for review
* Tidy up slightly for review
* Bodge environment to make tests pass
* Refactor away from asyncio due to windows issues
* Filter devices
* align vid/pid printing
* Add hidapi to the installers
* start preparing for multiple hid_listeners
* udev rules for hid_listen
* refactor to move closer to end state
* very basic implementation of the threaded model
* refactor how vid/pid/index are supplied and parsed
* windows improvements
* read the report directly when usage page isn't available
* add per-device colors, the choice to show names or numbers, and refactor
* add timestamps
* Add support for showing bootloaders
* tweak the color for bootloaders
* Align bootloader disconnect with connect color
* add support for showing all bootloaders
* fix the pyusb check
* tweaks
* fix exception
* hide a stack trace behind -v
* add --no-bootloaders option
* add documentation for qmk console
* Apply suggestions from code review
* pyformat
* clean up and flesh out KNOWN_BOOTLOADERS
* Remove pointless SERIAL_LINK_ENABLE rules (#12846)
* Make Swap Hands use PROGMEM (#12284)
This converts the array that the Swap Hands feature uses to use PROGMEM,
and to read from that array, as such. Since this array never changes at
runtime, there is no reason to keep it in memory. Especially for AVR
boards, as memory is a precious resource.
* Fix another bin/qmk reference (#12856)
* [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419)
* Fixup build errors on `develop` branch. (#12723)
* LED Matrix: Effects! (#12651)
* Fix syntax error when compiling for ARM (#12866)
* Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT
* remove KEYMAP and LAYOUT_kc
* Add setup, clone, and env to the list of commands we allow even with broken modules (#12868)
* Rename `point_t` -> `led_point_t` (#12864)
* [Keyboard] updated a vendor name / fixed minor keymap issues (#12881)
* Add missing LED Matrix suspend code to suspend.c (#12878)
* LED Matrix: Documentation (#12685)
* Deprecate `send_unicode_hex_string()` (#12602)
* Fix spelling mistake regarding LED Matrix in split_common. (#12888)
* [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895)
* Use milc.subcommand.config instead of qmk.cli.config (#12915)
* Use milc.subcommand.config instead
* pyformat
* remove the config test
* Add function to allow repeated blinking of one layer (#12237)
* Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time
* Update doc
* Rework rgblight blinking according to requested change
* optimize storage
* Fixup housekeeping from being invoked twice per loop. (#12933)
* matrix: wait for row signal to go HIGH for every row (#12945)
I noticed this discrepancy (last row of the matrix treated differently than the
others) when optimizing the input latency of my keyboard controller, see also
https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
Before this commit, when tuning the delays I noticed ghost key presses when
pressing the F2 key, which is on the last row of the keyboard matrix: the
dead_grave key, which is on the first row of the keyboard matrix, would be
incorrectly detected as pressed.
After this commit, all keyboard matrix rows are interpreted correctly.
I suspect that my setup is more susceptible to this nuance than others because I
use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask
the problem.
* ensure we do not conflict with existing keymap aliases (#12976)
* Add support for up to 4 IS31FL3733 drivers (#12342)
* Convert Encoder callbacks to be boolean functions (#12805)
* [Keyboard] Fix Terrazzo build failure (#12977)
* Do not hard set config in CPTC files (#11864)
* [Keyboard] Corne - Remove legacy revision support (#12226)
* [Keymap] Update to Drashna keymap and user code (based on develop) (#12936)
* Add Full-duplex serial driver for ARM boards (#9842)
* Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987)
* Backlight: add defines for default level and breathing state (#12560)
* Add dire message about LUFA mass storage bootloader (#13014)
* [Keyboard] Remove redundant legacy and common headers for crkbd (#13023)
Was causing compiler errors on some systems.
* Fix keyboards/keymaps for boolean encoder callback changes (#12985)
* `backlight.c`: include `eeprom.h` (#13024)
* Add changelog for 2021-05-29 Breaking Changes merge (#12939)
* Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version
* Add recent develop changes
* Sort recent develop changes
* Remove sections for ChibiOS changes per tzarc
No ChibiOS changes this round.
* Add and sort recent develop changes
* add notes about keyboard moves/deletions
* import changelog for PR 12172
Documents the change to BOOTMAGIC_ENABLE.
* update section headings
* re-sort changelog
* add additional note regarding Bootmagic changes
* remove changelog timestamp
* update dates in main Breaking Changes docs
* fix broken section anchors in previous changelogs
* add link to backlight/eeprom patch to changelog
* highlight some more changes
* link PRs from section headers
* Restore standard readme
* run: qmk cformat --core-only
|
|
* Create piv3rt's keymap
* Use tabs's LED as a caps lock indicator
* Fix indentation (tabs -> spaces)
* Set inital LED matrix color & mode
* Rename layers and add an RGBRST keycode
* Disable unused RGB effects
* Add RGB profiles
* Use ESC's LED as a num lock indicator
* Light up the keypad when _NUM layer is active
* Realign layers
* Remove legacy layer
* Fix CAPS key macro
* Reduce TAPPING_TERM to 100
* Change the caps LED to red and display the numlock one on special layers
* Add french accentuated caps + minor improvements on layers
* Remove left numpad
* Add french quotation marks
* Add key KC_NUBS
* Add terminal copy/paste
* Disable led profile on wakeup
* Change the default color
* Add AMD replay and record keys
* Add a MacOS layer
* Move Numpad
* Add GPLv2 license information
* Optimise custom RGB matrix
* Move keypad toggle and disable MAC led indicator
* Remove unnecessary check for RGB matrix
|
|
* Personal keymap and README to go along with it.
* Noticed typo in README and removed name from comment in keymap
* Added GPL copyright notice
|
|
The keymap for this PCB as of April 5, 2020 has a 4rth, largely superfluous layer, creating a total of 5 layers.
When ported to VIA, this results in a layer that users can access but cannot edit. I propose removing this layer completely along with it's access from the default.
|
|
|
|
|
|
|
|
* adding new hhkb layout
* adding license header
* fix end of lines symbol
Co-authored-by: Daniil Kivenko <d.kivenko@evrone.com>
Co-authored-by: Daniil macbet Kivenko <macbet@wisebits.com>
|
|
|
|
|
|
|
|
|
|
* add dz96
* Apply suggestions from code review
* Update keyboards/dztech/dz96/keymaps/iso/keymap.c
* add image to readme
|
|
|
|
|
|
- Set all other ChibiOS defaults to 'off', when not targeting Proton-C
- Modified all existing F303 boards to point at the QMK_PROTON_C to ensure repeatable binary output
- Modified version.h generation so that SKIP_VERSION=yes generates the same output
|
|
* Branch point for 2020 November 28 Breaking Change
* Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183)
* Add support for soft serial to ATmega32U2 (#10204)
* Change MIDI velocity implementation to allow direct control of velocity value (#9940)
* Add ability to build a subset of all keyboards based on platform.
* Actually use eeprom_driver_init().
* Make bootloader_jump weak for ChibiOS. (#10417)
* Joystick 16-bit support (#10439)
* Per-encoder resolutions (#10259)
* Share button state from mousekey to pointing_device (#10179)
* Add hotfix for chibios keyboards not wake (#10088)
* Add advanced/efficient RGB Matrix Indicators (#8564)
* Naming change.
* Support for STM32 GPIOF,G,H,I,J,K (#10206)
* Add milc as a dependency and remove the installed milc (#10563)
* ChibiOS upgrade: early init conversions (#10214)
* ChibiOS upgrade: configuration file migrator (#9952)
* Haptic and solenoid cleanup (#9700)
* XD75 cleanup (#10524)
* OLED display update interval support (#10388)
* Add definition based on currently-selected serial driver. (#10716)
* New feature: Retro Tapping per key (#10622)
* Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638)
* Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530)
* Rescale both ChibiOS and AVR backlighting.
* Reduce Helix keyboard build variation (#8669)
* Minor change to behavior allowing display updates to continue between task ticks (#10750)
* Some GPIO manipulations in matrix.c change to atomic. (#10491)
* qmk cformat (#10767)
* [Keyboard] Update the Speedo firmware for v3.0 (#10657)
* Maartenwut/Maarten namechange to evyd13/Evy (#10274)
* [quantum] combine repeated lines of code (#10837)
* Add step sequencer feature (#9703)
* aeboards/ext65 refactor (#10820)
* Refactor xelus/dawn60 for Rev2 later (#10584)
* add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824)
* [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549)
* update chibios os usb for the otg driver (#8893)
* Remove HD44780 References, Part 4 (#10735)
* [Keyboard] Add Valor FRL TKL (+refactor) (#10512)
* Fix cursor position bug in oled_write_raw functions (#10800)
* Fixup version.h writing when using SKIP_VERSION=yes (#10972)
* Allow for certain code in the codebase assuming length of string. (#10974)
* Add AT90USB support for serial.c (#10706)
* Auto shift: support repeats and early registration (#9826)
* Rename ledmatrix.h to match .c file (#7949)
* Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231)
* Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840)
* Merge point for 2020 Nov 28 Breaking Change
|
|
* Adds pagondel layout for dz65rgb v2
* Adds license information
* replaces define by enums
* Update license year
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
|
|
* Badger keymaps
* bug fix - linter
* code review feedback and ortholinear bugs
* cleanup
* backing out suspect bug after doing additional research
* code review feedback
* code review feedback
* changing default badger keymap and small bugfix
|
|
* Better handle LTO_ENABLE
Especially when calling from command line
* Replace LINK_TIME_OPTIMIZATION_ENABLE with LTO_ENABLE
* Remove long for LTO from show_options.mk
|
|
* DZ60RGB V1 - Add personal configuration
(cherry picked from commit 313ce586e998f5604ed1b559bbe90de381f0b782)
* [Keymap] Didel - Add license headers
* [Keymap] Didel - Reformat Keymap
* [Keymap] Didel - Add named layers
|
|
* remove HD44780_ENABLE rules: C-F
* remove HD44780_ENABLE config: C-F
|
|
* Update readme.md
* add bocc keyboard
* Update bocc.c
* Update keymap.c
* Update readme.md
* Update config.h
* Update keyboards/dztech/bocc/config.h
* Update keyboards/dztech/bocc/rules.mk
* Update keyboards/dztech/bocc/bocc.c
* Update keyboards/dztech/bocc/bocc.c
* Update keyboards/dztech/bocc/readme.md
* Update keyboards/dztech/bocc/readme.md
* Update keyboards/dztech/bocc/rules.mk
* Update keyboards/dztech/bocc/rules.mk
* Update bocc.c
* Update bocc.h
* Update bocc.c
* Update config.h
* Update keymap.c
* Update keymap.c
* Update keyboards/dztech/bocc/config.h
* Update keyboards/dztech/bocc/keymaps/default/keymap.c
* Update keyboards/dztech/bocc/bocc.h
* Update keyboards/dztech/bocc/info.json
* Update keyboards/dztech/bocc/keymaps/default/keymap.c
* Update keyboards/dztech/bocc/keymaps/via/keymap.c
* Update keyboards/dztech/bocc/keymaps/via/keymap.c
* Update keyboards/dztech/bocc/keymaps/via/keymap.c
* Update keyboards/dztech/bocc/keymaps/via/keymap.c
* Update bocc.h
* Update keymap.c
* Update keymap.c
* Update keymap.c
* Update bocc.h
* Update keyboards/dztech/bocc/bocc.h
|
|
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
|
|
(#9791)
|
|
improvements on Accessibility (#9207)
Co-authored-by: Ryan <fauxpark@gmail.com>
|
|
|
|
* New keymap layout for dztech/dz65rgb/keymaps
* New keymap layout for dztech/dz65rgb/keymaps
- Conding conventions fixes
* Fix typo in Leader Key table
* PR #8199 Feedback Commit #1
* Fixed data types and function names - Simplified accent macros by removing repetition - Added selection wrap macros - readme.md doc updated with changes
* PR #8199 second feedback commit - Clarified function names, variables names and comments
* Fix: accent output fix _grave <==> _circumflex
* dry fixes on led set_color with hsv and led blinking code blocks
|
|
* Remove no-longer-necessary LTO checks from keyboards' config.h files
* Remove unnecessary LTO check in @danielo515's Ergodox EZ keymap
* Remove unnecessary USE_Link_Time_Optimization checks from keyboards' config.h files
Note: DISABLE_LEADER doesn't seem to be used anywhere
|
|
* add via support for dztech 60 and 65 pcb
add via support for dztech 60 and 65 pcb
* Update dz60rgb.h
* Update dz60rgb.h
* Update dz60rgb_ansi.h
* Update dz60rgb_wkl.h
* Update dz65rgb.h
* Update dz60rgb.h
* Update dz60rgb_ansi.h
* Update dz60rgb_wkl.h
* Update dz65rgb.h
* Update keyboards/dztech/dz60rgb/dz60rgb.h
* Update keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h
* Update keyboards/dztech/dz65rgb/dz65rgb.h
* Update keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h
* Update dz60rgb_wkl.h
* Update keyboards/dztech/dz65rgb/keymaps/via/keymap.c
* Update keyboards/dztech/dz60rgb_wkl/keymaps/via/keymap.c
|
|
* add dz60 via support
* use the correct DZ vendor id dervied from dz60
* differentiate product ID of v2 board
|
|
* Tidy up dztech keyboard.c/h and readmes
* Use new lock LED function
* Undo changes to led flags
* Fix make examples
* Update readmes some more
* Clarify filetypes
* Format as list
|
|
* Adi's DZ65RGB layout
* Update keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/readme.md
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Rename layers.JSON to layers.json
* Update readme.md
* Update keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/keymap.c
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/keymap.c
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/readme.md
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/readme.md
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
* Delete layers.json
* Update keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/readme.md
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/readme.md
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/readme.md
Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
* Rename keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/readme.md to keyboards/dztech/dz65rgb/keymaps/adi/readme.md
* Rename keyboards/dztech/dz65rgb/keymaps/adi_dz65rgb_ansi/keymap.c to keyboards/dztech/dz65rgb/keymaps/adi/keymap.c
Co-authored-by: fauxpark <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
|
|
|
|
|
|
|
|
|
|
|
|
* Add short alias for `MAGIC_TOGGLE_NKRO`
* Add aliases for the other Bootmagic keycodes
* Replace long form in default keymaps
|
|
* Add community layout support for DZ60RGB WKL
* info.json would be good too
|
|
* dztech rgb pcb v2 support
dztech rgb pcb v2 support
* Update config.h
* Update rules.mk
* Update rules.mk
* Update rules.mk
* Update keyboards/dztech/dz60rgb/v2/rules.mk
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/dztech/dz60rgb/v2/rules.mk
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/dztech/dz60rgb_ansi/v2/rules.mk
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/dztech/dz60rgb_ansi/v2/rules.mk
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/dztech/dz60rgb_wkl/v2/rules.mk
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/dztech/dz60rgb_wkl/v2/rules.mk
Co-Authored-By: fauxpark <fauxpark@gmail.com>
|