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

Use fresh_install and keymap_all.h now generates a function, sval_ini… #81

Open
wants to merge 1 commit into
base: vial
Choose a base branch
from
Open

Use fresh_install and keymap_all.h now generates a function, sval_ini… #81

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
14 changes: 2 additions & 12 deletions keyboards/svalboard/keymaps/vial/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,18 +182,8 @@ void keyboard_post_init_user(void) {
rgblight_layers = sval_rgb_layers;

#if __has_include("keymap_all.h")
// Check if we've already got our macros set. At this point we're just
// seeing if ANY macro is defined.
if (sval_macro_size > 0) {
uint8_t get[DYNAMIC_KEYMAP_MACRO_COUNT];
uint8_t check[DYNAMIC_KEYMAP_MACRO_COUNT];

memset(check, 0, DYNAMIC_KEYMAP_MACRO_COUNT);
dynamic_keymap_macro_get_buffer(0, DYNAMIC_KEYMAP_MACRO_COUNT, get);
if (memcmp(get, check, DYNAMIC_KEYMAP_MACRO_COUNT) == 0) {
// We have a blank keymap. Copy ours over.
dynamic_keymap_macro_set_buffer(0, sval_macro_size, sval_macros);
}
if (fresh_install) {
sval_init_defaults();
}
#endif
}
9 changes: 8 additions & 1 deletion keyboards/svalboard/svalboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

saved_values_t global_saved_values;
const int16_t mh_timer_choices[4] = { 300, 500, 800, -1 }; // -1 is infinite.
bool fresh_install = false;

void write_eeprom_kb(void) {
eeconfig_update_kb_datablock(&global_saved_values);
Expand Down Expand Up @@ -101,12 +102,18 @@ void set_right_dpi(uint8_t index) {
}

void set_dpi_from_eeprom(void) {
read_eeprom_kb();
set_left_dpi(global_saved_values.left_dpi_index);
set_right_dpi(global_saved_values.right_dpi_index);
}

// Called from via_init, we can check here if we're a fresh
// installation.
void via_init_kb(void) {
fresh_install = !via_eeprom_is_valid();
}

void keyboard_post_init_kb(void) {
read_eeprom_kb();
set_dpi_from_eeprom();
keyboard_post_init_user();
}
Expand Down
1 change: 1 addition & 0 deletions keyboards/svalboard/svalboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"

extern const int16_t mh_timer_choices[4];
extern bool fresh_install;

struct saved_values {
uint8_t version; // Currently at 1, We assume all new data will be zeroed.
Expand Down