kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'zmkfirmware:main' into leeloo_micro_v1_branch

Browse source
This commit is contained in:
ClicketySplit 2023-07-06 19:19:50 -06:00 • committed by GitHub
commit f8d6495b36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/boards/arm/pillbug/pillbug_defconfig
View file

@ -8,6 +8,9 @@ CONFIG_BOARD_PILLBUG=y
# Enable MPU # Enable MPU
CONFIG_ARM_MPU=y CONFIG_ARM_MPU=y
# Use pinctrl
CONFIG_PINCTRL=y
# enable GPIO # enable GPIO
CONFIG_GPIO=y CONFIG_GPIO=y

4
docs/docs/development/build-flash.md
View file

@ -130,8 +130,8 @@ The above build commands generate a UF2 file in `build/zephyr` (or
`build/left|right/zephyr` if you followed the instructions for splits) and is by `build/left|right/zephyr` if you followed the instructions for splits) and is by
default named `zmk.uf2`. If your board supports USB Flashing Format (UF2), copy default named `zmk.uf2`. If your board supports USB Flashing Format (UF2), copy
that file onto the root of the USB mass storage device for your board. The that file onto the root of the USB mass storage device for your board. The
controller should flash your built firmware and automatically restart once controller should flash your built firmware, unmount the USB storage device and
flashing is complete. automatically restart once flashing is complete.
Alternatively, if your board supports flashing and you're not developing from Alternatively, if your board supports flashing and you're not developing from
within a Dockerized environment, enable Device Firmware Upgrade (DFU) mode on within a Dockerized environment, enable Device Firmware Upgrade (DFU) mode on

5
docs/docs/user-setup.md
View file

@ -198,8 +198,9 @@ To flash the firmware, first put your board into bootloader mode by double click
or the one that is part of your keyboard). The controller should appear in your OS as a new USB storage device. or the one that is part of your keyboard). The controller should appear in your OS as a new USB storage device.
Once this happens, copy the correct UF2 file (e.g. left or right if working on a split), and paste it onto the root of that USB mass Once this happens, copy the correct UF2 file (e.g. left or right if working on a split), and paste it onto the root of that USB mass
storage device. Once the flash is complete, the controller should automatically restart, and load your newly flashed firmware. It is storage device. Once the flash is complete, the controller should unmount the USB storage, automatically restart and load your newly
recommended that you test your keyboard works over USB first to rule out hardware issues, before trying to connect to it wirelessly. flashed firmware. It is recommended that you test your keyboard works over USB first to rule out hardware issues, before trying to
connect to it wirelessly.
:::caution Split keyboards :::caution Split keyboards