Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
fauxpark
2022-08-20 10:55:40 +10:00
550 changed files with 1689 additions and 1819 deletions

View File

@@ -1,7 +1,13 @@
{
"keyboard_name": "namecard2x4",
"manufacturer": "takashiski",
"url": "https://skyhigh-works.hatenablog.com/",
"maintainer": "takashiski",
"usb": {
"vid": "0xFEED",
"pid": "0x0000",
"device_version": "0.0.1"
},
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {

View File

@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0000
#define DEVICE_VER 0x0001
#define MANUFACTURER takashiski
#define PRODUCT namecard2x4
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 4

View File

@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0000
#define DEVICE_VER 0x0001
#define MANUFACTURER takashiski
#define PRODUCT namecard2x4
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 4