summaryrefslogtreecommitdiff
path: root/keyboards
AgeCommit message (Collapse)Author
2020-03-18[Keymap] I2C scanner (#8454)Joel Challis
* Add i2c scanner keymap * Add bodge for chibios * Fix readme title * make chibios bodge a little cleaner * fix typo in readme
2020-03-18[Keyboard] Add more community layout support to Polaris (#8468)Brandon Schlack
- Add 60_ansi, 60_ansi_split_bs_rshift layouts
2020-03-18VIA support for TKC1800 (#8178)Wilba
* VIA support for TKC1800 * Fixed VENDOR_ID
2020-03-18[Keymap] Add the fsck layout for iris (#8473)Frederick Hirsch
2020-03-17[Keymap] Corodiak's Kyria (#8444)Jann-Niklas Zimmermann
* Add kyria keymap * Delete wrong readme.md * Move layer keys * Refine keymap * Clean up * Add comment * Improve OS depending macros * Update keymap overview * Add review suggestions
2020-03-17[Keymap] New Massdrop ALT keymap for emptyflask (#8460)Jon Roberts
amended to remove a couple of unnecessary lines, thanks to @zvecr and @fauxpark
2020-03-17[Keyboard] Add sick68 keyboard (#8400)Umberto Baldi
* add sick68 keyboard * relocate to keyboards/handwired/sick68 * Apply suggestions from code review * delete config.h because was emply * Apply suggestions from code review
2020-03-17Fix Dimple VIA keymap (#8466)Erovia
2020-03-17Add VIA support for LazyDesigners Dimple. (#8447)Erovia
* Assign unique VID to LazyDesigners' boards * Add VIA support for LazyDesigners Dimple * Apply @fauxpark's suggestions Co-Authored-By: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2020-03-17ARM - ADC cleanup (#8385)Joel Challis
* Update switch to array to allow custom values * Add adc keymap * update docs to reflect alignment of default 10 bit * start conversion to USE_ADCVn * samplerate is hella wrong...stub out for now * basic f1 and f4 functionality * Tidy up current changes * Restore old pinToMux function * Add back sample rate for supported platforms * F0 compile fixes * wordsmithery Co-Authored-By: Ryan <fauxpark@gmail.com> * Remove reference to avr only function Co-authored-by: Ryan <fauxpark@gmail.com>
2020-03-15[Keyboard] Add the Romeo keyboard (#8434)coseyfannitutti
* Add Keyboard - Romeo * Update rules.mk * Update readme.md * Update keyboards/coseyfannitutti/romeo/readme.md Co-Authored-By: Joel Challis <git@zvecr.com> * Update keyboards/coseyfannitutti/romeo/romeo.c Co-Authored-By: Joel Challis <git@zvecr.com> * Update keyboards/coseyfannitutti/romeo/keymaps/default/keymap.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/romeo/keymaps/default/keymap.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/romeo/readme.md Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/romeo/rules.mk Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/romeo/usbconfig.h Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/romeo/usbconfig.h Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/coseyfannitutti/romeo/usbconfig.h Co-Authored-By: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2020-03-15[Keymap] fix sigma keymaps build (#8427)Yann Hodique
handle unicode input properly.
2020-03-14VIA Support: Doro 67 (#8399)MechMerlin
* add via keymap for doro67 * have more sensible VID and PID * apply the same VIA changes to the regular PCB * Update keyboards/doro67/rgb/keymaps/via/keymap.c * Update keyboards/doro67/regular/config.h * fix some formatting * add via support for multi doro67
2020-03-14Remove pro_micro.h (#8374)Ryan
* Remove pro_micro.h * Include quantum.h
2020-03-14added olkb_style layout for XD75 (#8409)NeoTheFox
* added olkb_style layout for XD75 * removed unnecessary config.h * cleaned up empty functions * refactored fuction type for clarity * renamed the layout
2020-03-13[Keymap] ninjonas keymap updates (#8373)Jonas Avellana
* [keymap(ninjonas)] ninjonas keymap updates * [refactor] switching encoder rotation logic. recent pull seems to have flipped encoder stuff * [keymap(lily58)] added chrome change profile key on RAISE Co-authored-by: Jonas Avellana <jonas.avellana@workday.com>
2020-03-13Fix bootloader for Maypad (#8411)Ryan
2020-03-12[Keyboard] Add Wallaby (#8398)Koichi Katano
* Add wallaby * Update readme.md * Update keyboards/wallaby/keymaps/default/keymap.c * Update keyboards/wallaby/rules.mk
2020-03-12[Keyboard] Abacus Keyboard ReMerge (#8308)nickolaij
* added abacus keyboard * keymap updates * Update keyboards/abacus/config.h * Update keyboards/abacus/config.h * Update keyboards/abacus/keymaps/default/keymap.c * Update keyboards/abacus/keymaps/default/keymap.c * Update keyboards/abacus/keymaps/default/keymap.c * start cleaning up for merge * cleaned for merge * cleaned * cleaned * Update keyboards/abacus/abacus.h * Update keyboards/abacus/keymaps/default/keymap.c * Update keyboards/abacus/keymaps/default/readme.md * Update keyboards/abacus/readme.md * Update keyboards/abacus/readme.md * Update keyboards/abacus/rules.mk * Update keyboards/abacus/info.json * Update keyboards/abacus/info.json * Update keyboards/abacus/info.json * Update keyboards/abacus/readme.md * Update keyboards/abacus/info.json * Update keyboards/abacus/rules.mk * Update keyboards/abacus/rules.mk
2020-03-12[Keyboard] Candybar update (#8335)TerryMathews
* Candybar: split lefty and righty into subprojects. * Update readme.md * Update readme.md * Candybar: Moved STM32 library files into project root folder. * Update keyboards/candybar/righty/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/candybar/righty/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/candybar/righty/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/candybar/righty/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/candybar/righty/righty.c Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Candybar: remove Boards directory so project uses one from drivers * Update keyboards/candybar/righty/readme.md Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update readme.md * Update readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-03-13Add new keymap with split shift and split backspace for bananas… (#8395)Christopher Janzen
* Add new keymap with split right shift and split backspace for bananasplit PCB * Remove unecessary config.h * Remove unecessary line breaks Co-Authored-By: Ryan <fauxpark@gmail.com> Co-authored-by: Christopher Janzen <hello@christopherjanzen.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2020-03-12Enable custom backlight driver for kmac (#8397)Joel Challis
2020-03-12Danielo515/redox (#8232)Daniel RodrĂ­guez Rivero
* feat(build): added script for compiling with docker easily * chore: bring my own build with docker to master * chore: delete a file that does not make sense anymore * feat: first redox for danielo * chore: basic compatibility between redox and my space * refactor: removed some old stuff * feat: added go coding symbols * feat: name control_k and alt_j * chore: reduce combo term * feat: improved first layer of redox * feat: add configurations to the redox * feat: make alt tab more portable * feat: small improvements to redox layout * feat: added leader * refactor: move leader defs to my userspace config * chore: movement modified * feat: more predefined keys and a a new combo * feat: redox alt tab functionality * refactor: move alt_tab processing to a separate file * refactor: early return * refactor: move process record to a separate file * format leader function * chore: backspace on digits layer * feat: add extra combo * feat: added more combos * implement guard proposed by @drashna Co-Authored-By: Drashna Jaelre <drashna@live.com> * chore: include @drashna placeholder suggestion Co-Authored-By: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-03-11[Keymap] Add Erkhal keymap to PRKL30 (#8355)Erkki Halinen
* Add Erkhal keymap * Fix comment of layer * Update keyboards/handwired/prkl30/keymaps/erkhal/readme.md
2020-03-11fix keyboards/mxss/rgblight.h (#8388)Takeshi ISHII
Since #7773 caused a build error for `mxss:default`, I made similar changes to 'keyboards/mxss/rgblight.h' as #7773 did to 'quantum/rgblight.h'. **This commit does not change the build result.** Testing script ```shell # build on versions earlier than PR #7773 git checkout 0.8.24 echo master > /tmp/master_md5.txt make mxss:default:clean make mxss:default md5 mxss_default.hex >> /tmp/master_md5.txt # build on this commit git checkout fix-keyboards-mxss-rgblight.h echo fix-keyboards-mxss-rgblight.h > /tmp/branch_md5.txt make mxss:default:clean make mxss:default md5 mxss_default.hex >> /tmp/branch_md5.txt diff -u /tmp/master_md5.txt /tmp/branch_md5.txt ``` Test result: ``` --- /tmp/master_md5.txt 2020-03-12 05:51:39.000000000 +0900 +++ /tmp/branch_md5.txt 2020-03-12 05:51:49.000000000 +0900 @@ -1,2 +1,2 @@ -master +fix-keyboards-mxss-rgblight.h MD5 (mxss_default.hex) = 3034b2504d0c7fc6bd8bf1dffb6b8486 ```
2020-03-11[Keyboard] Oddball keyboard (#8352)Alexander Tulloh
* Initial commit of oddball keyboard * Update oddball project url * Update pointer functions to only run on master side * Add unique product version * Capitalise product name * Convert oddball keymap layer flags to enum * Remove commented keyboard boilerplate code * Remove unused keymap config * Fix incorrect layout in info.json * Add markdown link text in readme
2020-03-11Add VIA support to Tokyo60. (#8362)Zambumon
* VIA_ENABLE Tokyo60 PCB * Update config.h * Apply suggestions from code review Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-03-10fix kira80 matrix mapping and add more preset layouts (#8361)elmo-space
* fix kira80 matrix mapping * add more preset keymaps * remove uselesss rgb mod keys
2020-03-10Refactor Equinox PCB revisions (#8266)Wilba
* Refactor Equinox PCB revisions * typo
2020-03-10Replace tab indentation with spaces in is0 default keymap. (#8368)Alvin See
2020-03-10[Keymap] Added HHKB Keymap and user config (#8119)Brett Mandler
* Added my config * Update my keymap * Improve quality of brett.c * Finish cleaning brett.c * Remove QMK_FIRMWARE_H * Update keyboards/hhkb/keymaps/brett/keymap.c Co-Authored-By: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2020-03-10[Keyboard] Palette1202 (#7736)Takashi Shibusawa
* added Palette1202 * removed currently unused cords * Update keyboards/palette1202/config.h Co-Authored-By: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review Co-Authored-By: Drashna Jaelre <drashna@live.com> Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update readme.md removed unnecessary horizontal line from readme.md * Update readme.md Fixed style, make command example * Removed spaces * removed unused config.h * fixed defines * fixed send string on rotate encoder * fixed layer numbers for OLED Display * fixed to use existing function to set default layer https://github.com/qmk/qmk_firmware/pull/7736#discussion_r366699616 * flipped rotary encoder directions * Added layer for Clip studio on iOS * Update keyboards/palette1202/rules.mk Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/palette1202/lib/oled_helper.h Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2020-03-10[Keyboard] Helix add split common option (#7718)MakotoKurauchi
* is_master, has_usb() move to rev2.[hc] * Do recent helix/rev2 changes to helix/pico as well. helix/pico/matrix.c: remove 'is_master' helix/pico/pico.c: add 'is_master' helix/pico/pico.h: add 'has_usb()' macro helix/pico/split_util.c: remove 'setup_handedness()' 'has_usb()', add 'is_helix_master()' etc * add HELIX=scan option into {rev2/pico}/local_features.mk Made DEBUG_MATRIX_SCAN_RATE easy to use. * Changed rules.mk to link "helix/local_drivers/ssd1306.c" only when OLED_ENABLE = yes. * Added option to use split_common for helix/rev2, helix/pico keyboard. how to build: ### build helix/pico (HelixPico) with helix current codes $ make helix/pico:KEY_MAP $ make helix/pico/back:KEY_MAP ### build helix/rev2 (Helix or Helix beta) with helix current codes $ make helix:KEY_MAP $ make helix/rev2/back:KEY_MAP $ make helix/rev2/under:KEY_MAP $ make helix/rev2/oled:KEY_MAP $ make helix/rev2/oled/back:KEY_MAP $ make helix/rev2/oled/under:KEY_MAP ### build helix/pico (HelixPico) with split_common codes $ make helix/pico/sc:KEY_MAP $ make helix/pico/sc/back:KEY_MAP $ make helix/pico/sc/under:KEY_MAP ### build helix/rev2 (Helix) with split_common codes $ make helix/rev2/sc:KEY_MAP $ make helix/rev2/sc/back:KEY_MAP $ make helix/rev2/sc/under:KEY_MAP $ make helix/rev2/sc/oled:KEY_MAP $ make helix/rev2/sc/oledback:KEY_MAP $ make helix/rev2/sc/oledunder:KEY_MAP * add matrix_slave_scan_user() to helix/rev2/rev2.c, helix/pico/pico.h * Changed 'helix:xulkal' to always use split_common and removed ad hoc code. Added the following line to 'helix/rev2/keymaps/xulkal/rules.mk': SPLIT_KEYBOARD = yes Removed the following ad hoc code from 'users/xulkal/custom_oled.c': #if KEYBOARD_helix_rev2 extern uint8_t is_master; bool is_keyboard_master(void) { return is_master; } #endif * add '#define DIODE_DIRECTION COL2ROW' into helix/{rev2|pico}/config.h This commit does not change the build result. * update helix readme * keyboards/helix/readme.md * keyboards/helix/pico/keymaps/default/readme.md * keyboards/helix/rev2/keymaps/default/readme.md Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
2020-03-10Enable bootmagic lite for CU80 (#8363)marcoSchr
2020-03-09[Keymap] Update personal keymap (#8354)Richard Baptist
2020-03-09Remove NO_UART defines from config.h for V-USB boards (#8351)Ryan
2020-03-09[Keyboard] Add Kira 80 support (#8342)elmo-space
* add kira 80 initial support * Delete config.h * Update keyboards/kira80/keymaps/default/keymap.c * Update keyboards/kira80/readme.md * Update keyboards/kira80/rules.mk * Update keyboards/kira80/usbconfig.h * Update keyboards/kira80/usbconfig.h * Update keyboards/kira80/usbconfig.h * Update keyboards/kira80/usbconfig.h * update readme and fix wrong LED assignment (scrolllock instead of numlock) * Update keyboards/kira80/rules.mk * fix weird double commit * exchange images in readme for smaller versions * Update keyboards/kira80/readme.md * Update keyboards/kira80/readme.md * Update keyboards/kira80/readme.md * Update keyboards/kira80/readme.md * Apply suggestions from code review * Apply suggestions from code review
2020-03-09[Keyboard] Add PRKL30 keyboard (#8319)Erkki Halinen
* Add PRKL30 default keymap * Modify readmes, fix info.json url * added layer pictures to readme.md * edited layer pictures * edited layer pictures * edited layer pictures * edited layout pictures * edited layout pictures * Modify default keymap * Add arrows to Raise layer * Add perkele macro and adjust symbols * Add PRKL macro and modify keymap comments * updated layout pictures * edited layut pictures * Add correct minus keycode * Configure Feather config * Update keyboards/handwired/prkl30/keymaps/default/keymap.c * Update keyboards/handwired/prkl30/feather/rules.mk * Update keyboards/handwired/prkl30/feather/config.h * Update keyboards/handwired/prkl30/feather/config.h * Update keyboards/handwired/prkl30/promicro/config.h * Update keyboards/handwired/prkl30/promicro/rules.mk * Update keyboards/handwired/prkl30/feather/config.h * Update keyboards/handwired/prkl30/feather/config.h * Update keyboards/handwired/prkl30/promicro/config.h * Update keyboards/handwired/prkl30/feather/rules.mk * Update keyboards/handwired/prkl30/keymaps/default/keymap.c * Update keyboards/handwired/prkl30/info.json * Update keyboards/handwired/prkl30/info.json * Update keyboards/handwired/prkl30/keymaps/default/keymap.c * Delete unused config * Apply suggestions from code review Commit code review changes * Remove false comments from rules.mk * Change layout to layout_all * Apply suggestions from code review Co-authored-by: Toni Johansson <toni.r.johansson@gmail.com>
2020-03-09Move splittest I2C (#8346)Nick Brassel
2020-03-08[Keymap] planck layout for kifinnsson (#8324)Christian Gurholt
* [Keymap] kifinnsson keymap for planck Initial commit for kifinnsson keymap * placeholder macros * extend layer * [Keymap] kifinnsson planck keymap updates commented out placeholder SEND_STRING macros * Update keyboards/planck/keymaps/kifinnsson/keymap.c Remove extern keymap_config_t keymap_config; Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/planck/keymaps/kifinnsson/keymap.c Changed KC_MENU to KC_APP Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> * Removing COLEMAK set_single_persistent_default_layer as suggested Co-Authored-By: Drashna Jaelre <drashna@live.com> * updated uinit32()_t to layer_state_t() for update_tri_layer_state as suggested Co-Authored-By: Drashna Jaelre <drashna@live.com> * Removing COLEMAK keycode Co-Authored-By: Drashna Jaelre <drashna@live.com> * Removing COLEMAK keycode in _ADJUST layer * Update keymap.c added switch (keycode) back into process_record_user Co-authored-by: Ki Finnsson <kifinnsson@wgu.edu> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-03-08add via support for dztech 60 and 65 pcb (#8334)moyi4681
* 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
2020-03-08[Keyboard] New Keyboard: handwired/jtallbean/split_65 (#8275)Samuel Li
* New keyboard: split_65 * Updated readme * Update with requested changes * Add writePinLow to prevent flickering * Renamed LAYOUT to LAYOUT_all
2020-03-07fixed #8259 (#8333)yulei
2020-03-07[Keyboard] Handwired Skeeb Keyboard (#8161)su8044
* adding Handwired Skeeb Keyboard * Apply suggestions from fauxpark * Apply more suggestions from fauxpark and small change to layout * Apply more suggestions from noroadsleft and last tap dance
2020-03-07Added VIA keymap for Ramaworks M10-A (#8255)Wilba
* Added VIA keymap for Ramaworks M10-A * change vendor/product in base config.h * #pragma once * Uee LAYOUT() in keymaps
2020-03-07Super 16 Puzzle Game (#8306)swreinehr
* 15/16 game with lights for the super 16 * Updated readme with style * adding comments and initial style to keymap trying to make the code look prettier, need to test by redownloading * Final style revisions before pull request * formatting changes, removed config.h * modified rules.mk, works with changes in PR8314 * formatting no number of spaces is enough for a newline, whoops Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/1upkeyboards/super16/keymaps/15game/keymap.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/1upkeyboards/super16/keymaps/15game/keymap.c Co-Authored-By: Ryan <fauxpark@gmail.com> * Update keyboards/1upkeyboards/super16/keymaps/15game/keymap.c Co-Authored-By: Ryan <fauxpark@gmail.com> Co-authored-by: Sam Reinehr <swreinehr@mines.edu> Co-authored-by: Ryan <fauxpark@gmail.com>
2020-03-07DZ60 keyboard layout tuning and README update/fix (#8325)Chris Alves
* Added custom dz60 keymap * Update readme.md * Updated pictures in README.md * README.md fixes * Updated mouse layout/ added ` key * Changed bkspc key to del in mod * Changed picture * Updated keymap * Removed default dz60 config.h * Updated Readme * Added Devorak Keymap * Re-added Default Config File * Updated Flash Command * Cleaned Up Custom Config File * Added Lock Security Layer * Updated Readme Picture * Fixed Readme * Re-added keyboard picture * Added home and end button * added insert, pgup, pgdn * final commit before pull request * fixing merge * Added custom dz60 keymap * adding lufa? Co-authored-by: chrisae9 <chrisae9@penguin>
2020-03-06[Keyboard] Add VIA support for neuron (#8264)Anthony Leung
* add VIA support for neuron * update neuron vendor and product id * update neuron product id Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-03-06[Keyboard] keebwerk. nano. slider support (#7914)Mikkel Jeppesen
* Initial Keeb.werk nano.slider support * fixed open ifdef * Fixed layout macros * Added LTO * Enabled LTO and dissabled console * Added basic slider example * rate limited adc, and fixed send_string * Made slider courser * new-line after each slider print * Switched slider example mirror the stock behavior using midi * switched division to bit-shifting * Apply suggestions from code review * Update keyboards/keebwerk/nano_slider/keymaps/default/keymap.c * Update keyboards/keebwerk/nano_slider/config.h * Update keyboards/keebwerk/nano_slider/config.h * Applied suggestions from code review * Apply suggestions from code review * Added fauxparks info.json * Reverse midi value direction, move to QMKVID * Update keyboards/keebwerk/nano_slider/config.h * Update keyboards/keebwerk/nano_slider/config.h * Update keyboards/keebwerk/nano_slider/keymaps/default/keymap.c * Apply suggestions from code review * Update keyboards/keebwerk/nano_slider/rules.mk * Update keyboards/keebwerk/nano_slider/nano_slider.h * Update keyboards/keebwerk/nano_slider/readme.md * Defined backlight pin and settings
2020-03-06Remove stub backlight functions from clueboard/66/rev4 (#8303)Joel Challis