From 44435d74447df0b190e02201181416d3d4b8cdff Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Sat, 6 Apr 2019 18:30:15 -0700 Subject: [PATCH 1/5] remove custom i2c code in favor of QMK i2c_master --- keyboards/exclusive/e6v2/bmc/bmc.c | 4 +- keyboards/exclusive/e6v2/bmc/i2c.c | 106 -------------------------- keyboards/exclusive/e6v2/bmc/i2c.h | 24 ------ keyboards/exclusive/e6v2/bmc/rules.mk | 2 +- 4 files changed, 3 insertions(+), 133 deletions(-) delete mode 100644 keyboards/exclusive/e6v2/bmc/i2c.c delete mode 100644 keyboards/exclusive/e6v2/bmc/i2c.h diff --git a/keyboards/exclusive/e6v2/bmc/bmc.c b/keyboards/exclusive/e6v2/bmc/bmc.c index e3dd244c51..257b68b8b4 100644 --- a/keyboards/exclusive/e6v2/bmc/bmc.c +++ b/keyboards/exclusive/e6v2/bmc/bmc.c @@ -15,7 +15,7 @@ */ #include "bmc.h" #include "rgblight.h" -#include "i2c.h" +#include "i2c_master.h" void matrix_init_kb(void) { // put your keyboard start-up code here @@ -57,7 +57,7 @@ void rgblight_set(void) { } i2c_init(); - i2c_send(0xb0, (uint8_t*)led, 3 * RGBLED_NUM); + i2c_transmit(0xb0, (uint8_t*)led, 3 * RGBLED_NUM, 100); } #endif diff --git a/keyboards/exclusive/e6v2/bmc/i2c.c b/keyboards/exclusive/e6v2/bmc/i2c.c deleted file mode 100644 index 801242e0d0..0000000000 --- a/keyboards/exclusive/e6v2/bmc/i2c.c +++ /dev/null @@ -1,106 +0,0 @@ -/* -Copyright 2016 Luiz Ribeiro - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -// Please do not modify this file - -#include -#include - -#include "i2c.h" - -void i2c_set_bitrate(uint16_t bitrate_khz) { - uint8_t bitrate_div = ((F_CPU / 1000l) / bitrate_khz); - if (bitrate_div >= 16) { - bitrate_div = (bitrate_div - 16) / 2; - } - TWBR = bitrate_div; -} - -void i2c_init(void) { - // set pull-up resistors on I2C bus pins - PORTC |= 0b11; - - i2c_set_bitrate(400); - - // enable TWI (two-wire interface) - TWCR |= (1 << TWEN); - - // enable TWI interrupt and slave address ACK - TWCR |= (1 << TWIE); - TWCR |= (1 << TWEA); -} - -uint8_t i2c_start(uint8_t address) { - // reset TWI control register - TWCR = 0; - - // begin transmission and wait for it to end - TWCR = (1< - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -// Please do not modify this file - -#pragma once - -void i2c_init(void); -void i2c_set_bitrate(uint16_t bitrate_khz); -uint8_t i2c_send(uint8_t address, uint8_t *data, uint16_t length); \ No newline at end of file diff --git a/keyboards/exclusive/e6v2/bmc/rules.mk b/keyboards/exclusive/e6v2/bmc/rules.mk index 7c3e16b154..59f98e6f4b 100644 --- a/keyboards/exclusive/e6v2/bmc/rules.mk +++ b/keyboards/exclusive/e6v2/bmc/rules.mk @@ -85,6 +85,6 @@ AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) -SRC += i2c.c +SRC += i2c_master.c PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex From f6c305ba52f68880585af3cc6c1642a4d76deb7e Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Sat, 6 Apr 2019 18:31:00 -0700 Subject: [PATCH 2/5] clean up config file --- keyboards/exclusive/e6v2/bmc/config.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/keyboards/exclusive/e6v2/bmc/config.h b/keyboards/exclusive/e6v2/bmc/config.h index aae4d56dd9..44e77f6981 100644 --- a/keyboards/exclusive/e6v2/bmc/config.h +++ b/keyboards/exclusive/e6v2/bmc/config.h @@ -45,13 +45,9 @@ along with this program. If not, see . #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, C2, C3, C4, C5, D7 } #define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 6 #define RGBLIGHT_ANIMATIONS -#define NO_UART 1 -#define BOOTLOADHID_BOOTLOADER 1 - -// Set bootmagic lite key to the key commonly programmed as Esc. +// Set bootmagic lite key to the key commonly programmed as Esc. #define BOOTMAGIC_LITE_ROW 5 -#define BOOTMAGIC_LITE_COLUMN 0 \ No newline at end of file +#define BOOTMAGIC_LITE_COLUMN 0 From 8173db634daa0eaa6cfe7dc5a556ff2193ec078f Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Sat, 6 Apr 2019 18:31:36 -0700 Subject: [PATCH 3/5] fix pyusb install instructions --- keyboards/exclusive/e6v2/bmc/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/exclusive/e6v2/bmc/readme.md b/keyboards/exclusive/e6v2/bmc/readme.md index 3e2d19748d..a19a523ada 100644 --- a/keyboards/exclusive/e6v2/bmc/readme.md +++ b/keyboards/exclusive/e6v2/bmc/readme.md @@ -34,9 +34,9 @@ macOS: ``` 3. Install the following packages: ``` - brew install python + brew install python3 pip3 install pyusb - brew install --HEAD`https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb + brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb 4. Place your keyboard into reset. 5. Flash the board by typing `bootloadHID -r` followed by the path to your `.hex` file. From 0baa1e2b2fe8e7918e26edac12bb4a6e2e151b1d Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Sat, 6 Apr 2019 18:33:32 -0700 Subject: [PATCH 4/5] fix naming in usbconfig.h --- keyboards/exclusive/e6v2/bmc/usbconfig.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/exclusive/e6v2/bmc/usbconfig.h b/keyboards/exclusive/e6v2/bmc/usbconfig.h index c52c90ce8a..f22f2b631d 100644 --- a/keyboards/exclusive/e6v2/bmc/usbconfig.h +++ b/keyboards/exclusive/e6v2/bmc/usbconfig.h @@ -240,8 +240,8 @@ section at the end of this file). #define USB_CFG_DEVICE_VERSION 0x00, 0x02 /* Version number of the device: Minor number first, then major number. */ -#define USB_CFG_VENDOR_NAME 'G', 'r', 'a', 'y', ' ', 'S', 't', 'u', 'd', 'i', 'o' -#define USB_CFG_VENDOR_NAME_LEN 11 +#define USB_CFG_VENDOR_NAME 'E', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e' +#define USB_CFG_VENDOR_NAME_LEN 9 /* These two values define the vendor name returned by the USB device. The name * must be given as a list of characters under single quotes. The characters * are interpreted as Unicode (UTF-16) entities. @@ -250,7 +250,7 @@ section at the end of this file). * obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for * details. */ -#define USB_CFG_DEVICE_NAME 'H', 'B', '8', '5' +#define USB_CFG_DEVICE_NAME 'E', '6', 'V', '2' #define USB_CFG_DEVICE_NAME_LEN 4 /* Same as above for the device name. If you don't want a device name, undefine * the macros. See the file USB-IDs-for-free.txt before you assign a name if From 1b9f82c8445368dce0e0ada9af1f43956093fa98 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Sat, 6 Apr 2019 19:24:41 -0700 Subject: [PATCH 5/5] disable bootmagic as it does not work for bmc boards --- keyboards/exclusive/e6v2/bmc/config.h | 4 ---- keyboards/exclusive/e6v2/bmc/readme.md | 2 +- keyboards/exclusive/e6v2/bmc/rules.mk | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/keyboards/exclusive/e6v2/bmc/config.h b/keyboards/exclusive/e6v2/bmc/config.h index 44e77f6981..7c6fcccdb9 100644 --- a/keyboards/exclusive/e6v2/bmc/config.h +++ b/keyboards/exclusive/e6v2/bmc/config.h @@ -47,7 +47,3 @@ along with this program. If not, see . #define RGBLED_NUM 6 #define RGBLIGHT_ANIMATIONS - -// Set bootmagic lite key to the key commonly programmed as Esc. -#define BOOTMAGIC_LITE_ROW 5 -#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/exclusive/e6v2/bmc/readme.md b/keyboards/exclusive/e6v2/bmc/readme.md index a19a523ada..b69ac792cf 100644 --- a/keyboards/exclusive/e6v2/bmc/readme.md +++ b/keyboards/exclusive/e6v2/bmc/readme.md @@ -14,7 +14,7 @@ Flashing ps2avr(GB) boards use an atmega32a microcontroller and a different bootloader. It is not flashable using the regular QMK methods. -**Reset Key:** Hold down the key located at `K00`, commonly programmed as left control while plugging in the keyboard. You may also hold down the key located at `K50`, commonly programmed as the escape key. +**Reset Key:** Hold down the key located at `K00`, commonly programmed as left control while plugging in the keyboard. Windows: 1. Download [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash). diff --git a/keyboards/exclusive/e6v2/bmc/rules.mk b/keyboards/exclusive/e6v2/bmc/rules.mk index 59f98e6f4b..885bce2453 100644 --- a/keyboards/exclusive/e6v2/bmc/rules.mk +++ b/keyboards/exclusive/e6v2/bmc/rules.mk @@ -66,7 +66,7 @@ BOOTLOADER = bootloadHID # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000) +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400)