mirror of
https://github.com/qmk/qmk_firmware
synced 2024-11-20 12:15:06 +00:00
7e67bd791b
* add I2C_slave_buffer_t to quantum/split_common/transport.c Improvements to ease the maintenance of the I2C slave buffer layout. And this commit does not change the compilation results. * add temporary pdhelix(Patched Helix) code * temporary cherry-pick from #5020 add new version(#5020) quantum/rgblight.[ch], quantum/rgblight_modes.h * add post_config.h support to build_keyboard.mk * add quantum/rgblight_post_config.h, quantum/split_common/post_config.h Add quantum/rgblight_post_config.h and quantum/split_common/post_config.h using POST_CONFIG_H variable of build_keyboard.mk. quantum/rgblight_post_config.h additionally defines RGBLIGHT_SPLIT if RGBLED_SPIT is defined. quantum/split_common/post_config.h defines RGBLIGHT_SPLIT additionally when master-slave communication is I2C. * Change split_common's transport.c I2C to use the synchronization feature of rgblight.c * Change split_common's transport.c serial to use the synchronization feature of rgblight.c * test RGBLIGHT_SPLIT on keyboards/handwired/pdhelix * Test End Revert "test RGBLIGHT_SPLIT on keyboards/handwired/pdhelix" This reverts commit80118a6bbd
. [x] make RGBLIGHT_TEST=1 handwired/pdhelix/i2c:default [x] make RGBLIGHT_TEST=2 handwired/pdhelix/i2c:default (same RGBLIGHT_TEST=3) [x] make RGBLIGHT_TEST=3 handwired/pdhelix/i2c:default [x] make RGBLIGHT_TEST=1 handwired/pdhelix/pd2:default [x] make RGBLIGHT_TEST=2 handwired/pdhelix/pd2:default [x] make RGBLIGHT_TEST=3 handwired/pdhelix/pd2:default [x] make RGBLIGHT_TEST=1 handwired/pdhelix/pd2_2oled:default [x] make RGBLIGHT_TEST=2 handwired/pdhelix/pd2_2oled:default [x] make RGBLIGHT_TEST=3 handwired/pdhelix/pd2_2oled:default * Test End, Revert "temporary cherry-pick from #5020" This reverts commitd35069f68b
. * Test End, Revert "add temporary pdhelix(Patched Helix) code" This reverts commitaebddfc1a8
. * temporarily cherry-pick from #5020 to see if it passes the travis-ci test. add new version(#5020) quantum/rgblight.[ch], quantum/rgblight_modes.h * Passed the travis-ci test. Revert "temporarily cherry-pick from #5020 to see if it passes the travis-ci test." This reverts commit647c0a9755
. * update docs/config_options.md * update split_common/transport.c, improves maintainability of serial transaction IDs. No change in build result. * temporary cherry-pick from #5020 * fix build fail keebio/iris/rev3:default * fix build fail lets_split_eh/eh:default * Revert "temporary cherry-pick from #5020" This reverts commitbe48ca1b45
. * temporary cherry-pick from #5020 (0.6.336) * Revert "temporary cherry-pick from #5020 (0.6.336)" This reverts commit978d26a8b3
. * temporary cherry-pick from #5020 (0.6.336)
252 lines
6.8 KiB
C
252 lines
6.8 KiB
C
#include <string.h>
|
|
#include <stddef.h>
|
|
|
|
#include "config.h"
|
|
#include "matrix.h"
|
|
#include "quantum.h"
|
|
|
|
#define ROWS_PER_HAND (MATRIX_ROWS / 2)
|
|
|
|
#ifdef RGBLIGHT_ENABLE
|
|
# include "rgblight.h"
|
|
#endif
|
|
|
|
#ifdef BACKLIGHT_ENABLE
|
|
# include "backlight.h"
|
|
extern backlight_config_t backlight_config;
|
|
#endif
|
|
|
|
#ifdef ENCODER_ENABLE
|
|
# include "encoder.h"
|
|
#endif
|
|
|
|
#if defined(USE_I2C) || defined(EH)
|
|
|
|
# include "i2c_master.h"
|
|
# include "i2c_slave.h"
|
|
|
|
typedef struct _I2C_slave_buffer_t {
|
|
matrix_row_t smatrix[ROWS_PER_HAND];
|
|
uint8_t backlight_level;
|
|
#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
|
|
rgblight_syncinfo_t rgblight_sync;
|
|
#endif
|
|
#ifdef ENCODER_ENABLE
|
|
uint8_t encoder_state[NUMBER_OF_ENCODERS];
|
|
#endif
|
|
} I2C_slave_buffer_t;
|
|
|
|
static I2C_slave_buffer_t * const i2c_buffer = (I2C_slave_buffer_t *)i2c_slave_reg;
|
|
|
|
# define I2C_BACKLIGHT_START offsetof(I2C_slave_buffer_t, backlight_level)
|
|
# define I2C_RGB_START offsetof(I2C_slave_buffer_t, rgblight_sync)
|
|
# define I2C_KEYMAP_START offsetof(I2C_slave_buffer_t, smatrix)
|
|
# define I2C_ENCODER_START offsetof(I2C_slave_buffer_t, encoder_state)
|
|
|
|
# define TIMEOUT 100
|
|
|
|
# ifndef SLAVE_I2C_ADDRESS
|
|
# define SLAVE_I2C_ADDRESS 0x32
|
|
# endif
|
|
|
|
// Get rows from other half over i2c
|
|
bool transport_master(matrix_row_t matrix[]) {
|
|
i2c_readReg(SLAVE_I2C_ADDRESS, I2C_KEYMAP_START, (void *)matrix, sizeof(i2c_buffer->smatrix), TIMEOUT);
|
|
|
|
// write backlight info
|
|
# ifdef BACKLIGHT_ENABLE
|
|
uint8_t level = get_backlight_level();
|
|
if (level != i2c_buffer->backlight_level) {
|
|
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_BACKLIGHT_START, (void *)&level, sizeof(level), TIMEOUT) >= 0) {
|
|
i2c_buffer->backlight_level = level;
|
|
}
|
|
}
|
|
# endif
|
|
|
|
# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
|
|
if (rgblight_get_change_flags()) {
|
|
rgblight_syncinfo_t rgblight_sync;
|
|
rgblight_get_syncinfo(&rgblight_sync);
|
|
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_RGB_START,
|
|
(void *)&rgblight_sync, sizeof(rgblight_sync), TIMEOUT) >= 0) {
|
|
rgblight_clear_change_flags();
|
|
}
|
|
}
|
|
# endif
|
|
|
|
# ifdef ENCODER_ENABLE
|
|
i2c_readReg(SLAVE_I2C_ADDRESS, I2C_ENCODER_START, (void *)i2c_buffer->encoder_state, sizeof(I2C_slave_buffer_t.encoder_state), TIMEOUT);
|
|
encoder_update_raw(i2c_buffer->encoder_state);
|
|
# endif
|
|
|
|
return true;
|
|
}
|
|
|
|
void transport_slave(matrix_row_t matrix[]) {
|
|
// Copy matrix to I2C buffer
|
|
memcpy((void*)i2c_buffer->smatrix, (void *)matrix, sizeof(i2c_buffer->smatrix));
|
|
|
|
// Read Backlight Info
|
|
# ifdef BACKLIGHT_ENABLE
|
|
backlight_set(i2c_buffer->backlight_level);
|
|
# endif
|
|
|
|
# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
|
|
// Update the RGB with the new data
|
|
if (i2c_buffer->rgblight_sync.status.change_flags != 0) {
|
|
rgblight_update_sync(&i2c_buffer->rgblight_sync, false);
|
|
i2c_buffer->rgblight_sync.status.change_flags = 0;
|
|
}
|
|
# endif
|
|
|
|
# ifdef ENCODER_ENABLE
|
|
encoder_state_raw(i2c_buffer->encoder_state);
|
|
# endif
|
|
}
|
|
|
|
void transport_master_init(void) { i2c_init(); }
|
|
|
|
void transport_slave_init(void) { i2c_slave_init(SLAVE_I2C_ADDRESS); }
|
|
|
|
#else // USE_SERIAL
|
|
|
|
# include "serial.h"
|
|
|
|
typedef struct _Serial_s2m_buffer_t {
|
|
// TODO: if MATRIX_COLS > 8 change to uint8_t packed_matrix[] for pack/unpack
|
|
matrix_row_t smatrix[ROWS_PER_HAND];
|
|
|
|
# ifdef ENCODER_ENABLE
|
|
uint8_t encoder_state[NUMBER_OF_ENCODERS];
|
|
# endif
|
|
|
|
} Serial_s2m_buffer_t;
|
|
|
|
typedef struct _Serial_m2s_buffer_t {
|
|
# ifdef BACKLIGHT_ENABLE
|
|
uint8_t backlight_level;
|
|
# endif
|
|
} Serial_m2s_buffer_t;
|
|
|
|
#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
|
|
// When MCUs on both sides drive their respective RGB LED chains,
|
|
// it is necessary to synchronize, so it is necessary to communicate RGB
|
|
// information. In that case, define RGBLIGHT_SPLIT with info on the number
|
|
// of LEDs on each half.
|
|
//
|
|
// Otherwise, if the master side MCU drives both sides RGB LED chains,
|
|
// there is no need to communicate.
|
|
|
|
typedef struct _Serial_rgblight_t {
|
|
rgblight_syncinfo_t rgblight_sync;
|
|
} Serial_rgblight_t;
|
|
|
|
volatile Serial_rgblight_t serial_rgblight = {};
|
|
uint8_t volatile status_rgblight = 0;
|
|
#endif
|
|
|
|
volatile Serial_s2m_buffer_t serial_s2m_buffer = {};
|
|
volatile Serial_m2s_buffer_t serial_m2s_buffer = {};
|
|
uint8_t volatile status0 = 0;
|
|
|
|
enum serial_transaction_id {
|
|
GET_SLAVE_MATRIX = 0,
|
|
#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
|
|
PUT_RGBLIGHT,
|
|
#endif
|
|
};
|
|
|
|
SSTD_t transactions[] = {
|
|
[GET_SLAVE_MATRIX] = {
|
|
(uint8_t *)&status0,
|
|
sizeof(serial_m2s_buffer),
|
|
(uint8_t *)&serial_m2s_buffer,
|
|
sizeof(serial_s2m_buffer),
|
|
(uint8_t *)&serial_s2m_buffer,
|
|
},
|
|
#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
|
|
[PUT_RGBLIGHT] = {
|
|
(uint8_t *)&status_rgblight,
|
|
sizeof(serial_rgblight),
|
|
(uint8_t *)&serial_rgblight,
|
|
0, NULL // no slave to master transfer
|
|
},
|
|
#endif
|
|
};
|
|
|
|
void transport_master_init(void) { soft_serial_initiator_init(transactions, TID_LIMIT(transactions)); }
|
|
|
|
void transport_slave_init(void) { soft_serial_target_init(transactions, TID_LIMIT(transactions)); }
|
|
|
|
#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
|
|
|
|
// rgblight synchronization information communication.
|
|
|
|
void transport_rgblight_master(void) {
|
|
if (rgblight_get_change_flags()) {
|
|
rgblight_get_syncinfo((rgblight_syncinfo_t *)&serial_rgblight.rgblight_sync);
|
|
if (soft_serial_transaction(PUT_RGBLIGHT) == TRANSACTION_END) {
|
|
rgblight_clear_change_flags();
|
|
}
|
|
}
|
|
}
|
|
|
|
void transport_rgblight_slave(void) {
|
|
if (status_rgblight == TRANSACTION_ACCEPTED) {
|
|
rgblight_update_sync((rgblight_syncinfo_t *)&serial_rgblight.rgblight_sync,
|
|
false);
|
|
status_rgblight = TRANSACTION_END;
|
|
}
|
|
}
|
|
|
|
#else
|
|
#define transport_rgblight_master()
|
|
#define transport_rgblight_slave()
|
|
#endif
|
|
|
|
bool transport_master(matrix_row_t matrix[]) {
|
|
#ifndef SERIAL_USE_MULTI_TRANSACTION
|
|
if (soft_serial_transaction() != TRANSACTION_END) {
|
|
return false;
|
|
}
|
|
#else
|
|
transport_rgblight_master();
|
|
if (soft_serial_transaction(GET_SLAVE_MATRIX) != TRANSACTION_END) {
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
// TODO: if MATRIX_COLS > 8 change to unpack()
|
|
for (int i = 0; i < ROWS_PER_HAND; ++i) {
|
|
matrix[i] = serial_s2m_buffer.smatrix[i];
|
|
}
|
|
|
|
# ifdef BACKLIGHT_ENABLE
|
|
// Write backlight level for slave to read
|
|
serial_m2s_buffer.backlight_level = backlight_config.enable ? backlight_config.level : 0;
|
|
# endif
|
|
|
|
# ifdef ENCODER_ENABLE
|
|
encoder_update_raw((uint8_t *)serial_s2m_buffer.encoder_state);
|
|
# endif
|
|
|
|
return true;
|
|
}
|
|
|
|
void transport_slave(matrix_row_t matrix[]) {
|
|
transport_rgblight_slave();
|
|
// TODO: if MATRIX_COLS > 8 change to pack()
|
|
for (int i = 0; i < ROWS_PER_HAND; ++i) {
|
|
serial_s2m_buffer.smatrix[i] = matrix[i];
|
|
}
|
|
# ifdef BACKLIGHT_ENABLE
|
|
backlight_set(serial_m2s_buffer.backlight_level);
|
|
# endif
|
|
|
|
# ifdef ENCODER_ENABLE
|
|
encoder_state_raw((uint8_t *)serial_s2m_buffer.encoder_state);
|
|
# endif
|
|
|
|
}
|
|
|
|
#endif
|