Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for sync_timer over serial_link (i.e. Ergodox Infinity). #12845

Merged
merged 1 commit into from
Jun 20, 2021
Merged

Add support for sync_timer over serial_link (i.e. Ergodox Infinity). #12845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions quantum/serial_link/system/serial_link.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@ SOFTWARE.
#include "serial_link/protocol/transport.h"
#include "serial_link/protocol/frame_router.h"
#include "matrix.h"
#include "sync_timer.h"
#include <stdbool.h>
#include "print.h"
#include "config.h"

#define SYNC_TIMER_OFFSET 2

static event_source_t new_data_event;
static bool serial_link_connected;
static bool is_master = false;
Expand Down Expand Up @@ -159,10 +162,16 @@ static matrix_object_t last_matrix = {};

SLAVE_TO_MASTER_OBJECT(keyboard_matrix, matrix_object_t);
MASTER_TO_ALL_SLAVES_OBJECT(serial_link_connected, bool);
#ifndef DISABLE_SYNC_TIMER
MASTER_TO_ALL_SLAVES_OBJECT(sync_timer, uint32_t);
#endif

static remote_object_t* remote_objects[] = {
REMOTE_OBJECT(serial_link_connected),
REMOTE_OBJECT(keyboard_matrix),
#ifndef DISABLE_SYNC_TIMER
REMOTE_OBJECT(sync_timer),
#endif
};

void init_serial_link(void) {
Expand Down Expand Up @@ -200,14 +209,27 @@ void serial_link_update(void) {
m->rows[i] = matrix.rows[i];
}
end_write_keyboard_matrix();

*begin_write_serial_link_connected() = true;
end_write_serial_link_connected();

#ifndef DISABLE_SYNC_TIMER
*begin_write_sync_timer() = sync_timer_read32() + SYNC_TIMER_OFFSET;
end_write_sync_timer();
#endif
}

matrix_object_t* m = read_keyboard_matrix(0);
if (m) {
matrix_set_remote(m->rows, 0);
}

#ifndef DISABLE_SYNC_TIMER
uint32_t* t = read_sync_timer();
if (t) {
sync_timer_update(*t);
}
#endif
}

void signal_data_written(void) { chEvtBroadcast(&new_data_event); }
Expand Down
2 changes: 1 addition & 1 deletion tmk_core/common/sync_timer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ SOFTWARE.
#include "sync_timer.h"
#include "keyboard.h"

#if defined(SPLIT_KEYBOARD) && !defined(DISABLE_SYNC_TIMER)
#if (defined(SPLIT_KEYBOARD) || defined(SERIAL_LINK_ENABLE)) && !defined(DISABLE_SYNC_TIMER)
volatile int32_t sync_timer_ms;

void sync_timer_init(void) { sync_timer_ms = 0; }
Expand Down
2 changes: 1 addition & 1 deletion tmk_core/common/sync_timer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SOFTWARE.
extern "C" {
#endif

#if defined(SPLIT_KEYBOARD) && !defined(DISABLE_SYNC_TIMER)
#if (defined(SPLIT_KEYBOARD) || defined(SERIAL_LINK_ENABLE)) && !defined(DISABLE_SYNC_TIMER)
void sync_timer_init(void);
void sync_timer_update(uint32_t time);
uint16_t sync_timer_read(void);
Expand Down