diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 07c609e3..377f5527 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -6,7 +6,7 @@ "${workspaceFolder}/**" ], "defines": [], - "compilerPath": "/usr/bin/gcc", + "compilerPath": "/msys64/mingw64/bin/gcc.exe", "cStandard": "gnu17", "cppStandard": "c++17", "intelliSenseMode": "linux-gcc-arm", diff --git a/.vscode/settings.json b/.vscode/settings.json index ac7bfe94..07c2eca1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,9 @@ "*.keymap": "dts", "peripheral_status.h": "c" }, - "python.formatting.provider": "black" + "python.formatting.provider": "black", + + "[yaml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } } \ No newline at end of file diff --git a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2.zmk.yml b/app/boards/arm/corne-ish_zen/corne-ish_zen_v2.zmk.yml index facc9eb9..d72a52ee 100644 --- a/app/boards/arm/corne-ish_zen/corne-ish_zen_v2.zmk.yml +++ b/app/boards/arm/corne-ish_zen/corne-ish_zen_v2.zmk.yml @@ -13,4 +13,3 @@ outputs: siblings: - corneish_zen_left - corneish_zen_right - diff --git a/app/package-lock.json b/app/package-lock.json index afd730a5..ed8765f3 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -9,27 +9,30 @@ "version": "1.0.0", "license": "MIT", "devDependencies": { - "prettier": "^2.4.0" + "prettier": "^2.7.1" } }, "node_modules/prettier": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz", - "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", "dev": true, "bin": { "prettier": "bin-prettier.js" }, "engines": { "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } } }, "dependencies": { "prettier": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz", - "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", "dev": true } } diff --git a/app/package.json b/app/package.json index e75d9695..9ad28788 100644 --- a/app/package.json +++ b/app/package.json @@ -18,6 +18,6 @@ }, "homepage": "https://zmk.dev/", "devDependencies": { - "prettier": "^2.4.0" + "prettier": "^2.7.1" } -} \ No newline at end of file +}