Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
@@ -8,8 +8,6 @@
|
||||
#define MANUFACTURER meagerfindings
|
||||
#undef PRODUCT
|
||||
#define PRODUCT ErgoDox
|
||||
#undef DESCRIPTION
|
||||
#define DESCRIPTION meagerfindings firmware for Ergodox
|
||||
|
||||
#define USB_MAX_POWER_CONSUMPTION 500
|
||||
|
||||
|
@@ -10,7 +10,4 @@
|
||||
//last 5 elements not tested
|
||||
#define MATRIX_COL_PINS { C6, D7, B5, B6, B7, D6, C7, F0, F1, F4, B1, B2, B3, D2, D3 }
|
||||
|
||||
//get rid of description - too long to show properly in Windows
|
||||
#undef DESCRIPTION
|
||||
#define DESCRIPTION
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user