Skip to content

Commit

Permalink
Merge branch 'main' into pi
Browse files Browse the repository at this point in the history
  • Loading branch information
dreipunkteinsvier committed Jul 2, 2024
2 parents a41737a + b851268 commit a2fa13a
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 16 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
name: Build

env:
config-path: zmk-config
name: le_chiff_ble build

on:
push:
paths:
- ".github/workflows/build.yml"
- "zmk-config/**"
pull_request:
paths:
- ".github/workflows/build.yml"
- "zmk-config/**"
workflow_dispatch:
schedule:
- cron: '0 0 * * 0'

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
board: [ "le_chiff_ble" ]
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ config I2C
config SSD1306
default y

config SSD1306_REVERSE_MODE
default y


endif # ZMK_DISPLAY

if LVGL
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
board_runner_args(nrfjprog "--nrf-family=NRF52" "--softreset")
include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)
include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@
status = "okay";

compatible = "nordic,nrf-twi";
sda-pin = <24>;
scl-pin = <22>;
pinctrl-0 = <&i2c0_default>;
pinctrl-1 = <&i2c0_sleep>;
pinctrl-names = "default", "sleep";
oled: ssd1306@3c {
compatible = "solomon,ssd1306fb";
reg = <0x3c>;
Expand All @@ -122,6 +123,24 @@
com-invdir;
com-sequential;
prechargep = <0x22>;
inversion-on;
};
};

&pinctrl {
i2c0_default: i2c0_default {
group1 {
psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
<NRF_PSEL(TWIM_SCL, 0, 22)>;
};
};

i2c0_sleep: i2c0_sleep {
group1 {
psels = <NRF_PSEL(TWIM_SDA, 0, 24)>,
<NRF_PSEL(TWIM_SCL, 0, 22)>;
low-power-enable;
};
};
};

Expand Down
File renamed without changes.

0 comments on commit a2fa13a

Please sign in to comment.