gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-17 13:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

rev2 working

Browse Source
This commit is contained in:
Jack Humbert 2018-06-01 14:33:13 -04:00
parent 874f5a5c07
commit 274283420d
11 changed files with 88 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/arm/is31fl3731.c
View File

@ -82,7 +82,8 @@ void IS31FL3731_write_register( uint8_t addr, uint8_t reg, uint8_t data )
g_twi_transfer_buffer[1] = data; g_twi_transfer_buffer[1] = data;
//Transmit data until succesful //Transmit data until succesful
while(twi2c_transmit(addr << 1, g_twi_transfer_buffer,2) != 0); //while(twi2c_transmit(addr << 1, g_twi_transfer_buffer,2) != 0);
twi2c_transmit(addr << 1, g_twi_transfer_buffer,2);
} }
void IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer ) void IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer )
@ -106,7 +107,8 @@ void IS31FL3731_write_pwm_buffer( uint8_t addr, uint8_t *pwm_buffer )
} }
//Transmit buffer until succesful //Transmit buffer until succesful
while(twi2c_transmit(addr << 1, g_twi_transfer_buffer,17) != 0); //while(twi2c_transmit(addr << 1, g_twi_transfer_buffer,17) != 0);
twi2c_transmit(addr << 1, g_twi_transfer_buffer,17);
} }
} }

24
drivers/arm/twi2c.c
View File

@ -46,13 +46,12 @@ I2CSlaveMsgCB twi2c_slave_message_process, catchError, clearAfterSend;
static uint8_t twi2c_address; static uint8_t twi2c_address;
static const I2CConfig I2CConfig = { static const I2CConfig i2cconfig = {
STM32_TIMINGR_PRESC(15U) | STM32_TIMINGR_PRESC(15U) |
STM32_TIMINGR_SCLDEL(4U) | STM32_TIMINGR_SDADEL(2U) | STM32_TIMINGR_SCLDEL(4U) | STM32_TIMINGR_SDADEL(2U) |
STM32_TIMINGR_SCLH(15U) | STM32_TIMINGR_SCLL(21U), STM32_TIMINGR_SCLH(15U) | STM32_TIMINGR_SCLL(21U),
0, 0,
0, 0
NULL
}; };
char initialReplyBody[50] = "Initial reply"; // 'Status' response if read without preceding write char initialReplyBody[50] = "Initial reply"; // 'Status' response if read without preceding write
@ -182,7 +181,7 @@ void twi2c_slave_init(void) {
twi2c_init(); twi2c_init();
i2cStart(&I2C_DRIVER, &I2CConfig); i2cStart(&I2C_DRIVER, &i2cconfig);
#if HAL_USE_I2C_SLAVE #if HAL_USE_I2C_SLAVE
I2C_DRIVER.slaveTimeout = MS2ST(100); // Time for complete message I2C_DRIVER.slaveTimeout = MS2ST(100); // Time for complete message
#endif #endif
@ -213,15 +212,16 @@ void twi2c_slave_task(void) {
uint8_t twi2c_start(uint8_t address) { uint8_t twi2c_start(uint8_t address) {
twi2c_address = address; twi2c_address = address;
i2cStart(&I2C_DRIVER, &I2CConfig); i2cStart(&I2C_DRIVER, &i2cconfig);
return 0;
} }
void twi2c_init(void) { void twi2c_init(void) {
palSetGroupMode(GPIOB,8,9, PAL_MODE_INPUT); // Try releasing special pins for a short time palSetGroupMode(GPIOB,6,7, PAL_MODE_INPUT); // Try releasing special pins for a short time
chThdSleepMilliseconds(10); chThdSleepMilliseconds(10);
palSetPadMode(GPIOB, 9, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP); palSetPadMode(GPIOB, 6, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP);
palSetPadMode(GPIOB, 8, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP); palSetPadMode(GPIOB, 7, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP);
// try high drive (from kiibohd) // try high drive (from kiibohd)
// I2C_DRIVER.i2c->C2 |= I2Cx_C2_HDRS; // I2C_DRIVER.i2c->C2 |= I2Cx_C2_HDRS;
@ -229,14 +229,12 @@ void twi2c_init(void) {
// I2C_DRIVER.i2c->FLT = 4; // I2C_DRIVER.i2c->FLT = 4;
} }
uint8_t buffer[1] = {0};
uint8_t twi2c_write(uint8_t data) { uint8_t twi2c_write(uint8_t data) {
return i2cMasterTransmitTimeout(&I2C_DRIVER, twi2c_address/2, &data, 1, buffer, 1, MS2ST(100)); return i2cMasterTransmitTimeout(&I2C_DRIVER, twi2c_address/2, &data, 1, 0, 0, MS2ST(100));
} }
uint8_t twi2c_transmit(uint8_t address, uint8_t* data, uint16_t length) { uint8_t twi2c_transmit(uint8_t address, uint8_t* data, uint16_t length) {
twi2c_address = address; twi2c_address = address;
i2cStart(&I2C_DRIVER, &I2CConfig); i2cStart(&I2C_DRIVER, &i2cconfig);
return i2cMasterTransmitTimeout(&I2C_DRIVER, twi2c_address/2, data, length, buffer, 1, MS2ST(100)); return i2cMasterTransmitTimeout(&I2C_DRIVER, twi2c_address/2, data, length, 0, 0, MS2ST(100));
} }

2
keyboards/planck/light/rev2/chconf.h
View File

@ -41,7 +41,7 @@
* @brief System time counter resolution. * @brief System time counter resolution.
* @note Allowed values are 16 or 32 bits. * @note Allowed values are 16 or 32 bits.
*/ */
#define CH_CFG_ST_RESOLUTION 16 #define CH_CFG_ST_RESOLUTION 32
/** /**
* @brief System tick frequency. * @brief System tick frequency.

10
keyboards/planck/light/rev2/config.h
View File

@ -19,13 +19,17 @@
#define REV6_CONFIG_H #define REV6_CONFIG_H
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
#define DEVICE_VER 0x0006 #undef PRODUCT
#define PRODUCT Planck Light
#undef PRODUCT_ID
#define PRODUCT_ID 0x6065
#define DEVICE_VER 0x0002
#undef MATRIX_ROWS #undef MATRIX_ROWS
#undef MATRIX_COLS #undef MATRIX_COLS
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 8 #define MATRIX_ROWS 4
#define MATRIX_COLS 6 #define MATRIX_COLS 12
/* /*
* Keyboard Matrix Assignments * Keyboard Matrix Assignments

2
keyboards/planck/light/rev2/halconf.h
View File

@ -111,7 +111,7 @@
* @brief Enables the PWM subsystem. * @brief Enables the PWM subsystem.
*/ */
#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
#define HAL_USE_PWM TRUE #define HAL_USE_PWM FALSE
#endif #endif
/** /**

88
keyboards/planck/light/rev2/matrix.c
View File

@ -12,8 +12,8 @@
#include <string.h> #include <string.h>
/* /*
* col: { B11, B10, B2, B1, A7, B0 } * col: { A10, B2, A15, A0, A1, A2, B0, B1, C13, A6, A7, A3 }
* row: { A10, A9, A8, B15, C13, C14, C15, A2 } * row: { B5, B10, A9, A8 }
*/ */
/* matrix state(1:on, 0:off) */ /* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS]; static matrix_row_t matrix[MATRIX_ROWS];
@ -45,12 +45,6 @@ void matrix_init(void) {
printf("matrix init\n"); printf("matrix init\n");
//debug_matrix = true; //debug_matrix = true;
// dip switch setup
palSetPadMode(GPIOB, 14, PAL_MODE_INPUT_PULLUP);
palSetPadMode(GPIOA, 15, PAL_MODE_INPUT_PULLUP);
palSetPadMode(GPIOA, 10, PAL_MODE_INPUT_PULLUP);
palSetPadMode(GPIOB, 9, PAL_MODE_INPUT_PULLUP);
// encoder setup // encoder setup
palSetPadMode(GPIOB, 12, PAL_MODE_INPUT_PULLUP); palSetPadMode(GPIOB, 12, PAL_MODE_INPUT_PULLUP);
palSetPadMode(GPIOB, 13, PAL_MODE_INPUT_PULLUP); palSetPadMode(GPIOB, 13, PAL_MODE_INPUT_PULLUP);
@ -58,21 +52,23 @@ void matrix_init(void) {
encoder_state = (palReadPad(GPIOB, 12) << 0) | (palReadPad(GPIOB, 13) << 1); encoder_state = (palReadPad(GPIOB, 12) << 0) | (palReadPad(GPIOB, 13) << 1);
// actual matrix setup // actual matrix setup
palSetPadMode(GPIOB, 11, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOA, 10, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 10, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOA, 15, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOA, 0, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOA, 1, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOA, 2, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 0, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOC, 13, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOA, 6, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOA, 7, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOA, 7, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 0, PAL_MODE_OUTPUT_PUSHPULL); palSetPadMode(GPIOA, 3, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOA, 10, PAL_MODE_INPUT_PULLDOWN); palSetPadMode(GPIOB, 5, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOB, 10, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOA, 9, PAL_MODE_INPUT_PULLDOWN); palSetPadMode(GPIOA, 9, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOA, 8, PAL_MODE_INPUT_PULLDOWN); palSetPadMode(GPIOA, 8, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOB, 15, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOC, 13, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOC, 14, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOC, 15, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOA, 2, PAL_MODE_INPUT_PULLDOWN);
memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t)); memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
@ -110,39 +106,47 @@ uint8_t matrix_scan(void) {
for (int col = 0; col < MATRIX_COLS; col++) { for (int col = 0; col < MATRIX_COLS; col++) {
matrix_row_t data = 0; matrix_row_t data = 0;
// strobe col { B11, B10, B2, B1, A7, B0 } // strobe col { A10, B2, A15, A0, A1, A2, B0, B1, C13, A6, A7, A3 }
switch (col) { switch (col) {
case 0: palSetPad(GPIOB, 11); break; case 0: palSetPad(GPIOA, 10); break;
case 1: palSetPad(GPIOB, 10); break; case 1: palSetPad(GPIOB, 2); break;
case 2: palSetPad(GPIOB, 2); break; case 2: palSetPad(GPIOA, 15); break;
case 3: palSetPad(GPIOB, 1); break; case 3: palSetPad(GPIOA, 0); break;
case 4: palSetPad(GPIOA, 7); break; case 4: palSetPad(GPIOA, 1); break;
case 5: palSetPad(GPIOB, 0); break; case 5: palSetPad(GPIOA, 2); break;
case 6: palSetPad(GPIOB, 0); break;
case 7: palSetPad(GPIOB, 1); break;
case 8: palSetPad(GPIOC, 13); break;
case 9: palSetPad(GPIOA, 6); break;
case 10: palSetPad(GPIOA, 7); break;
case 11: palSetPad(GPIOA, 3); break;
} }
// need wait to settle pin state // need wait to settle pin state
wait_us(20); wait_us(20);
// read row data { A10, A9, A8, B15, C13, C14, C15, A2 } // read row data { B5, B10, A9, A8 }
data = ( data = (
(palReadPad(GPIOA, 10) << 0 ) | (palReadPad(GPIOB, 5) << 0 ) |
(palReadPad(GPIOA, 9) << 1 ) | (palReadPad(GPIOB, 10) << 1 ) |
(palReadPad(GPIOA, 8) << 2 ) | (palReadPad(GPIOA, 9) << 2 ) |
(palReadPad(GPIOB, 15) << 3 ) | (palReadPad(GPIOA, 8) << 3 )
(palReadPad(GPIOC, 13) << 4 ) |
(palReadPad(GPIOC, 14) << 5 ) |
(palReadPad(GPIOC, 15) << 6 ) |
(palReadPad(GPIOA, 2) << 7 )
); );
// unstrobe col { B11, B10, B2, B1, A7, B0 } // unstrobe col { B11, B10, B2, B1, A7, B0 }
switch (col) { switch (col) {
case 0: palClearPad(GPIOB, 11); break; case 0: palClearPad(GPIOA, 10); break;
case 1: palClearPad(GPIOB, 10); break; case 1: palClearPad(GPIOB, 2); break;
case 2: palClearPad(GPIOB, 2); break; case 2: palClearPad(GPIOA, 15); break;
case 3: palClearPad(GPIOB, 1); break; case 3: palClearPad(GPIOA, 0); break;
case 4: palClearPad(GPIOA, 7); break; case 4: palClearPad(GPIOA, 1); break;
case 5: palClearPad(GPIOB, 0); break; case 5: palClearPad(GPIOA, 2); break;
case 6: palClearPad(GPIOB, 0); break;
case 7: palClearPad(GPIOB, 1); break;
case 8: palClearPad(GPIOC, 13); break;
case 9: palClearPad(GPIOA, 6); break;
case 10: palClearPad(GPIOA, 7); break;
case 11: palClearPad(GPIOA, 3); break;
} }
if (matrix_debouncing[col] != data) { if (matrix_debouncing[col] != data) {

6
keyboards/planck/light/rev2/mcuconf.h
View File

@ -183,8 +183,8 @@
*/ */
#define STM32_PWM_USE_ADVANCED FALSE #define STM32_PWM_USE_ADVANCED FALSE
#define STM32_PWM_USE_TIM1 FALSE #define STM32_PWM_USE_TIM1 FALSE
#define STM32_PWM_USE_TIM2 TRUE #define STM32_PWM_USE_TIM2 FALSE
#define STM32_PWM_USE_TIM3 TRUE #define STM32_PWM_USE_TIM3 FALSE
#define STM32_PWM_USE_TIM4 FALSE #define STM32_PWM_USE_TIM4 FALSE
#define STM32_PWM_USE_TIM8 FALSE #define STM32_PWM_USE_TIM8 FALSE
#define STM32_PWM_TIM1_IRQ_PRIORITY 7 #define STM32_PWM_TIM1_IRQ_PRIORITY 7
@ -225,7 +225,7 @@
* ST driver system settings. * ST driver system settings.
*/ */
#define STM32_ST_IRQ_PRIORITY 8 #define STM32_ST_IRQ_PRIORITY 8
#define STM32_ST_USE_TIMER 4 #define STM32_ST_USE_TIMER 2
/* /*
* UART driver system settings. * UART driver system settings.

8
keyboards/planck/light/rev2/rev2.c
View File

@ -14,11 +14,3 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "rev2.h" #include "rev2.h"
void matrix_init_kb(void) {
matrix_init_user();
}
void matrix_scan_kb(void) {
matrix_scan_user();
}

2
keyboards/planck/planck.h
View File

@ -3,7 +3,7 @@
#include "quantum.h" #include "quantum.h"
#ifdef __AVR__ #if defined(__AVR__) || defined (KEYBOARD_planck_light_rev2)
#define LAYOUT_planck_mit( \ #define LAYOUT_planck_mit( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \

7
quantum/quantum.h
View File

@ -27,7 +27,7 @@
#ifdef BACKLIGHT_ENABLE #ifdef BACKLIGHT_ENABLE
#include "backlight.h" #include "backlight.h"
#endif #endif
#if !defined(RGBLIGHT_ENABLE) && !defined(RGB_MATRIX_ENABLE) #if !defined(RGBLIGHT_ENABLE) && !defined(RGB_MATRIX_ENABLE)
#include "rgb.h" #include "rgb.h"
#endif #endif
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
@ -121,6 +121,11 @@ extern uint32_t default_layer_state;
#include "process_terminal_nop.h" #include "process_terminal_nop.h"
#endif #endif
#ifndef MIN
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
#endif
#define STRINGIZE(z) #z #define STRINGIZE(z) #z
#define ADD_SLASH_X(y) STRINGIZE(\x ## y) #define ADD_SLASH_X(y) STRINGIZE(\x ## y)
#define SYMBOL_STR(x) ADD_SLASH_X(x) #define SYMBOL_STR(x) ADD_SLASH_X(x)

16
quantum/rgb_matrix.c
View File

@ -17,14 +17,14 @@
#include "rgb_matrix.h" #include "rgb_matrix.h"
#include <avr/io.h> //#include <avr/io.h>
#include "i2c_master.h" #include "twi2c.h"
#include <util/delay.h> #include "wait.h"
#include <avr/interrupt.h> //#include <avr/interrupt.h>
#include "progmem.h" #include "progmem.h"
#include "config.h" #include "config.h"
#include "eeprom.h" #include "eeprom.h"
#include "lufa.h" //#include "lufa.h"
#include <math.h> #include <math.h>
rgb_config_t rgb_matrix_config; rgb_config_t rgb_matrix_config;
@ -217,7 +217,7 @@ void rgb_matrix_single_LED_test(void) {
} }
// All LEDs off // All LEDs off
void rgb_matrix_all_off(void) { void rgb_matrix_all_off(void) {
rgb_matrix_set_color_all( 0, 0, 0 ); rgb_matrix_set_color_all( 0, 0, 0 );
} }
@ -243,7 +243,7 @@ void rgb_matrix_solid_reactive(void) {
// alphas = color1, mods = color2 // alphas = color1, mods = color2
void rgb_matrix_alphas_mods(void) { void rgb_matrix_alphas_mods(void) {
RGB rgb1 = hsv_to_rgb( (HSV){ .h = rgb_matrix_config.hue, .s = rgb_matrix_config.sat, .v = rgb_matrix_config.val } ); RGB rgb1 = hsv_to_rgb( (HSV){ .h = rgb_matrix_config.hue, .s = rgb_matrix_config.sat, .v = rgb_matrix_config.val } );
RGB rgb2 = hsv_to_rgb( (HSV){ .h = (rgb_matrix_config.hue + 180) % 360, .s = rgb_matrix_config.sat, .v = rgb_matrix_config.val } ); RGB rgb2 = hsv_to_rgb( (HSV){ .h = (rgb_matrix_config.hue + 180) % 360, .s = rgb_matrix_config.sat, .v = rgb_matrix_config.val } );
@ -723,7 +723,7 @@ void rgb_matrix_indicators_user(void) {}
void rgb_matrix_init_drivers(void) { void rgb_matrix_init_drivers(void) {
// Initialize TWI // Initialize TWI
i2c_init(); twi2c_init();
IS31FL3731_init( DRIVER_ADDR_1 ); IS31FL3731_init( DRIVER_ADDR_1 );
IS31FL3731_init( DRIVER_ADDR_2 ); IS31FL3731_init( DRIVER_ADDR_2 );