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

This commit is contained in:
QMK Bot
2021-01-18 01:50:00 +00:00
93 changed files with 0 additions and 97 deletions

View File

@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MACOSX
/* USB Device descriptor parameter */
#ifndef DESCRIPTION
#define DESCRIPTION QMK keyboard firmware for Ergodox EZ
#endif
#define USB_MAX_POWER_CONSUMPTION 500
#define QMK_KEYS_PER_SCAN 4