diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-05-29 13:53:10 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-05-29 13:53:10 -0700 |
| commit | 7d1194de01ea94f065bd5176607b4d66279ef51b (patch) | |
| tree | 337ab0498a929285a234518fee34a4d9dcf51656 /quantum/split_common | |
| parent | e628051505cca7674c37b417ba91af1c69dbbd86 (diff) | |
| download | qmk_firmware-7d1194de01ea94f065bd5176607b4d66279ef51b.tar.gz qmk_firmware-7d1194de01ea94f065bd5176607b4d66279ef51b.zip | |
run: qmk cformat --core-only
Diffstat (limited to 'quantum/split_common')
| -rw-r--r-- | quantum/split_common/transport.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c index bf942c526..9ed0f7591 100644 --- a/quantum/split_common/transport.c +++ b/quantum/split_common/transport.c | |||
| @@ -240,38 +240,38 @@ typedef struct _Serial_s2m_buffer_t { | |||
| 240 | matrix_row_t smatrix[ROWS_PER_HAND]; | 240 | matrix_row_t smatrix[ROWS_PER_HAND]; |
| 241 | 241 | ||
| 242 | # ifdef ENCODER_ENABLE | 242 | # ifdef ENCODER_ENABLE |
| 243 | uint8_t encoder_state[NUMBER_OF_ENCODERS]; | 243 | uint8_t encoder_state[NUMBER_OF_ENCODERS]; |
| 244 | # endif | 244 | # endif |
| 245 | 245 | ||
| 246 | } Serial_s2m_buffer_t; | 246 | } Serial_s2m_buffer_t; |
| 247 | 247 | ||
| 248 | typedef struct _Serial_m2s_buffer_t { | 248 | typedef struct _Serial_m2s_buffer_t { |
| 249 | # ifdef SPLIT_MODS_ENABLE | 249 | # ifdef SPLIT_MODS_ENABLE |
| 250 | uint8_t real_mods; | 250 | uint8_t real_mods; |
| 251 | uint8_t weak_mods; | 251 | uint8_t weak_mods; |
| 252 | # ifndef NO_ACTION_ONESHOT | 252 | # ifndef NO_ACTION_ONESHOT |
| 253 | uint8_t oneshot_mods; | 253 | uint8_t oneshot_mods; |
| 254 | # endif | 254 | # endif |
| 255 | # endif | 255 | # endif |
| 256 | # ifndef DISABLE_SYNC_TIMER | 256 | # ifndef DISABLE_SYNC_TIMER |
| 257 | uint32_t sync_timer; | 257 | uint32_t sync_timer; |
| 258 | # endif | 258 | # endif |
| 259 | # ifdef SPLIT_TRANSPORT_MIRROR | 259 | # ifdef SPLIT_TRANSPORT_MIRROR |
| 260 | matrix_row_t mmatrix[ROWS_PER_HAND]; | 260 | matrix_row_t mmatrix[ROWS_PER_HAND]; |
| 261 | # endif | 261 | # endif |
| 262 | # ifdef BACKLIGHT_ENABLE | 262 | # ifdef BACKLIGHT_ENABLE |
| 263 | uint8_t backlight_level; | 263 | uint8_t backlight_level; |
| 264 | # endif | 264 | # endif |
| 265 | # ifdef WPM_ENABLE | 265 | # ifdef WPM_ENABLE |
| 266 | uint8_t current_wpm; | 266 | uint8_t current_wpm; |
| 267 | # endif | 267 | # endif |
| 268 | # if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT) | 268 | # if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT) |
| 269 | led_eeconfig_t led_matrix; | 269 | led_eeconfig_t led_matrix; |
| 270 | bool led_suspend_state; | 270 | bool led_suspend_state; |
| 271 | # endif | 271 | # endif |
| 272 | # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) | 272 | # if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT) |
| 273 | rgb_config_t rgb_matrix; | 273 | rgb_config_t rgb_matrix; |
| 274 | bool rgb_suspend_state; | 274 | bool rgb_suspend_state; |
| 275 | # endif | 275 | # endif |
| 276 | } Serial_m2s_buffer_t; | 276 | } Serial_m2s_buffer_t; |
| 277 | 277 | ||
| @@ -363,7 +363,7 @@ bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) | |||
| 363 | 363 | ||
| 364 | // TODO: if MATRIX_COLS > 8 change to unpack() | 364 | // TODO: if MATRIX_COLS > 8 change to unpack() |
| 365 | for (int i = 0; i < ROWS_PER_HAND; ++i) { | 365 | for (int i = 0; i < ROWS_PER_HAND; ++i) { |
| 366 | slave_matrix[i] = serial_s2m_buffer.smatrix[i]; | 366 | slave_matrix[i] = serial_s2m_buffer.smatrix[i]; |
| 367 | # ifdef SPLIT_TRANSPORT_MIRROR | 367 | # ifdef SPLIT_TRANSPORT_MIRROR |
| 368 | serial_m2s_buffer.mmatrix[i] = master_matrix[i]; | 368 | serial_m2s_buffer.mmatrix[i] = master_matrix[i]; |
| 369 | # endif | 369 | # endif |
| @@ -380,14 +380,14 @@ bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) | |||
| 380 | 380 | ||
| 381 | # ifdef WPM_ENABLE | 381 | # ifdef WPM_ENABLE |
| 382 | // Write wpm to slave | 382 | // Write wpm to slave |
| 383 | serial_m2s_buffer.current_wpm = get_current_wpm(); | 383 | serial_m2s_buffer.current_wpm = get_current_wpm(); |
| 384 | # endif | 384 | # endif |
| 385 | 385 | ||
| 386 | # ifdef SPLIT_MODS_ENABLE | 386 | # ifdef SPLIT_MODS_ENABLE |
| 387 | serial_m2s_buffer.real_mods = get_mods(); | 387 | serial_m2s_buffer.real_mods = get_mods(); |
| 388 | serial_m2s_buffer.weak_mods = get_weak_mods(); | 388 | serial_m2s_buffer.weak_mods = get_weak_mods(); |
| 389 | # ifndef NO_ACTION_ONESHOT | 389 | # ifndef NO_ACTION_ONESHOT |
| 390 | serial_m2s_buffer.oneshot_mods = get_oneshot_mods(); | 390 | serial_m2s_buffer.oneshot_mods = get_oneshot_mods(); |
| 391 | # endif | 391 | # endif |
| 392 | # endif | 392 | # endif |
| 393 | 393 | ||
| @@ -401,7 +401,7 @@ bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) | |||
| 401 | # endif | 401 | # endif |
| 402 | 402 | ||
| 403 | # ifndef DISABLE_SYNC_TIMER | 403 | # ifndef DISABLE_SYNC_TIMER |
| 404 | serial_m2s_buffer.sync_timer = sync_timer_read32() + SYNC_TIMER_OFFSET; | 404 | serial_m2s_buffer.sync_timer = sync_timer_read32() + SYNC_TIMER_OFFSET; |
| 405 | # endif | 405 | # endif |
| 406 | return true; | 406 | return true; |
| 407 | } | 407 | } |
| @@ -416,7 +416,7 @@ void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) | |||
| 416 | for (int i = 0; i < ROWS_PER_HAND; ++i) { | 416 | for (int i = 0; i < ROWS_PER_HAND; ++i) { |
| 417 | serial_s2m_buffer.smatrix[i] = slave_matrix[i]; | 417 | serial_s2m_buffer.smatrix[i] = slave_matrix[i]; |
| 418 | # ifdef SPLIT_TRANSPORT_MIRROR | 418 | # ifdef SPLIT_TRANSPORT_MIRROR |
| 419 | master_matrix[i] = serial_m2s_buffer.mmatrix[i]; | 419 | master_matrix[i] = serial_m2s_buffer.mmatrix[i]; |
| 420 | # endif | 420 | # endif |
| 421 | } | 421 | } |
| 422 | # ifdef BACKLIGHT_ENABLE | 422 | # ifdef BACKLIGHT_ENABLE |
