From e9e24e369434dfbb530109a0f5afe5772d8ee4e7 Mon Sep 17 00:00:00 2001
From: Stefan Sundin <4pplet@protonmail.com>
Date: Fri, 13 Nov 2020 15:38:57 +0100
Subject: [PATCH] fixed partition and matrix-issue.
---
app/boards/arm/cyber60/cyber60.dts | 46 ++++++++++++---------------
app/boards/arm/cyber60/cyber60.keymap | 27 ++++++++--------
2 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/app/boards/arm/cyber60/cyber60.dts b/app/boards/arm/cyber60/cyber60.dts
index caf30e28..929dec82 100644
--- a/app/boards/arm/cyber60/cyber60.dts
+++ b/app/boards/arm/cyber60/cyber60.dts
@@ -18,18 +18,18 @@
zmk,kscan = &kscan0;
zmk,matrix_transform = &default_transform;
};
-
+/*
vbat-sense-en {
label = "VBAT_SENSE_EN";
control-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
};
-
- vbatt { // need to figure out the resistances
+*/
+ vbatt {
compatible = "zmk,battery-voltage-divider";
label = "BATTERY";
io-channels = <&adc 1>;
- output-ohms = <2000000>;
- full-ohms = <(2000000 + 806000)>;
+ output-ohms = <100000>;
+ full-ohms = <(100000 + 100000)>;
};
leds {
@@ -42,20 +42,12 @@
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
label = "Green LED";
};
- blue_led: led_1 { // also broken out on header con307 on cyber60-2 Rev A1
+ blue_led: led_1 { // also broken out on header con307 on cyber60-2 Rev A1 for debug
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
label = "Blue LED";
};
};
- vbatt {
- compatible = "zmk,battery-voltage-divider";
- label = "BATTERY";
- io-channels = <&adc 1>;
- output-ohms = <100000>;
- full-ohms = <(100000 + 100000)>;
- };
-
default_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform";
columns = <11>;
@@ -64,7 +56,7 @@
RC(0,0) RC(0,1) RC(1,1) RC(0,2) RC(0,3) RC(0,4) RC(1,4) RC(0,5) RC(0,6) RC(0,7) RC(1,7) RC(0,8) RC(0,9) RC(0,10) RC(1,10)
RC(1,0) RC(2,1) RC(1,2) RC(2,2) RC(1,3) RC(2,4) RC(1,5) RC(1,6) RC(2,6) RC(2,7) RC(1,8) RC(1,9) RC(2,9) RC(3,10)
RC(2,0) RC(3,1) RC(3,2) RC(2,3) RC(3,3) RC(3,4) RC(2,5) RC(3,6) RC(4,6) RC(3,7) RC(2,8) RC(3,9) RC(2,10)
-RC(3,0) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(3,5) RC(4,5) RC(5,6) RC(4,7) RC(4,8) RC(4,8) RC(4,9) RC(4,10)
+RC(3,0) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(3,5) RC(4,5) RC(5,6) RC(4,7) RC(3,8) RC(4,8) RC(4,9) RC(4,10)
RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5) RC(5,7) RC(5,8) RC(5,9) RC(5,10)
>;
};
@@ -114,7 +106,6 @@ RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4)
status = "okay";
};
-
&flash0 {
/*
* For more information, see:
@@ -125,27 +116,32 @@ RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4)
#address-cells = <1>;
#size-cells = <1>;
- boot_partition: partition@0 {
- label = "adafruit_boot";
- reg = <0x000000000 0x0000C000>;
+ sd_partition: partition@0 {
+ label = "softdevice";
+ reg = <0x00000000 0x00026000>;
};
code_partition: partition@26000 {
label = "code_partition";
- reg = <0x00026000 0x000d2000>;
+ reg = <0x00026000 0x000c6000>;
};
/*
- * The flash starting at 0x000f8000 and ending at
- * 0x000fffff is reserved for use by the application.
+ * The flash starting at 0x000ec000 and ending at
+ * 0x000f3fff is reserved for use by the application.
*/
/*
* Storage partition will be used by FCB/LittleFS/NVS
* if enabled.
*/
- storage_partition: partition@f8000 {
+ storage_partition: partition@ec000 {
label = "storage";
- reg = <0x000f8000 0x00008000>;
+ reg = <0x000ec000 0x00008000>;
+ };
+
+ boot_partition: partition@f4000 {
+ label = "adafruit_boot";
+ reg = <0x000f4000 0x0000c000>;
};
};
-};
+};
\ No newline at end of file
diff --git a/app/boards/arm/cyber60/cyber60.keymap b/app/boards/arm/cyber60/cyber60.keymap
index 016a0dda..1f66c938 100644
--- a/app/boards/arm/cyber60/cyber60.keymap
+++ b/app/boards/arm/cyber60/cyber60.keymap
@@ -11,25 +11,24 @@
// | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | "|" | ~ |
// | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | BKSP |
// | CAPS | A | S | D | F | G | H | J | K | L | ; | ' | ENTER |
-// | SHIFT |iso| Z | X | C | V | B | N | M | , | . | / | Shift | FN |
-// | CTL | WIN | ALT | SPACE | SPACE | SPACE | ALT | WIN | MENU | CTRL |
+// | SHIFT |none| Z | X | C | V | B | N | M | , | . | / | Shift | FN |
+// | LCTL | LWIN | LALT | RALT | FN | SPACE | RALT | RWIN | RMENU | RCTRL |
// ------------------------------------------------------------------------------------------
bindings = <
- &kp ESC &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp MINUS &kp EQL &kp BSLH &kp GRAV
- &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &kp RBKT &kp BKSP
- &kp CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT &kp RET
- &kp LSFT &kp Z &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT &mo 1
- &kp LCTL &kp LGUI &kp LALT &kp SPC &kp SPC &kp SPC &kp RALT &kp RGUI &kp 2 &kp RCTL
+ &kp ESC &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp MINUS &kp EQL &kp BSLH &kp GRAV
+ &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &kp RBKT &kp BKSP
+ &kp LGUI &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT &kp RET
+ &kp LSFT &none &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RSFT &mo 1
+ &kp LCTL &kp LGUI &kp LALT &kp RALT &mo 1 &kp SPC &kp RALT &kp RGUI &kp K_APP &kp RCTL
>;
};
-
- fn_layer {
+ fn_layer {
bindings = <
- &kp GRAV &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &bootloader &reset
- &trans &bt BT_CLR &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
- &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans &trans
- &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
- &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+ &kp GRAV &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &bootloader &reset
+ &kp CLCK &trans &kp UP &trans &trans &trans &trans &trans &trans &trans &trans &kp UP &trans &trans
+ &trans &kp LEFT &kp DOWN &kp RIGHT &trans &trans &trans &trans &trans &trans &kp LEFT &kp RIGHT &trans
+ &trans &trans &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &kp DOWN &trans &trans
+ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
>;
};
};