Browse Source

adds rgb to preonic

pull/3997/head
Jack Humbert 5 years ago
parent
commit
e917fa2eb4
7 changed files with 38 additions and 17 deletions
  1. +1
    -1
      keyboards/preonic/keymaps/default/keymap.c
  2. +3
    -3
      keyboards/preonic/rev3/chconf.h
  3. +8
    -9
      keyboards/preonic/rev3/config.h
  4. +1
    -1
      keyboards/preonic/rev3/mcuconf.h
  5. +21
    -0
      keyboards/preonic/rev3/rev3.c
  6. +1
    -0
      keyboards/preonic/rev3/rules.mk
  7. +3
    -3
      keyboards/preonic/rules.mk

+ 1
- 1
keyboards/preonic/keymaps/default/keymap.c View File

@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = LAYOUT_preonic_grid( \
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \
_______, RESET, DEBUG, _______, _______, _______, _______, TERM_ON, TERM_OFF,_______, _______, KC_DEL, \
_______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL, \
_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \


+ 3
- 3
keyboards/preonic/rev3/chconf.h View File

@ -41,14 +41,14 @@
* @brief System time counter resolution.
* @note Allowed values are 16 or 32 bits.
*/
#define CH_CFG_ST_RESOLUTION 16
#define CH_CFG_ST_RESOLUTION 32
/**
* @brief System tick frequency.
* @details Frequency of the system timer that drives the system ticks. This
* setting also defines the system tick time unit.
*/
#define CH_CFG_ST_FREQUENCY 10000
#define CH_CFG_ST_FREQUENCY 1000
/**
* @brief Time delta constant for the tick-less mode.
@ -58,7 +58,7 @@
* The value one is not valid, timeouts are rounded up to
* this value.
*/
#define CH_CFG_ST_TIMEDELTA 2
#define CH_CFG_ST_TIMEDELTA 0
/** @} */


+ 8
- 9
keyboards/preonic/rev3/config.h View File

@ -122,14 +122,13 @@
/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
//#define MIDI_TONE_KEYCODE_OCTAVES 1
#define WS2812_LED_N 2
#define RGBLED_NUM WS2812_LED_N
#define WS2812_TIM_N 2
#define WS2812_TIM_CH 2
#define PORT_WS2812 GPIOA
#define PIN_WS2812 1
#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
//#define WS2812_DMA_CHANNEL 7 // DMA channel for TIMx_UP
//#define WS2812_EXTERNAL_PULLUP
#define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 9
#define RGB_DI_PIN A1
#define DRIVER_LED_TOTAL RGBLED_NUM
#define RGB_MATRIX_KEYPRESSES
#endif

+ 1
- 1
keyboards/preonic/rev3/mcuconf.h View File

@ -225,7 +225,7 @@
* ST driver system settings.
*/
#define STM32_ST_IRQ_PRIORITY 8
#define STM32_ST_USE_TIMER 4
#define STM32_ST_USE_TIMER 3
/*
* UART driver system settings.


+ 21
- 0
keyboards/preonic/rev3/rev3.c View File

@ -14,6 +14,27 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "rev3.h"
#include "rgblight.h"
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
/*{row | col << 4}
| {x=0..224, y=0..64}
| | modifier
| | | */
{{2|(5<<4)}, {112, 39}, 0},
{{7|(1<<4)}, {148, 60}, 0},
{{3|(4<<4)}, {206, 53}, 0},
{{4|(4<<4)}, {206, 3}, 0},
{{4|(1<<4)}, {150, 3}, 0},
{{0|(4<<4)}, {74, 3}, 0},
{{0|(1<<4)}, {18, 3}, 0},
{{3|(1<<4)}, {18, 54}, 0},
{{7|(4<<4)}, {77, 60}, 0}
};
uint8_t *o_fb;
void matrix_init_kb(void) {
matrix_init_user();


+ 1
- 0
keyboards/preonic/rev3/rules.mk View File

@ -53,4 +53,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover
CUSTOM_MATRIX = yes # Custom matrix file
AUDIO_ENABLE = yes
RGBLIGHT_ENABLE = no
RGB_MATRIX_ENABLE = WS2812
# SERIAL_LINK_ENABLE = yes

+ 3
- 3
keyboards/preonic/rules.mk View File

@ -38,7 +38,7 @@ F_USB = $(F_CPU)
# Bootloader
# This definition is optional, and if your keyboard supports multiple bootloaders of
# different sizes, comment this out, and the correct address will be loaded
# different sizes, comment this out, and the correct address will be loaded
# automatically (+60). See bootloader.mk for all options.
ifeq ($(strip $(KEYBOARD)), preonic/rev1)
BOOTLOADER = atmel-dfu
@ -51,7 +51,7 @@ endif
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options
# change to "no" to disable the options, or define them in the Makefile in
# change to "no" to disable the options, or define them in the Makefile in
# the appropriate keymap folder that will get included automatically
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
@ -73,4 +73,4 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
LAYOUTS = ortho_5x12
DEFAULT_FOLDER = preonic/rev2
DEFAULT_FOLDER = preonic/rev2

Loading…
Cancel
Save