Cipulot refactoring (#22368)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

keyboards/cipulot/ec_23u/keymaps/via/config.h

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,7 @@
 
 #pragma once
 
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
+#define VIA_FIRMWARE_VERSION 1
 // This is the size of the EEPROM for the custom VIA-specific data
 #define EECONFIG_USER_DATA_SIZE 4

keyboards/cipulot/ec_23u/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -28,27 +28,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_all(
         RGB_TOG, RGB_VAD, RGB_VAI, _______,
+        _______, _______, _______, NK_TOGG,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
         _______, _______, _______, _______,
-        _______, _______, _______, _______,
+        _______, _______, QK_BOOT, _______)
-        _______, _______, QK_BOOT, _______),
-
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______,
-        _______, _______, _______, _______)
     // clang-format on
 };

keyboards/cipulot/ec_23u/keymaps/via/rules.mk

@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c

keyboards/cipulot/ec_23u/keymaps/via/via_apc.c

@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}

keyboards/cipulot/ec_60/keymaps/via/config.h

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
-#define EECONFIG_USER_DATA_SIZE 4
+#define VIA_FIRMWARE_VERSION 1

keyboards/cipulot/ec_60/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -34,14 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,        _______,  _______,       _______,  _______,  _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,       _______,  _______,       _______,  _______,  _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,

keyboards/cipulot/ec_60/keymaps/via/rules.mk

@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c

keyboards/cipulot/ec_60/keymaps/via/via_apc.c

@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}

keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/config.h

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
-#define EECONFIG_USER_DATA_SIZE 4
+#define VIA_FIRMWARE_VERSION 1

keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,   _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,
-        _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,   _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                  _______,

keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/rules.mk

@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c

keyboards/cipulot/ec_alveus/1_0_0/keymaps/via/via_apc.c

@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}

keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/config.h

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
-#define EECONFIG_USER_DATA_SIZE 4
+#define VIA_FIRMWARE_VERSION 1

keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -33,14 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,             _______,  _______,  _______),
 
     [2] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,
-        _______,  _______,  _______,                      _______,                                                    _______,  _______,  _______,             _______,  _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,                            _______,

keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/rules.mk

@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c

keyboards/cipulot/ec_alveus/1_2_0/keymaps/via/via_apc.c

@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}

keyboards/cipulot/ec_pro2/keymaps/via/config.h

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
-#define EECONFIG_USER_DATA_SIZE 4
+#define VIA_FIRMWARE_VERSION 1

keyboards/cipulot/ec_pro2/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,   KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_DEL,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,   KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_NUHS,  KC_ENTER,
         KC_LSFT,  KC_BSLS,  KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,  MO(1),
-                  KC_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_INS,  KC_DEL,
@@ -33,13 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                   _______,  _______,                                _______,                                  _______,  MO(2)),
 
     [2] = LAYOUT_all(
-        RGB_TOG,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  QK_BOOT,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,

keyboards/cipulot/ec_pro2/keymaps/via/rules.mk

@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c

keyboards/cipulot/ec_pro2/keymaps/via/via_apc.c

@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}

keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/config.h

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
-#define EECONFIG_USER_DATA_SIZE 4
+#define VIA_FIRMWARE_VERSION 1

keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -23,24 +23,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,   KC_T,    KC_Y,   KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,   KC_RBRC,  KC_DEL,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,   KC_G,    KC_H,   KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_NUHS,  KC_ENTER,
         KC_LSFT,  KC_BSLS,  KC_Z,     KC_X,     KC_C,   KC_V,    KC_B,   KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,   KC_RSFT,  MO(1),
-                  KC_LGUI,  KC_LALT,                             KC_SPC,                               KC_RALT,  KC_RGUI),
+                  KC_LALT,  KC_LGUI,                             KC_SPC,                               KC_RGUI,  KC_RALT),
 
     [1] = LAYOUT_all(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,      KC_F8,    KC_F9,    KC_F10,    KC_F11,    KC_F12,   KC_INS,  KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_PSCR,  KC_SCRL,  KC_PAUSE,  KC_UP,     _______,  KC_BSPC,
         _______,  KC_VOLD,  KC_VOLU,  KC_MUTE,  _______,  _______,  S(KC_8),  KC_SLSH,    KC_HOME,  KC_PGUP,  KC_LEFT,   KC_RIGHT,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  S(KC_EQL),  KC_MINS,  KC_END,   KC_PGDN,   KC_DOWN,   _______,  _______,
-                  _______,  _______,                                _______,                                  _______,   _______),
+                  _______,  _______,                                _______,                                  _______,   MO(2)),
 
     [2] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-                  _______,  _______,                                _______,                                _______,  _______),
-
-    [3] = LAYOUT_all(
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,

keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/rules.mk

@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c

keyboards/cipulot/ec_prox/ansi_iso/keymaps/via/via_apc.c

@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}

keyboards/cipulot/ec_prox/jis/keymaps/via/config.h

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
-#define EECONFIG_USER_DATA_SIZE 4
+#define VIA_FIRMWARE_VERSION 1

keyboards/cipulot/ec_prox/jis/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -22,30 +22,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [0] = LAYOUT_jp(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  JP_YEN, KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T, KC_Y, KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,
-        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_H, KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS,
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_UNDS, KC_UP,   KC_RSFT,
         MO(1),   JP_ZKHK, KC_LGUI, KC_LALT, JP_MHEN,   KC_SPC,   JP_HENK, JP_KANA, KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_jp(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS, KC_DEL,
-        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   _______, KC_PENT,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
+        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______,
         _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
         _______, _______, _______, _______, _______,      _______,     _______, _______, MO(2),   _______, _______, _______, _______),
 
     [2] = LAYOUT_jp(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______, _______, _______),
-
-    [3] = LAYOUT_jp(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______,      _______,     _______, _______, _______, _______, _______, _______, _______)
     // clang-format on
 };

keyboards/cipulot/ec_prox/jis/keymaps/via/rules.mk

@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c

keyboards/cipulot/ec_prox/jis/keymaps/via/via_apc.c

@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}

keyboards/cipulot/ec_theca/keymaps/via/config.h

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
-#define EECONFIG_USER_DATA_SIZE 4
+#define VIA_FIRMWARE_VERSION 1

keyboards/cipulot/ec_theca/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,                  KC_SPC,                            KC_RALT,  MO(1),    MO(1),    KC_RCTL,               KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
     [1] = LAYOUT_all(
-        QK_BOOT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
+        QK_BOOT,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,

keyboards/cipulot/ec_theca/keymaps/via/rules.mk

@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += keyboards/cipulot/common/via_apc.c

keyboards/cipulot/kawayo/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,

keyboards/cipulot/rf_r1_8_9xu/keymaps/via/config.h

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,5 +16,5 @@
 
 #pragma once
 
-// This is the size of the EEPROM for the custom VIA-specific data
+// This is the firmware version for VIA support to avoid conflicts on menu fetching
-#define EECONFIG_USER_DATA_SIZE 4
+#define VIA_FIRMWARE_VERSION 1

keyboards/cipulot/rf_r1_8_9xu/keymaps/via/keymap.c

@@ -2,7 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -29,23 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,                KC_SPC,                JP_KANA, KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_all(
-        RGB_TOG, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, QK_BOOT,
+        QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
-        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______, _______,            _______, _______, _______),
-
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

keyboards/cipulot/rf_r1_8_9xu/keymaps/via/rules.mk

@@ -1,3 +1 @@
 VIA_ENABLE = yes
-
-SRC += via_apc.c

keyboards/cipulot/rf_r1_8_9xu/keymaps/via/via_apc.c

@@ -1,156 +0,0 @@
-/* Copyright 2023 Cipulot
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ec_switch_matrix.h"
-#include "action.h"
-#include "via.h"
-
-void apc_init_thresholds(void);
-void apc_set_threshold(bool is_for_actuation);
-
-// Declaring an _apc_config_t struct that will store our data
-typedef struct _apc_config_t {
-    uint16_t actuation_threshold;
-    uint16_t release_threshold;
-} apc_config;
-
-// Check if the size of the reserved persistent memory is the same as the size of struct apc_config
-_Static_assert(sizeof(apc_config) == EECONFIG_USER_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data");
-
-// Declaring a new variable apc of type apc_config
-apc_config apc;
-
-// Declaring enums for VIA config menu
-enum via_apc_enums {
-    // clang-format off
-    id_apc_actuation_threshold = 1,
-    id_apc_release_threshold = 2
-    // clang-format on
-};
-
-// Initializing persistent memory configuration: default values are declared and stored in PMEM
-void eeconfig_init_user(void) {
-    // Default values
-    apc.actuation_threshold = DEFAULT_ACTUATION_LEVEL;
-    apc.release_threshold   = DEFAULT_RELEASE_LEVEL;
-    // Write default value to EEPROM now
-    eeconfig_update_user_datablock(&apc);
-}
-
-// On Keyboard startup
-void keyboard_post_init_user(void) {
-    // Read custom menu variables from memory
-    eeconfig_read_user_datablock(&apc);
-    apc_init_thresholds();
-}
-
-// Handle the data received by the keyboard from the VIA menus
-void apc_config_set_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            apc.actuation_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(true);
-            break;
-        }
-        case id_apc_release_threshold: {
-            apc.release_threshold = value_data[1] | (value_data[0] << 8);
-            apc_set_threshold(false);
-            break;
-        }
-    }
-}
-
-// Handle the data sent by the keyboard to the VIA menus
-void apc_config_get_value(uint8_t *data) {
-    // data = [ value_id, value_data ]
-    uint8_t *value_id   = &(data[0]);
-    uint8_t *value_data = &(data[1]);
-
-    switch (*value_id) {
-        case id_apc_actuation_threshold: {
-            value_data[0] = apc.actuation_threshold >> 8;
-            value_data[1] = apc.actuation_threshold & 0xFF;
-            break;
-        }
-        case id_apc_release_threshold: {
-            value_data[0] = apc.release_threshold >> 8;
-            value_data[1] = apc.release_threshold & 0xFF;
-            break;
-        }
-    }
-}
-
-// Save the data to persistent memory after changes are made
-void apc_config_save(void) {
-    eeconfig_update_user_datablock(&apc);
-}
-
-void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
-    // data = [ command_id, channel_id, value_id, value_data ]
-    uint8_t *command_id        = &(data[0]);
-    uint8_t *channel_id        = &(data[1]);
-    uint8_t *value_id_and_data = &(data[2]);
-
-    if (*channel_id == id_custom_channel) {
-        switch (*command_id) {
-            case id_custom_set_value: {
-                apc_config_set_value(value_id_and_data);
-                break;
-            }
-            case id_custom_get_value: {
-                apc_config_get_value(value_id_and_data);
-                break;
-            }
-            case id_custom_save: {
-                apc_config_save();
-                break;
-            }
-            default: {
-                // Unhandled message.
-                *command_id = id_unhandled;
-                break;
-            }
-        }
-        return;
-    }
-
-    *command_id = id_unhandled;
-}
-
-// Initialize the thresholds
-void apc_init_thresholds(void) {
-    ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-    ecsm_config.ecsm_release_threshold   = apc.release_threshold;
-
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}
-
-// Set the thresholds
-void apc_set_threshold(bool is_for_actuation) {
-    if (is_for_actuation) {
-        ecsm_config.ecsm_actuation_threshold = apc.actuation_threshold;
-
-    } else {
-        ecsm_config.ecsm_release_threshold = apc.release_threshold;
-    }
-    // Update the ecsm_config
-    ecsm_update(&ecsm_config);
-}