updated

hackartists · Jul 24, 2024 · fb3da0c · fb3da0c
1 parent 408431a
commit fb3da0c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/config/adv360_left.keymap b/config/adv360_left.keymap
@@ -5,4 +5,4 @@
 *
 */
 
-#include "adv360.keymap"
+#include "hackartist.keymap"
diff --git a/config/adv360_right.keymap b/config/adv360_right.keymap
@@ -5,4 +5,4 @@
 *
 */
 
-#include "adv360.keymap"
+#include "hackartist.keymap"
diff --git a/config/boards/arm/adv360/adv360_left_defconfig b/config/boards/arm/adv360/adv360_left_defconfig
@@ -49,19 +49,19 @@ CONFIG_ZMK_BACKLIGHT_AUTO_OFF_IDLE=y
 #BT configuration
 CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
 CONFIG_BT_DIS_MANUF="Kinesis Corporation"
-#CONFIG_BT_PRIVACY=n
-#CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS=y
-#CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=600
-#CONFIG_BT_PERIPHERAL_PREF_MIN_INT=12
-#CONFIG_BT_PERIPHERAL_PREF_MAX_INT=24
-#CONFIG_BT_PERIPHERAL_PREF_LATENCY=30
-CONFIG_BT_BAS=n #Set this to y to enable BLE battery reporting
+CONFIG_BT_PRIVACY=n
+CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS=y
+CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=600
+CONFIG_BT_PERIPHERAL_PREF_MIN_INT=12
+CONFIG_BT_PERIPHERAL_PREF_MAX_INT=24
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=30
+#CONFIG_BT_BAS=n #Set this to y to enable BLE battery reporting
 
 #Misc configuration
 CONFIG_USB_DEVICE_VID=0x29EA
 CONFIG_USB_DEVICE_PID=0x0362
 CONFIG_USB_DEVICE_MANUFACTURER="Kinesis Corporation"
 CONFIG_ZMK_HID_REPORT_TYPE_NKRO=y
-CONFIG_ZMK_HID_KEYBOARD_EXTENDED_REPORT=n #Set this to y for F13-F24 and intl keys with NKRO
+# CONFIG_ZMK_HID_KEYBOARD_EXTENDED_REPORT=n #Set this to y for F13-F24 and intl keys with NKRO
 CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
 CONFIG_BUILD_OUTPUT_UF2=y
diff --git a/config/hackartist.keymap b/config/hackartist.keymap
@@ -117,11 +117,11 @@
 
     default_layer {
       bindings = <
-        &kp EQUAL     &mt LC(LA(F1)) N1    &mt LC(LA(F2) N2    &mt LC(LA(F3) N3   &kp N4     &mt LC(LA(F5) N5 &mo MISC                                                         &mo MISC      &mt LC(LA(F6) N6   &mt LC(LA(F7) N7   &mt LC(LA(F8) N8    &mt LC(LA(F9) N9   &mt LC(LA(F10) N0   &kp MINUS
-        &kp TAB       &kp Q     &kp W     &kp E    &kp R      &kp T  &kp DEL                                                          &td_mod       &kp Y    &kp U    &kp I     &kp O    &kp P    &kp BSLH
-        &kp ESC       &kp A     &kp S     &kp D    &kp F      &kp G  &td_ws            &kp LCTRL     &kp LCMD  &kp LCMD  &kp RCTRL    &vm_esc_act   &kp H    &kp J    &kp K     &kp L    &kp SEMI &kp SQT
+        &kp EQUAL     &kp N1    &kp N2    &kp N3   &kp N4     &kp N5 &mo MISC                                                         &mo MISC      &kp N6   &kp N7   &kp N8    &kp N9   &kp N0   &kp MINUS
+        &kp TAB       &kp Q     &kp W     &kp E    &kp R      &kp T  &kp DEL                                                          &kp LA(SPACE)    &kp Y    &kp U    &kp I     &kp O    &kp P    &kp BSLH
+        &kp ESC       &kp A     &kp S     &kp D    &kp F      &kp G  &vm_esc_act       &kp LCTRL     &kp LCMD  &kp LCMD  &kp LCTRL    &vm_esc_act   &kp H    &kp J    &kp K     &kp L    &kp SEMI &kp SQT
         &kp LSHFT     &kp Z     &kp X     &kp C    &kp V      &kp B                                  &kp HOME  &kp END                              &kp N    &kp M    &kp COMMA &kp DOT  &kp FSLH &kp LSHFT
-        &kp LA(LSHFT) &kp GRAVE &kp LA(X) &kp LEFT &kp RIGHT                 &kp SPACE &kp LS(SPACE) &kp LALT  &kp LALT  &kp BSPC  &kp ENTER                 &kp DOWN &kp UP    &kp LBKT &kp RBKT &kp LC(LSHFT)
+        &sw_to_dev    &kp GRAVE &kp LA(X) &kp LEFT &kp RIGHT                 &kp SPACE &kp LS(SPACE) &kp LALT  &kp LALT  &kp BSPC  &kp ENTER                 &kp DOWN &kp UP    &kp LBKT &kp RBKT &sw_to_vm
       >;
     };
 

diff --git a/config/version.dtsi b/config/version.dtsi
@@ -0,0 +1,7 @@
+#define VERSION_MACRO
+macro_ver: macro_ver {
+compatible = "zmk,behavior-macro";
+label = "macro_ver";
+#binding-cells = <0>;
+bindings = <&kp N2>, <&kp N0>, <&kp N2>, <&kp N4>, <&kp N0>, <&kp N6>, <&kp N2>, <&kp N4>, <&kp MINUS>, <&kp M>, <&kp A>, <&kp I>, <&kp N>, <&kp MINUS>, <&kp N4>, <&kp N0>, <&kp N8>, <&kp N4>, <&kp N3>, <&kp N1>, <&kp A>, <&kp RET>;
+};
diff --git a/config/west.yml b/config/west.yml
@@ -7,7 +7,7 @@ manifest:
   projects:
     - name: zmk
       remote: refil
-      revision: adv360-z3.2-2
+      revision: adv360-z3.2
       import: app/west.yml
   self:
     path: config
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ @@
     *
     */
-    #include "adv360.keymap"
+    #include "hackartist.keymap"