Skip to content

fix: remove tabs #13

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

Open
kurokuro-tyan wants to merge 9 commits into
base: keychron_bpro
Choose a base branch
from
Open

fix: remove tabs #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f8b9ee9
Update tdfu_prv.h
kurokuro-tyan Jul 11, 2026
f85e47b
Update tdfu_prv.h
kurokuro-tyan Jul 11, 2026
55005b5
test
kurokuro-tyan Jul 11, 2026
cec63b8
Update pre-commit.yml
kurokuro-tyan Jul 11, 2026
50aa067
Update version.h
kurokuro-tyan Jul 11, 2026
26a3764
test2
kurokuro-tyan Jul 11, 2026
3750363
tabs置き換え
kurokuro-tyan Jul 11, 2026
4328879
clang-format
kurokuro-tyan Jul 11, 2026
8644510
とりあえず
kurokuro-tyan Jul 11, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
- uses: actions/setup-python@v4
with:
python-version: 3.x
- uses: pre-commit/action@v3.0.0
- uses: pre-commit/action@v3.0.1
92 changes: 46 additions & 46 deletions 0001-esb-nrf-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ index c0b661007..c2014c3ba 100644
--- a/drivers/usb/device/usb_dc_nrfx.c
+++ b/drivers/usb/device/usb_dc_nrfx.c
@@ -1075,7 +1075,9 @@ static void usbd_event_handler(nrfx_usbd_evt_t const *const p_event)
case NRFX_USBD_EVT_SOF:
if (IS_ENABLED(CONFIG_USB_DEVICE_SOF)) {
evt.evt_type = USBD_EVT_SOF;
- put_evt = true;
+ // put_evt = true;
+ extern uint32_t usb_sof_count;
+ usb_sof_count ++;
}
break;
case NRFX_USBD_EVT_SOF:
if (IS_ENABLED(CONFIG_USB_DEVICE_SOF)) {
evt.evt_type = USBD_EVT_SOF;
- put_evt = true;
+ // put_evt = true;
+ extern uint32_t usb_sof_count;
+ usb_sof_count ++;
}
break;

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index e3ce60282..5bfe7d38d 100644
Expand All @@ -38,77 +38,77 @@ index e3ce60282..5bfe7d38d 100644
ISR_DIRECT_DECLARE(radio_nrf5_isr)
+#endif /* !CONFIG_DYNAMIC_DIRECT_INTERRUPTS */
{
DEBUG_RADIO_ISR(1);
DEBUG_RADIO_ISR(1);

@@ -97,7 +101,9 @@ ISR_DIRECT_DECLARE(radio_nrf5_isr)
lll_prof_exit_radio();
lll_prof_exit_radio();

DEBUG_RADIO_ISR(0);
DEBUG_RADIO_ISR(0);
+#if !defined(CONFIG_DYNAMIC_DIRECT_INTERRUPTS)
return 1;
return 1;
+#endif /* !CONFIG_DYNAMIC_DIRECT_INTERRUPTS */
}

static void rtc0_nrf5_isr(const void *arg)
@@ -183,7 +189,27 @@ int lll_init(void)

/* Initialize SW IRQ structure */
hal_swi_init();
/* Initialize SW IRQ structure */
hal_swi_init();
+#if defined(CONFIG_DYNAMIC_INTERRUPTS)
+#if defined(CONFIG_DYNAMIC_DIRECT_INTERRUPTS)
+ ARM_IRQ_DIRECT_DYNAMIC_CONNECT(RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
+ IRQ_CONNECT_FLAGS, no_reschedule);
+ irq_connect_dynamic(RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
+ radio_nrf5_isr, NULL, IRQ_CONNECT_FLAGS);
+ ARM_IRQ_DIRECT_DYNAMIC_CONNECT(RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
+ IRQ_CONNECT_FLAGS, no_reschedule);
+ irq_connect_dynamic(RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
+ radio_nrf5_isr, NULL, IRQ_CONNECT_FLAGS);
+#else /* !CONFIG_DYNAMIC_DIRECT_INTERRUPTS */
+ IRQ_DIRECT_CONNECT(RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
+ radio_nrf5_isr, IRQ_CONNECT_FLAGS);
+ IRQ_DIRECT_CONNECT(RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
+ radio_nrf5_isr, IRQ_CONNECT_FLAGS);
+#endif /* !CONFIG_DYNAMIC_DIRECT_INTERRUPTS */
+ irq_connect_dynamic(RTC0_IRQn, CONFIG_BT_CTLR_ULL_HIGH_PRIO,
+ rtc0_nrf5_isr, NULL, 0U);
+ irq_connect_dynamic(HAL_SWI_RADIO_IRQ, CONFIG_BT_CTLR_LLL_PRIO,
+ swi_lll_nrf5_isr, NULL, IRQ_CONNECT_FLAGS);
+ irq_connect_dynamic(RTC0_IRQn, CONFIG_BT_CTLR_ULL_HIGH_PRIO,
+ rtc0_nrf5_isr, NULL, 0U);
+ irq_connect_dynamic(HAL_SWI_RADIO_IRQ, CONFIG_BT_CTLR_LLL_PRIO,
+ swi_lll_nrf5_isr, NULL, IRQ_CONNECT_FLAGS);
+#if defined(CONFIG_BT_CTLR_LOW_LAT) || \
+ (CONFIG_BT_CTLR_ULL_HIGH_PRIO != CONFIG_BT_CTLR_ULL_LOW_PRIO)
+ irq_connect_dynamic(HAL_SWI_JOB_IRQ, CONFIG_BT_CTLR_ULL_LOW_PRIO,
+ swi_ull_low_nrf5_isr, NULL, 0U);
+ (CONFIG_BT_CTLR_ULL_HIGH_PRIO != CONFIG_BT_CTLR_ULL_LOW_PRIO)
+ irq_connect_dynamic(HAL_SWI_JOB_IRQ, CONFIG_BT_CTLR_ULL_LOW_PRIO,
+ swi_ull_low_nrf5_isr, NULL, 0U);
+#endif

+#else /* !CONFIG_DYNAMIC_INTERRUPTS */
/* Connect ISRs */
IRQ_DIRECT_CONNECT(RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
radio_nrf5_isr, IRQ_CONNECT_FLAGS);
/* Connect ISRs */
IRQ_DIRECT_CONNECT(RADIO_IRQn, CONFIG_BT_CTLR_LLL_PRIO,
radio_nrf5_isr, IRQ_CONNECT_FLAGS);
@@ -196,7 +222,8 @@ int lll_init(void)
IRQ_CONNECT(HAL_SWI_JOB_IRQ, CONFIG_BT_CTLR_ULL_LOW_PRIO,
swi_ull_low_nrf5_isr, NULL, 0);
IRQ_CONNECT(HAL_SWI_JOB_IRQ, CONFIG_BT_CTLR_ULL_LOW_PRIO,
swi_ull_low_nrf5_isr, NULL, 0);
#endif
-
+#endif /* !CONFIG_DYNAMIC_INTERRUPTS */
+
/* Enable IRQs */
irq_enable(RADIO_IRQn);
irq_enable(RTC0_IRQn);
+
/* Enable IRQs */
irq_enable(RADIO_IRQn);
irq_enable(RTC0_IRQn);
diff --git a/subsys/bluetooth/services/bas.c b/subsys/bluetooth/services/bas.c
index cf6482d53..ead09c15a 100644
--- a/subsys/bluetooth/services/bas.c
+++ b/subsys/bluetooth/services/bas.c
@@ -95,5 +95,19 @@ int bt_bas_set_battery_level(uint8_t level)

return rc == -ENOTCONN ? 0 : rc;
return rc == -ENOTCONN ? 0 : rc;
}
+//add by cwl @2023/11/23
+int bt_bas_set_battery_level_fix(struct bt_conn *conn,uint8_t level)
+{
+ int rc;
+ battery_level = level;
+ if (level > 100U || conn ==NULL) {
+ if(level > 100U) battery_level =100;
+ return -EINVAL;
+ }
+ int rc;
+ battery_level = level;
+ if (level > 100U || conn ==NULL) {
+ if(level > 100U) battery_level =100;
+ return -EINVAL;
+ }
+
+ rc = bt_gatt_notify(conn, &bas.attrs[1], &level, sizeof(level));
+ rc = bt_gatt_notify(conn, &bas.attrs[1], &level, sizeof(level));
+
+ return rc == -ENOTCONN ? 0 : rc;
+ return rc == -ENOTCONN ? 0 : rc;
+}

SYS_INIT(bas_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
Expand Down
26 changes: 13 additions & 13 deletions app/boards/arm/keychron/keychron_z1-287f3d87.keymap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@
label ="user_custom";
#binding-cells =<1>;
};
keymap {
compatible = "zmk,keymap";
keymap {
compatible = "zmk,keymap";
//mac
default_layer {
bindings = <
Expand Down Expand Up @@ -232,14 +232,14 @@
>;
};
//win
layer_two {
bindings = <
&kp ESC &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp F13 &kp PSCRN &kp SLCK &kp PAUS &kp C_AL_CALC &uc LG(TAB) &uc LG(LC(LEFT)) &uc LG(LC(RIGHT)) //21
&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp BSPC &kp INS &kp HOME &kp PG_UP &kp KP_NLCK &kp KP_SLASH &kp KP_ASTERISK &kp KP_MINUS //42
&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 DEL &kp END &kp PG_DN &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_PLUS //63
&kp CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp NUHS &kp RET &kp KP_N4 &kp KP_N5 &kp KP_N6 //63+21-5
&kp LSHFT &kp NUBS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT &kp UP &kp KP_N1 &kp KP_N2 &kp KP_N3 //79+21-5
&kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &kp RGUI &mo 3 &kp RCTRL &kp LEFT &kp DOWN &kp RIGHT &kp KP_N0 &kp KP_DOT &kp KP_ENTER
layer_two {
bindings = <
&kp ESC &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp F13 &kp PSCRN &kp SLCK &kp PAUS &kp C_AL_CALC &uc LG(TAB) &uc LG(LC(LEFT)) &uc LG(LC(RIGHT)) //21
&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp BSPC &kp INS &kp HOME &kp PG_UP &kp KP_NLCK &kp KP_SLASH &kp KP_ASTERISK &kp KP_MINUS //42
&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 DEL &kp END &kp PG_DN &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_PLUS //63
&kp CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp NUHS &kp RET &kp KP_N4 &kp KP_N5 &kp KP_N6 //63+21-5
&kp LSHFT &kp NUBS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT &kp UP &kp KP_N1 &kp KP_N2 &kp KP_N3 //79+21-5
&kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &kp RGUI &mo 3 &kp RCTRL &kp LEFT &kp DOWN &kp RIGHT &kp KP_N0 &kp KP_DOT &kp KP_ENTER
//
&none &out OUT_BLE &out OUT_24G &out OUT_CHG &out OUT_CHGD
>;
Expand All @@ -260,9 +260,9 @@
};



};
};
};

24 changes: 12 additions & 12 deletions app/boards/shields/keychron/b1/jis/keychron_b1_jis.keymap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@
#binding-cells =<1>;
};

keymap {
compatible = "zmk,keymap";
keymap {
compatible = "zmk,keymap";
//mac
default_layer {
bindings = <
Expand Down Expand Up @@ -220,13 +220,13 @@
};
//win
layer_two {
bindings = <
&kp ESC &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp DEL
&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp INT3 &kp BSPC
&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 CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp NUHS &kp RET
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp INT1 &kp RSHFT
&kp LCTRL &kp LGUI &kp LALT &kp INT5 &kp SPACE &kp INT4 &kp RALT &mo 3 &kp LEFT &kp UP &kp DOWN &kp RIGHT
bindings = <
&kp ESC &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp DEL
&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp INT3 &kp BSPC
&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 CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp NUHS &kp RET
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp INT1 &kp RSHFT
&kp LCTRL &kp LGUI &kp LALT &kp INT5 &kp SPACE &kp INT4 &kp RALT &mo 3 &kp LEFT &kp UP &kp DOWN &kp RIGHT
//
&none &out OUT_BLE &out OUT_24G &out OUT_CHG &out OUT_CHGD
>;
Expand All @@ -247,9 +247,9 @@
};



};
};
};

24 changes: 12 additions & 12 deletions app/boards/shields/keychron/b1/uk/keychron_b1_uk.keymap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@
#binding-cells =<1>;
};

keymap {
compatible = "zmk,keymap";
keymap {
compatible = "zmk,keymap";
//mac
default_layer {
bindings = <
Expand Down Expand Up @@ -220,13 +220,13 @@
};
//win
layer_two {
bindings = <
&kp ESC &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp DEL
&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp BSPC
&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 CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp NUHS &kp RET
&kp LSHFT &kp NUBS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
&kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &mo 3 &kp LEFT &kp UP &kp DOWN &kp RIGHT
bindings = <
&kp ESC &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp DEL
&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp BSPC
&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 CLCK &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT &kp NUHS &kp RET
&kp LSHFT &kp NUBS &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
&kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &mo 3 &kp LEFT &kp UP &kp DOWN &kp RIGHT
//
&none &out OUT_BLE &out OUT_24G &out OUT_CHG &out OUT_CHGD
>;
Expand All @@ -247,9 +247,9 @@
};



};
};
};

Loading