justin branch is on

mctechnology17 · Sep 15, 2023 · c188b91 · c188b91
1 parent b1ccd40
commit c188b91
Show file tree

Hide file tree

Showing 7 changed files with 356 additions and 249 deletions.
diff --git a/build.yaml b/build.yaml
@@ -51,14 +51,13 @@
 # pressing the reset buttons at the same time.
 ---
 include:
-  - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
-    shield: corne_left  # con OLED display
-    # shield: corne_left nice_view_adapter nice_view # con display
-    # - board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
-  - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
-    shield: corne_right # con OLED display
-    # shield: corne_right nice_view_adapter nice_view # con display
-    # - board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
+  - board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
+    shield: corne_left nice_view_adapter nice_view # con display
+    # shield: corne_left  # con OLED display
+    # - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
+  - board: nice_nano_v2 # puchi_ble_v1 nice_nano_v2
+    shield: corne_right nice_view_adapter nice_view # con display
     # shield: corne_right # con OLED display
+    # - board: puchi_ble_v1 # puchi_ble_v1 nice_nano_v2
     # - board: puchi_ble_v1
     # shield: settings_reset
diff --git a/config/config_zmk.h b/config/config_zmk.h
@@ -33,19 +33,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // mouse config, 1 = enable, 0 = disable, default = 1
-#define MC_TECHNOLOGY_MOUSE_ENABLE 0
+#define MC_TECHNOLOGY_MOUSE_ENABLE 1
 
 // layers
 #define DEFAULT 0
-#define NUMBER 1
-#define SYMBOL 2
-#define FUNCTION 3
-#define MEDIA 4
-#define MOUSE 5
+#define SYMBOL 1
+#define FUNCTION 2
+#define NAVIGATION 3
+#define MOUSE 4
+
+
+// #define DEFAULT 0
+// #define NUMBER 1
+// #define SYMBOL 2
+// #define FUNCTION 3
+// #define MEDIA 4
+// #define MOUSE 5
 // esta capa la uso por la compatibilidad entre mac, windows y linux
 // a veces los caracteres no son los mismos
-#define LX_ 6
-#define LOCK 7
+// #define LX_ 6
+// #define LOCK 7
 
 #define NAV_LEFT &mt HOME LEFT  // tap: left  | long-tap: beginning of line
 #define NAV_RIGHT &mt END RIGHT // tap: right | long-tap: end       of line
@@ -57,14 +64,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NAV_DEL &mt LC(DEL) DEL // tap: del   | long-tap: delete word forward
 
 // combinadas para optimizar espacio
-#define MEDIA_ESC &lt MEDIA ESC
-#define MOUSE_TAB &lt MOUSE TAB
-#define NUMBER_SPACE &lt NUMBER SPACE
-#define SYMBOL_RGUI &mo SYMBOL     // &lt SYMBOL RGUI
-#define FUNCTION_RALT &mo FUNCTION // &lt FUNCTION RALT
+// #define MEDIA_ESC &lt MEDIA ESC
+// #define MOUSE_TAB &lt MOUSE TAB
+// #define NUMBER_SPACE &lt NUMBER SPACE
+// #define SYMBOL_RGUI &mo SYMBOL     // &lt SYMBOL RGUI
+// #define FUNCTION_RALT &mo FUNCTION // &lt FUNCTION RALT
 
 // default_layer
-#define LSHFT_COMMA &mt LSHFT COMMA
+// #define LSHFT_COMMA &mt LSHFT COMMA
 
 // function_layer
 #define SPELL &kp LC(LG(D))

diff --git a/config/corne.conf b/config/corne.conf
@@ -6,7 +6,6 @@
 # GitHub: https://github.com/mctechnology17
 # Brief: configuration file for ZMK firmware
 # Board: nice_nano_v2 and puchi_ble_v1
-# =========================================
 #                              ╔═╦═╦═╗
 #                       ╔════╗ ║║║║║╔╝
 #                       ║╔╗╔╗║ ║║║║║╚╗
@@ -15,6 +14,9 @@
 #                         ║║╩╣═╣║║║║║╬║╚╣╬║╬║║║
 #                         ╚╩═╩═╩╩╩╩═╩═╩═╩═╬╗╠╗║
 #                                         ╚═╩═╝
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+# =========================================
 # on config_zmk.h file enable/disable the following options, if you want to
 # use CONFIG_ZMK_MOUSE=y, CONFIG_ZMK_RGB_UNDERGLOW=y, CONFIG_ZMK_RGB_UNDERGLOW=y
 # mouse config, 1 = enable, 0 = disable, default = 1
@@ -27,9 +29,9 @@
 
 ### Keyboard name
 # 1 nice
-# CONFIG_ZMK_KEYBOARD_NAME="Nice Corne"
+CONFIG_ZMK_KEYBOARD_NAME="Nice Corne"
 # 1 puchi
-CONFIG_ZMK_KEYBOARD_NAME="Puchi Corne"
+# CONFIG_ZMK_KEYBOARD_NAME="Puchi Corne"
 
 ### Boost Bluetooth TX power, also make Bluetooth stronger
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
@@ -48,20 +50,20 @@ CONFIG_ZMK_SLEEP=y
 # CONFIG_ZMK_EXT_POWER_USB_ONLY=y
 
 ### MOUSE
-# CONFIG_ZMK_MOUSE=y
+CONFIG_ZMK_MOUSE=y
 
 ### RGB UNDERGLOW
 # uncomment to enable RGB Underglow or backlight
-CONFIG_ZMK_RGB_UNDERGLOW=y
-CONFIG_WS2812_STRIP=y
+# CONFIG_ZMK_RGB_UNDERGLOW=y
+# CONFIG_WS2812_STRIP=y
 # apaga si no se usa el teclado
 # CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
 # 0	Solid color    1 Breathe     2	Spectrum     3	Swirl
-CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=3
+# CONFIG_ZMK_RGB_UNDERGLOW_EFF_START=3
 # nivel de brillo en porcentaje, el valor por defecto es 10 por ciento
-CONFIG_ZMK_RGB_UNDERGLOW_BRT_STEP=1
+# CONFIG_ZMK_RGB_UNDERGLOW_BRT_STEP=1
 # Turn off RGB underglow when keyboard goes into idle state
-CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
+# CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
 
 # # Hue step in degrees (0-359) used by RGB actions default 10
 # CONFIG_ZMK_RGB_UNDERGLOW_HUE_STEP=30
@@ -75,21 +77,19 @@ CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y
 # Uncomment the line below to disable external power toggling by the underglow.
 # By default toggling the underglow on and off also toggles external power
 # on and off. This also causes the display to turn off.
-CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n
-
+# CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n
 
 ### OLED Display
-CONFIG_ZMK_DISPLAY=y
+# CONFIG_ZMK_DISPLAY=y
 # esto creo que ya no es necesario
 # CONFIG_ZMK_DISPLAY_WORK_QUEUE_DEDICATED=y
 # CONFIG_ZMK_DISPLAY_STATUS_SCREEN_BUILT_IN=y
 
 ### WIDGET SETTINGS compatible SOLO con OLED
 # No Widget configurations added since nice!view has its own custom widgets
 # activar solo estos dos widgets
-CONFIG_ZMK_WIDGET_WPM_STATUS=n
-CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y
-# me da error, probando a ver si se quita el error
+# CONFIG_ZMK_WIDGET_WPM_STATUS=n
+# CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y
 # CONFIG_ZMK_WIDGET_LAYER_STATUS=y
 # CONFIG_ZMK_WIDGET_BATTERY_STATUS=y
 # CONFIG_ZMK_WIDGET_OUTPUT_STATUS=y
@@ -98,8 +98,9 @@ CONFIG_ZMK_WIDGET_BATTERY_STATUS_SHOW_PERCENTAGE=y
 # Enable eager debouncing
 # "Eager Debouncing"
 # Trying to lower the input lag.
-# CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1
-# CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=5
+CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1
+CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=5
 
 ### Improves compatibility with iPad
 CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
+