diff options
| -rw-r--r-- | keyboards/donutcables/budget96/budget96.c | 4 | ||||
| -rw-r--r-- | keyboards/donutcables/budget96/config.h | 6 | ||||
| -rw-r--r-- | keyboards/donutcables/budget96/i2c.c | 106 | ||||
| -rw-r--r-- | keyboards/donutcables/budget96/i2c.h | 24 | ||||
| -rw-r--r-- | keyboards/donutcables/budget96/readme.md | 4 | ||||
| -rw-r--r-- | keyboards/donutcables/budget96/rules.mk | 4 | 
6 files changed, 6 insertions, 142 deletions
| diff --git a/keyboards/donutcables/budget96/budget96.c b/keyboards/donutcables/budget96/budget96.c index 966dd4c129..7831a91f52 100644 --- a/keyboards/donutcables/budget96/budget96.c +++ b/keyboards/donutcables/budget96/budget96.c @@ -25,7 +25,7 @@  #include <avr/pgmspace.h>  #include "action_layer.h" -#include "i2c.h" +#include "i2c_master.h"  #include "quantum.h"  __attribute__ ((weak)) @@ -45,7 +45,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/donutcables/budget96/config.h b/keyboards/donutcables/budget96/config.h index 369cbdd07b..74661d828c 100644 --- a/keyboards/donutcables/budget96/config.h +++ b/keyboards/donutcables/budget96/config.h @@ -39,9 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define NO_BACKLIGHT_CLOCK  #define BACKLIGHT_LEVELS 1  #define RGBLIGHT_ANIMATIONS - -// Set bootmagic lite key to the key commonly programmed as Esc.  -#define BOOTMAGIC_LITE_ROW 5 -#define BOOTMAGIC_LITE_COLUMN 0  - -/* key combination for command */ diff --git a/keyboards/donutcables/budget96/i2c.c b/keyboards/donutcables/budget96/i2c.c deleted file mode 100644 index e8c4455ad1..0000000000 --- a/keyboards/donutcables/budget96/i2c.c +++ /dev/null @@ -1,106 +0,0 @@ -/* -Copyright 2016 Luiz Ribeiro <luizribeiro@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -// Please do not modify this file - -#include <avr/io.h> -#include <util/twi.h> - -#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<<TWINT) | (1<<TWSTA) | (1<<TWEN); -    while (!(TWCR & (1<<TWINT))); - -    // check if the start condition was successfully transmitted -    if ((TWSR & 0xF8) != TW_START) { -        return 1; -    } - -    // transmit address and wait -    TWDR = address; -    TWCR = (1<<TWINT) | (1<<TWEN); -    while (!(TWCR & (1<<TWINT))); - -    // check if the device has acknowledged the READ / WRITE mode -    uint8_t twst = TW_STATUS & 0xF8; -    if ((twst != TW_MT_SLA_ACK) && (twst != TW_MR_SLA_ACK)) { -        return 1; -    } - -    return 0; -} - -void i2c_stop(void) { -    TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO); -} - -uint8_t i2c_write(uint8_t data) { -    TWDR = data; - -    // transmit data and wait -    TWCR = (1<<TWINT) | (1<<TWEN); -    while (!(TWCR & (1<<TWINT))); - -    if ((TWSR & 0xF8) != TW_MT_DATA_ACK) { -        return 1; -    } - -    return 0; -} - -uint8_t i2c_send(uint8_t address, uint8_t *data, uint16_t length) { -    if (i2c_start(address)) { -        return 1; -    } - -    for (uint16_t i = 0; i < length; i++) { -        if (i2c_write(data[i])) { -            return 1; -        } -    } - -    i2c_stop(); - -    return 0; -} diff --git a/keyboards/donutcables/budget96/i2c.h b/keyboards/donutcables/budget96/i2c.h deleted file mode 100644 index aecc2c05ac..0000000000 --- a/keyboards/donutcables/budget96/i2c.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2016 Luiz Ribeiro <luizribeiro@gmail.com> - -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 <http://www.gnu.org/licenses/>. -*/ - -// 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); diff --git a/keyboards/donutcables/budget96/readme.md b/keyboards/donutcables/budget96/readme.md index e44b9a3e72..70e4d3afba 100644 --- a/keyboards/donutcables/budget96/readme.md +++ b/keyboards/donutcables/budget96/readme.md @@ -12,7 +12,7 @@ Make example for this keyboard (after setting up your build environment):  Flashing -**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 `Esc` key.  +**Reset Key:** Hold down the key located at `K00`, commonly programmed as left control while plugging in the keyboard.  ps2avr(GB) boards use an atmega32a microcontroller and a different bootloader. It is not flashable using the regular QMK methods.  @@ -34,7 +34,7 @@ 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 diff --git a/keyboards/donutcables/budget96/rules.mk b/keyboards/donutcables/budget96/rules.mk index e25b037279..67697ac733 100644 --- a/keyboards/donutcables/budget96/rules.mk +++ b/keyboards/donutcables/budget96/rules.mk @@ -31,7 +31,7 @@ F_CPU = 12000000  BOOTLOADER = bootloadHID  # build options -BOOTMAGIC_ENABLE = lite +BOOTMAGIC_ENABLE = no  MOUSEKEY_ENABLE = yes  EXTRAKEY_ENABLE = yes  CONSOLE_ENABLE = yes @@ -43,7 +43,7 @@ RGBLIGHT_CUSTOM_DRIVER = yes  OPT_DEFS = -DDEBUG_LEVEL=0  # custom matrix setup -SRC = i2c.c +SRC = i2c_master.c  # programming options  PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex | 
