diff options
author | Michael Terhar <michael.terhar@pararray.com> | 2017-08-30 11:50:31 -0400 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2017-08-30 11:50:31 -0400 |
commit | a4316ba486ae25eae93174f5d7e4952811680601 (patch) | |
tree | cfbb93193d0b506328d7697a04a870ff147343dd /keyboards/mitosis/keymaps/mjt/config.h | |
parent | da83f04a30903a98b9a8dbe29c2d6cef4f9da3a7 (diff) | |
download | firmware-a4316ba486ae25eae93174f5d7e4952811680601.tar.gz firmware-a4316ba486ae25eae93174f5d7e4952811680601.tar.bz2 firmware-a4316ba486ae25eae93174f5d7e4952811680601.zip |
Fixed mitosis-mjt audio (#1653)
* copied mjt keymaps from archive
* All mjt boards now compile
* fixed jd45-mjt breathing
* Updates to fix SpaceFN but not tested yet.
* Still missing either spacebar or an adjacent keypress.
* Debugging rigged up for use with hid_listen.
* Reverted the default keymap to use tap_layer_key rather than custom. Moved custom approach to keymap_debug.c
* Fixed the lower-left side of the keymap, which needed more spacers due to the matrix being directly put into the array rather than using the keymap function.
* Cleaned up JD45 keymap that uses tapkey.
* Redid minivan keymap with numsym rather than raise/lower.
Untested.
* Created my MJT keymap for HHKB
Enabled dynamic macros and moved
somoe of the shortcuts around.
* Minor keymap fixes to make them compile without errors.
* Added home/end to right arrow cluster on DYN layer.
* Added more keys to fn and dyn layers.
* It wasn't using my custom layer last time somehow...? Now it will.
* Compiled and installed at end of day on 8/23
* Moved macros to FKEY layer because Adjust was too hard to get into and out of without some sort of feedback.
* Fixed volume controls... were reversed and disabled.
* Added F13-F15 back to fkeys layer in Minivan
* Created new Planck Keymap that uses the NumSym and FKeys layer approach like the Minivan.
* Removed DYN layer.
* Fixed diagram in planck numsym.
* Cleanup for pull request.
* Roadkit flip phone warning.
* Replaced PLAY_NOTES_ARRAY to PLAY_SONG
* reset the submodules
* checked out specific commits for submodules
* Removed debugging from JD45 shared config.h
* Moved custom rules.mk to apropriate keymap
Reset the shared rules.mk file.
* Trailing return issue in rules.mk
Gotta make for a smooth pull request :-)
* Mitosis music troubleshooting
Also updated the song playing function.
Does not work currently.
* Fixed mitosis audio
* Put mitosis/rules.mk back to QMK master
Diffstat (limited to 'keyboards/mitosis/keymaps/mjt/config.h')
-rw-r--r-- | keyboards/mitosis/keymaps/mjt/config.h | 78 |
1 files changed, 14 insertions, 64 deletions
diff --git a/keyboards/mitosis/keymaps/mjt/config.h b/keyboards/mitosis/keymaps/mjt/config.h index 2209a9e0d..71adc5a2d 100644 --- a/keyboards/mitosis/keymaps/mjt/config.h +++ b/keyboards/mitosis/keymaps/mjt/config.h @@ -1,74 +1,24 @@ -#ifndef CONFIG_H -#define CONFIG_H -#include "config_common.h" +#ifndef CONFIG_USER_H +#define CONFIG_USER_H -/* USB Device descriptor parameter */ +#include "../../config.h" -#define VENDOR_ID 0xFEEB -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MJT -#define PRODUCT Mitosis -#define DESCRIPTION q.m.k. keyboard firmware for Mitosis +#ifdef AUDIO_ENABLE + #define STARTUP_SONG SONG(PLANCK_SOUND) + // #define STARTUP_SONG SONG(NO_SOUND) -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 10 + #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \ + SONG(COLEMAK_SOUND), \ + SONG(DVORAK_SOUND) \ + } +#endif + +#define AUDIO_VOICES +#define C6_AUDIO // fix iPhone power adapter issue #define USB_MAX_POWER_CONSUMPTION 50 -// #define CATERINA_BOOTLOADER - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -//#define BACKLIGHT_LEVELS 3 - -#define ONESHOT_TIMEOUT 500 - - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -#define PREVENT_STUCK_MODIFIERS - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION -//UART settings for communication with the RF microcontroller -#define SERIAL_UART_BAUD 1000000 -#define SERIAL_UART_DATA UDR1 -#define SERIAL_UART_UBRR (F_CPU / (16UL * SERIAL_UART_BAUD) - 1) -#define SERIAL_UART_TXD_READY (UCSR1A & _BV(UDRE1)) -#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1)) -#define SERIAL_UART_INIT() do { \ - /* baud rate */ \ - UBRR1L = SERIAL_UART_UBRR; \ - /* baud rate */ \ - UBRR1H = SERIAL_UART_UBRR >> 8; \ - /* enable TX and RX */ \ - UCSR1B = _BV(TXEN1) | _BV(RXEN1); \ - /* 8-bit data */ \ - UCSR1C = _BV(UCSZ11) | _BV(UCSZ10); \ - } while(0) #endif |