summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-07[Keyboard] Add new keyboard ColorLice (#7536)marhalloweenvt
* [Keyboard] Add new keyboard Symmetry60 * Add new keyboard Symmetry60 * Fix Typo * Update keyboards/handwired/symmetry60/config.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/symmetry60/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/symmetry60/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/symmetry60/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/symmetry60/rules.mk Co-Authored-By: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/symmetry60/symmetry60.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/symmetry60/symmetry60.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/symmetry60/symmetry60.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Update readme.md * Update keymap.c * Update keymap.c * Update keymap.c * Update rules.mk * Update symmetry60.c * Update keyboards/handwired/symmetry60/rules.mk Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Add ColorLice * Update ColorLice - Adjust info.json to support Configurator - Adjust layout name to fit with info.json - Seperate 2 feature: RGB Switch and RGB Underglow * Update new way of control lock leds * Remove #ifndef COLORLICE_H * Update make example * Revert Helix * Revert Helix * Revert Helix * Revert Helix * Update keyboards/handwired/colorlice/colorlice.h Co-Authored-By: Joel Challis <git@zvecr.com> * Update keyboards/handwired/colorlice/colorlice.h Co-Authored-By: Joel Challis <git@zvecr.com> * Update default keymap * Revert Helix * Update keyboards/handwired/colorlice/readme.md Co-Authored-By: Joel Challis <git@zvecr.com> * Update keyboards/handwired/colorlice/rules.mk Co-Authored-By: Joel Challis <git@zvecr.com> * Update keyboards/handwired/colorlice/colorlice.c Co-Authored-By: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/colorlice/colorlice.c Co-Authored-By: Drashna Jaelre <drashna@live.com> * Remove unnecessary function * Update keyboards/handwired/colorlice/colorlice.c Co-Authored-By: Drashna Jaelre <drashna@live.com> * Adjust rules option for working with Configurator - Move RGB_MATRIX_ENABLE and RGBLIGHT_ENABLE to keyboard rule. - Add RGB_DI_PIN in keyboard config * Update keyboards/helix/rev2/keymaps/default/keymap.c Co-Authored-By: Joel Challis <git@zvecr.com> * Update keyboards/handwired/colorlice/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keymap for Colorlice * Adjust rules.mk to use space indent
2019-12-07[Keymap] Display logo for caps lock indication on crkbd using old OLED ↵Manna Harbour
driver (#7535) * Display logo for caps lock indication on crkbd using old OLED driver * Add emacs read-only mode file variable to generated files * use LTO_ENABLE instead of EXTRAFLAGS This enables the same option, and disables action_macros, and action_functions, both of which seem to break when LTO is enabled. And this is a lot simpler to use. Co-Authored-By: Drashna Jaelre <drashna@live.com>
2019-12-08fix instructions for oneshot layer handling on key release (#7554)hmkemppainen
* fix instructions for oneshot layer handling on key release * use ONESHOT_OTHER_KEY_PRESSED instead of ONESHOT_PRESSED Co-Authored-By: Drashna Jaelre <drashna@live.com>
2019-12-08Set proper ASCII character for KC_NUHS in iWRAP code (#7434)fauxpark
2019-12-08Improve support and docs for ADC driver (#7191)fauxpark
* Improve support and docs for ADC driver * Comment ADC channels * Move to Makers and Modders section, and fix usage instructions * Flesh out intro * Superscript 328P note * Fix pin_to_mux LUT * Support USB64/1287 as well * analogReadPin() defaults to 0V mux on invalid pin * Update pinToMux() function documentation * Dot * Accept (some of) the `qmk cformat` changes * Do clang-format properly * More wording tweaks * Link to encoder docs
2019-12-07Minor grammar and filename fixes in docs (#7559)osjuga
Grammar in coding_conventions_c.md and coding_conventions_python.md `rule.mk` to `rules.mk` in feature_haptic_feedback.md and feature_rgb_matrix.md
2019-12-07Port SPLIT_USB_DETECT to helix/rev2 (#7385)Eric Bunton
* Port SPLIT_USB_DETECT to helix/rev2 * Remove debug toggles. * Rename is_keyboard_master to has_usb in split_util
2019-12-06[Docs] Creating RU version of getting_started_introduction (#7224)Gregory Gubarev
* Creating RU version of getting_started_introduction * Update docs/ru-ru/getting_started_introduction.md Update "предполагается" * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md * Update docs/ru-ru/getting_started_introduction.md Co-Authored-By: Nikita Titov <nekit94-08@mail.ru>
2019-12-06[Docs] Create RU ver of becoming_a_qmk_collaborator (#7226)Gregory Gubarev
* Create RU ver of becoming_a_qmk_collaborator * Updated * Updated - collaborator to соавтор * Update docs/ru-ru/becoming_a_qmk_collaborator.md * Update docs/ru-ru/becoming_a_qmk_collaborator.md * Update docs/ru-ru/becoming_a_qmk_collaborator.md * Update docs/ru-ru/becoming_a_qmk_collaborator.md * Update docs/ru-ru/becoming_a_qmk_collaborator.md * Update docs/ru-ru/becoming_a_qmk_collaborator.md * Update docs/ru-ru/becoming_a_qmk_collaborator.md Co-Authored-By: Nikita Titov <nekit94-08@mail.ru>
2019-12-06[Keyboard] Fix missing item in Ergodicity macro (#7553)Danny
2019-12-06Add keyboard - MYSTERIUM (#7547)coseyfannitutti
* Create config.h * Create info.json * Create keymap.c * Create keymap.c * Create mysterium.c * Create mysterium.h * Create readme.md * Create rules.mk * Create usbconfig.h * Update keyboards/coseyfannitutti/mysterium/readme.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/readme.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/readme.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update mysterium.c * Update rules.mk * Update usbconfig.h * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update rules.mk * Update keyboards/coseyfannitutti/mysterium/usbconfig.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/mysterium/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update config.h * Update info.json * Update keymap.c * Update mysterium.h * Update rules.mk
2019-12-06Update getting_started_make_guide.md (#7538)arlenk
* Update getting_started_make_guide.md clarifying that NO_PRINT and USER_PRINT should not be used at the same time. * Update docs/getting_started_make_guide.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
2019-12-06Fix breathing toggle when rgb is disabled (#7550)Joel Challis
2019-12-05Jotix (#7549)jotix
* jotix_layout_adjustment * TT(_LOWER) * config.h * jotix_layout * jotix_layout
2019-12-05[Keymap] Dactyl Manuform computer scientist's layout with split RGB enabled ↵squirrelsRduck
(#7519) * Added my Dactyl Manuform layout * Added my Dactyl Manuform layout * finalized key layout, added reset code, no LED yet * finalized key layout, added reset code, no LED yet * enabled RGB backlight * enabled RGB backlight * enabled RGB backlight * supporting split rgb * supporting split rgb * supporting split rgb * added media controls * allowing ctrl/command to fallthrough from mouse layer so we can ctrl scroll to zoom in/out * addressed PR comments, and make a couple last minute adjustments to the layout, to add in the Forwards Delete keycode * decreased brightness even more
2019-12-05[Keymap] Added Massdrop ctrl keymap (#7491)Ahmed Elshafey
* massdrop ctrl endgame keymap first commit * massdrop ctrl endgame keymap update Added double dance functions to toggle mouse layer while keeping LGUI key functionality. Added led config and related functionality. Added RGB indicators for effective keys on layers. Fixed RGB timeout ignoring user set LED flags. At current state, layer RGB indicators ignore RGB brightness value, will add toggle key later to toggle between current keyboard brightness and max brightness as it's nice to have the indicator RGB at max brightness but still too bright at times. * updated documentation and added RGB indicator for ctrl and shift in function layer * Update keyboards/massdrop/ctrl/keymaps/endgame/keymap.c Co-Authored-By: Drashna Jaelre <drashna@live.com> * Update keyboards/massdrop/ctrl/keymaps/endgame/keymap.c Co-Authored-By: Drashna Jaelre <drashna@live.com> * Various fixes and changes. Removed backslashed at end of layouts, better looking. Changed layout names from macro definitions to enum. Replaced MOD_BIT with MOD_MASK macros.
2019-12-05Add short aliases for Magic keycodes (#7541)fauxpark
* Add short alias for `MAGIC_TOGGLE_NKRO` * Add aliases for the other Bootmagic keycodes * Replace long form in default keymaps
2019-12-04[Keymap] [preonic/kjwon15] Support led key (#7543)Jeong Arm
2019-12-03Relocate magic keycode processing (#7512)Joel Challis
* Move magic keycode processing to own file * Save some bytes * Update comments * Update define to one thats not already used... * Fix audio
2019-12-03Increase matrix scanning speed on xd84 (#7517)Joel Challis
* Increase matrix scanning speed * Fix func name in failure output
2019-12-03Add J-01 ISO Support (#7527)MechMerlin
* Add ISO support * Update keyboards/jae/j01/info.json Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
2019-12-03Helix default keymap update (#7465)MakotoKurauchi
* add RGBRST key into helix/pico:default keymap ADJUST layer * update helix/rev2:default keymap's OLED display contents * add RGBRST key to HELIX_ROWS == 4 ADJUST layer * add CAPS key to RAISE, LOWER layer * add layer status display on slave side oled * add RGB LED status display on both side oled * save stack memory size
2019-12-03[Keymap] add halvves kumo (minivan) keymap (#7534)halvves
* [Keymap] add halvves kumo (minivan) keymap * adjust tapping * remove RGBLIGHT_TIMER
2019-12-02[Docs] Restructure of Git Best Practices doc (#7231)James Young
* Add "Resynchronizing an Out-of-Sync Git Branch" doc * Update (Git) Best Practices doc title and filename * Rename Branch Resync doc * fork Best Practices doc into multiple files * Add the doc list to Git Best Practices doc * Update sidebar * Update internal references * Update sidebar - add subsection * Update Your Fork's Master page title * title case on Git Best Practices main doc * ... and in the Resynchronizing a Branch doc * Please read Part 1 I worked really hard on this, okay? * Please use branches, too. * suggestions by mtei * change note about adding multiple files * note that the name given the remote repo is arbitrary * suggestions by fauxpark * Git Best Practices -> Best Git Practices Reads more naturally. * rephrase hint block regarding remote name * rework the resynchronization instructions per mtei * use hint boxes for reference to Part 1 doc I may be addicted to hint boxes. I'm sorry fauxpark. :cry: * add some clarity about the upstream repo * wordsmithing per mtei * restyle the shell code blocks Makes them more consistent to the other docs in this section.
2019-12-02[Keyboard] Add handwired/floorboard (#7478)kevin-b-lockwood
* added handwired/plonk * Update readme.md * Update readme.md * Update info.json * Update config.h * Update readme.md * Update keyboards/handwired/plonk/rules.mk Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update rules.mk * Update plonk.c * Update plonk.h * Update keymap.c * Delete config.h * Update keyboards/handwired/plonk/config.h Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update rules.mk * Update info.json * Update keyboards/handwired/plonk/readme.md Co-Authored-By: fauxpark <fauxpark@gmail.com> * Update rules.mk * Renamed the Plonk to the Floorboard. Another homage, just subtler this time. * removed old plonk files * Update config.h
2019-12-02[Keyboard] Added tr60w keyboard (#7450)Joule-Flow
* Added tr60w configurations. I based these files on the fox-lab/qmk_firmware repository. After checking both licenses, which are identical, I added those files into this feature branch. For transparency reasons I'll add the url to the fox-lab repository. https://github.com/fox-lab/qmk_firmware * Using #pragma once in config.h. * Removed '#define CCONFIG_H' from config.h. * Changed PRODUCT_ID to '0x4140'. * Renamed setting to 'DEBOUNCE'. * Removed key combination, due to already default implementation. * Removed 'PREVENT_STUCK_MODIFIERS', defaulted by QMK. * Removed not uneccessary '#endif' statement. * Renamed include to 'QMK_KEYBOARD_H'. * Changed keymap structure according to pull request suggestion. * Removed 'void matrix_init_user(void)'. * Removed 'void matrix_scan_user(void)'. * Removed 'bool process_record_user(...)'. * Removed non-standard configuration in favor for 'led_update_kb'. * Using default setup based on 'MCU' setting. * Replaced Build Option configuration with suggested information. * Fixed include statements as requested. * Changed 'KEYMAP' to suggestion. * Removed obsolete '#endif' statement. * Added readme.md file. * Updated readme.md with further information. * Reverted include statement, to check if this caused ci error. * Revert "Reverted include statement." This reverts commit ebd992dc01133169be38ae7201bb00b4d01cc737. * Fixed wrong mapped key * Fixed include as per suggestion. * Replaced 'KC_TRNS' with '_______'for readability. * Added personal keymap.c file. * Updated the readme.md file according to template/avr/readme.md. * Fixed Link to Image. * Updated readme.md as per request. * Updated rules.mk, as per suggestion. Set 'BOOTMAGIC_ENABLE = lite'.
2019-12-02[Keymap] Ruby influenced Redox keymap (#7531)Matt Valentine-House
2019-12-02[Docs] add japanese translations (#7454)umi
* for initial commit * for initial commit * for initial commit * Update led_update_kb example (#7451) * Update led_update_kb example * Update comment to explain pin behavior * wordsmith * wordsmithing 2 * Remove CR when computing BOOTLOADER_SIZE. (#7453) * Set up language fallback for docs, and update translation guidelines (#7403) * Set up language fallback for docs, and update translation guidelines * Title Case * Add ID example * Link to emoji flag cheatsheet * Move docs preview section to contributing.md * Point to docs preview in the readme * [Keyboard] Added Cans12er keyboard (#7455) * added cans12er keyboard * updated readme Updated the readme to conform with the provided template from the qmk_firmware githubpage * Update keyboards/cans12er/README.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Changed configuration Changed the configuration based on the Change Request from PR #7455 made by github user noroadsleft * [Keyboard] Update ATmega32A readme files to match template (#7462) * Update atmega32a readme files to match template * Update atmega32a readme files to match template - fixes * Apply suggestions from code review * update files based on comments * update files based on comments * update files based on comments * update files based on comments * update files based on comments * update files based on comments * update files based on comments Co-Authored-By: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-Authored-By: shela <shelaf@users.noreply.github.com>
2019-12-02Remove check for EH define (#7525)Danny
Its use in lets_split_eh was factored out in https://github.com/qmk/qmk_firmware/pull/6411
2019-12-02Remove eeprom_f4 due to conflicting licenseskullY
2019-12-01[Keyboard] 140% keyboard fluorite keymaps (#7473)ihotsuno
* fluorite keymaps * Update config.h * Update fluorite.c I corrected the points that were pointed out. * Update fluorite.h I corrected the points that were pointed out. * Update config.h I corrected the points that were pointed out. * Update keymap.c I corrected the points that were pointed out. * Update keyboards/fluorite/config.h thanks! * Update keyboards/fluorite/readme.md thanks! * Update keyboards/fluorite/rules.mk thanks! * Update keyboards/fluorite/rules.mk thanks! * Update keyboards/fluorite/rules.mk thanks! * Update keyboards/fluorite/rules.mk thanks! * Update keyboards/fluorite/rules.mk thanks! * Update keyboards/fluorite/readme.md thanks! * Update keyboards/fluorite/readme.md thanks! * Update keyboards/fluorite/rules.mk thanks! * Update keyboards/fluorite/rules.mk thanks! * Update keyboards/fluorite/rules.mk thanks! * Update keymap.c I corrected the points that were pointed out. * Update fluorite.c I corrected the points that were pointed out. * Update rules.mk I corrected the points that were pointed out. * Update keyboards/fluorite/rules.mk Thanks! * Update keyboards/fluorite/rules.mk Thanks! * Update keymap.c I corrected the points that were pointed out. * Update fluorite.h I corrected the points that were pointed out. * Update keymap.c I corrected the points that were pointed out. * Update keymap.c I corrected the points. c:165:68 XDXXXXX >> XXXXXXX Reverted,because error log. ADJUST, * Update keymap.c I corrected the points that were pointed out. * Update readme.md link added * Update readme.md photo link added * Update readme.md link Modify * Update keyboards/fluorite/readme.md Thanks! * Update keyboards/fluorite/readme.md Thanks!
2019-12-02Fix install for Linux Ubuntu (#7520)iKirin
* Fix linux install for Ubuntu. It failed due to sh not supporting [ and pip being seperate from python3 * Adapted install function according to feedback * Fix style
2019-12-01Add pep8-naming to our python lintingskullY
2019-12-01[Keymap] Added jhelvy keymaps for keebio/iris and lily58 (#7447)John Helveston
* Added jhelvy keymaps for keebio/iris and lily58 * Fixed keymap image link for Iris * Update keyboards/keebio/iris/keymaps/jhelvy/keymap.c * Fixed keymap image url for lily58 * Update keyboards/lily58/keymaps/jhelvy/keymap.c * Removed numbers in parentheticals in lily58 rules * Removed unnecessary rules
2019-12-01format code according to conventions [skip ci]QMK Bot
2019-12-01[Keyboard] fixed noah info.json (#7518)yulei
* fixed noah info.json * fixed iso keymap and adding default iso keymaps * keymap cleanup * verified through the qmk configurator preview mode * modify encoding from utf-8 bom to urf-8
2019-12-01[Keyboard] Update Lets Split Sockets to use LTO_ENABLE (#7516)Drashna Jaelre
2019-11-30Add _summary.md for Russian docs with proper language prefix (#7514)fauxpark
2019-11-30[Keyboard] Fix calls in handwired/jotanck (#7515)Drashna Jaelre
The C file for this keyboard was calling `keyboard_pre_init_user`. Which is wrong. This fixes that behavior.
2019-11-29[Keymap] Added my UT47.2 Swedish layout with tap dance function. (#6861)hvp
* Added my UT47.2 Swedish layout with tap dance function. * Move tap dance over to user space * Removed config_common from config file
2019-11-29Specify Arm GCC 8 in macOS install script (#7509)fauxpark
2019-11-29[Keyboard] Add community layout support for DZ60RGB WKL (#7503)fauxpark
* Add community layout support for DZ60RGB WKL * info.json would be good too
2019-11-29[Keyboard] fixed noah info.json (#7502)yulei
* fixed noah info.json * fixed iso keymap and adding default iso keymaps * keymap cleanup * verified through the qmk configurator preview mode
2019-11-29[Keymap] Add RGB keycodes to keymap, enable RGB_MATRIX on crkbd (#7499)Manna Harbour
2019-11-29Use os.chdir for `qmk docs` instead of a custom HTTP request handler (#7493)fauxpark
2019-11-30[keymap] personal keymap tweaks (#7510)Callum Oakley
* replace home and end with cmd-left and cmd-right for iOS compatability * tab left and right with cmd-shift-bracket instead of ctrl-tab for Blink compatability * cmd-up and cmd-down instead of pg-up pg-down for blink shell compatability * Revert "cmd-up and cmd-down instead of pg-up pg-down for blink shell compatability" This reverts commit e976af9f11f77933f272edc22faf971445a65717. * reorganised symbol layer * update link in readme
2019-11-29Fix output file permissions when using docker build. (#7378)Nick Brassel
2019-11-28Add yet another dictionary for the QMK Firmware docs sidebar heading (#7504)fauxpark
2019-11-28Add shift-to-invert to remaining directional RGB_* keycode pairs (#7484)Manna Harbour
* Add shift-to-invert to remaining directional RGB_* keycode pairs RGB_MODE_FORWARD / RGB_MODE_REVERSE invert their functions when shift is held. This change adds the same capabilities to the remaining directional RGB_* keycode pairs. This improves consistency and provides full RGB control in a keymap containing only one keycode from each pair. * remove redundant variable * fix typo * Fix more typos Flyspell is on now I swear!
2019-11-28Compile out some keycode processing when features are disabled (#7506)Joel Challis