Merge branch 'zmkfirmware:main' into sofle-bongo-cat-update

This commit is contained in:
Chatblanc77 2022-10-29 17:45:58 +07:00 committed by GitHub
commit dce2fe97ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8444 additions and 6967 deletions

View file

@ -21,6 +21,10 @@ Variations of the warnings shown below occur when flashing the `<firmware>.uf2`
| :--------------------------------------------------------------------------: |
| An example of the file transfer error on MacOS |
### MacOS Ventura error
MacOS 13.0 (Ventura) Finder running on Apple silicon hardware may report an error code 100093 when copying `<firmware>.uf2` files into microcontrollers. This bug is limited to the operating system's Finder. You can work around it by copying on Terminal command line or use a third party file manager.
### CMake Error
An error along the lines of `CMake Error at (zmk directory)/zephyr/cmake/generic_toolchain.cmake:64 (include): include could not find load file:` during firmware compilation indicates that the Zephyr Environment Variables are not properly defined.

15369
docs/package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -3,7 +3,7 @@
"version": "0.0.0",
"private": true,
"scripts": {
"start": "docusaurus start",
"start": "docusaurus start --host 0.0.0.0",
"build": "docusaurus build",
"serve": "docusaurus serve",
"swizzle": "docusaurus swizzle",
@ -15,8 +15,8 @@
"typecheck": "tsc"
},
"dependencies": {
"@docusaurus/core": "^2.0.0-beta.21",
"@docusaurus/preset-classic": "^2.0.0-beta.21",
"@docusaurus/core": "^2.1.0",
"@docusaurus/preset-classic": "^2.1.0",
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.18",
@ -43,16 +43,16 @@
]
},
"devDependencies": {
"@docusaurus/module-type-aliases": "^2.0.0-beta.21",
"@docusaurus/types": "^2.0.0-beta.21",
"@docusaurus/module-type-aliases": "^2.1.0",
"@docusaurus/types": "^2.1.0",
"@tsconfig/docusaurus": "^1.0.5",
"@types/js-yaml": "^4.0.5",
"@types/react": "^17.0.3",
"@types/react-helmet": "^6.1.5",
"@types/react-router-dom": "^5.1.7",
"eslint": "^7.32.0",
"eslint": "^8.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-mdx": "^1.17.0",
"eslint-plugin-mdx": "^2.0.5",
"eslint-plugin-react": "^7.30.0",
"json-schema-to-typescript": "^10.1.5",
"mustache": "^4.2.0",

View file

@ -34,7 +34,7 @@ function CustomBoardForm({
<div className="profilerInput">
<label>
Output Voltage{" "}
<span tooltip="Output Voltage of the PSU used by the system">
<span data-tooltip="Output Voltage of the PSU used by the system">
</span>
</label>
@ -45,7 +45,7 @@ function CustomBoardForm({
<div className="profilerInput">
<label>
PSU Efficiency{" "}
<span tooltip="The estimated efficiency with a VIN of 3.8 and the output voltage entered above">
<span data-tooltip="The estimated efficiency with a VIN of 3.8 and the output voltage entered above">
</span>
</label>
@ -64,7 +64,7 @@ function CustomBoardForm({
<div className="profilerInput">
<label>
PSU Quiescent{" "}
<span tooltip="The standby usage of the PSU"></span>
<span data-tooltip="The standby usage of the PSU"></span>
</label>
<div className="inputBox">
<input {...bindQuiescentMicroA} type="number" />
@ -74,7 +74,7 @@ function CustomBoardForm({
<div className="profilerInput">
<label>
Other Quiescent{" "}
<span tooltip="Any other standby usage of the board (voltage dividers, extra ICs, etc)">
<span data-tooltip="Any other standby usage of the board (voltage dividers, extra ICs, etc)">
</span>
</label>

View file

@ -26,12 +26,12 @@
font-size: 14px;
}
span[tooltip] {
span[data-tooltip] {
position: relative;
}
span[tooltip]::before {
content: attr(tooltip);
span[data-tooltip]::before {
content: attr(data-tooltip);
font-size: 13px;
padding: 5px 10px;
position: absolute;
@ -47,7 +47,7 @@ span[tooltip]::before {
left: 50%;
}
span[tooltip]::after {
span[data-tooltip]::after {
content: "";
position: absolute;
border-top: 8px solid var(--ifm-background-surface-color);
@ -62,12 +62,12 @@ span[tooltip]::after {
left: 50%;
}
span[tooltip]:hover::before {
span[data-tooltip]:hover::before {
opacity: 1;
visibility: visible;
}
span[tooltip]:hover::after {
span[data-tooltip]:hover::after {
opacity: 1;
visibility: visible;
}

View file

@ -155,7 +155,7 @@ function PowerProfiler() {
<div className="profilerInput">
<label>
Bonded Bluetooth Profiles{" "}
<span tooltip="The average number of host devices connected at once">
<span data-tooltip="The average number of host devices connected at once">
</span>
</label>
@ -167,7 +167,7 @@ function PowerProfiler() {
<div className="profilerInput">
<label>
Percentage Asleep{" "}
<span tooltip="How much time the keyboard is in deep sleep (15 min. default timeout)">
<span data-tooltip="How much time the keyboard is in deep sleep (15 min. default timeout)">
</span>
</label>