Browse Source
[Keyboard] Panc60 Refactor (#5559)
* remove unneeded uart setting * use pragma once everywhere * remove custom matrix support * fixup readme * set bootmagic to lite * remove dependency on custom i2c code * use the right header files and function callspull/5582/head
MechMerlin
5 years ago
committed by
Drashna Jaelre
Drashna Jaelre
9 changed files with 11 additions and 296 deletions
Split View
Diff Options
-
+0 -2keyboards/panc60/config.h
-
+0 -106keyboards/panc60/i2c.c
-
+0 -27keyboards/panc60/i2c.h
-
+0 -145keyboards/panc60/matrix.c
-
+2 -2keyboards/panc60/panc60.c
-
+1 -4keyboards/panc60/panc60.h
-
+5 -3keyboards/panc60/readme.md
-
+2 -3keyboards/panc60/rules.mk
-
+1 -4keyboards/panc60/usbconfig.h
+ 0
- 2
keyboards/panc60/config.h
View File
+ 0
- 106
keyboards/panc60/i2c.c
View File
| @ -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; | |||
| } | |||
+ 0
- 27
keyboards/panc60/i2c.h
View File
| @ -1,27 +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 | |||
| #ifndef __I2C_H__ | |||
| #define __I2C_H__ | |||
| 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); | |||
| #endif | |||
+ 0
- 145
keyboards/panc60/matrix.c
View File
| @ -1,145 +0,0 @@ | |||
| /* | |||
| Copyright 2018 Jack Humbert <jack.humb@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/>. | |||
| */ | |||
| #include <avr/io.h> | |||
| #include <util/delay.h> | |||
| #include <string.h> | |||
| #include "matrix.h" | |||
| #ifndef DEBOUNCE | |||
| # define DEBOUNCE 5 | |||
| #endif | |||
| __attribute__ ((weak)) | |||
| void matrix_init_kb(void) { | |||
| matrix_init_user(); | |||
| } | |||
| __attribute__ ((weak)) | |||
| void matrix_scan_kb(void) { | |||
| matrix_scan_user(); | |||
| } | |||
| __attribute__ ((weak)) | |||
| void matrix_init_user(void) { } | |||
| __attribute__ ((weak)) | |||
| void matrix_scan_user(void) { } | |||
| // #define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } | |||
| // #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } | |||
| static uint8_t debouncing = DEBOUNCE; | |||
| static matrix_row_t matrix[MATRIX_ROWS]; | |||
| static matrix_row_t matrix_debouncing[MATRIX_ROWS]; | |||
| void matrix_init(void) { | |||
| // disables JTAG so we can use them as columns | |||
| MCUCSR = (1<<JTD); | |||
| MCUCSR = (1<<JTD); | |||
| // rows (output) | |||
| DDRB |= ((1 << 3) | (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)); | |||
| PORTB |= ((1 << 3) | (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)); | |||
| // cols (input) | |||
| DDRA &= ~((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)); | |||
| DDRC &= ~((1 << 7) | (1 << 6) | (1 << 5) | (1 << 4) | (1 << 3) | (1 << 2)); | |||
| DDRD &= ~((1 << 7)); | |||
| // pull-up cols | |||
| PORTA |= ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7)); | |||
| PORTC |= ((1 << 7) | (1 << 6) | (1 << 5) | (1 << 4) | (1 << 3) | (1 << 2)); | |||
| PORTD |= ((1 << 7)); | |||
| // initialize matrix state: all keys off | |||
| for (uint8_t row = 0; row < MATRIX_ROWS; row++) { | |||
| matrix[row] = 0x00; | |||
| matrix_debouncing[row] = 0x00; | |||
| } | |||
| matrix_init_quantum(); | |||
| } | |||
| uint8_t matrix_scan(void) { | |||
| // actual matrix scan | |||
| for (uint8_t c = 0; c < MATRIX_ROWS; c++) { | |||
| switch (c) { | |||
| case 0: PORTB &= ~(1 << 3); break; | |||
| case 1: PORTB &= ~(1 << 4); break; | |||
| case 2: PORTB &= ~(1 << 5); break; | |||
| case 3: PORTB &= ~(1 << 6); break; | |||
| case 4: PORTB &= ~(1 << 7); break; | |||
| } | |||
| _delay_us(5); | |||
| matrix_row_t current_row = ( | |||
| (((PINA & (1 << 0)) ? 0 : 1 ) << 0) | | |||
| (((PINA & (1 << 1)) ? 0 : 1 ) << 1) | | |||
| (((PINA & (1 << 2)) ? 0 : 1 ) << 2) | | |||
| (((PINA & (1 << 3)) ? 0 : 1 ) << 3) | | |||
| (((PINA & (1 << 4)) ? 0 : 1 ) << 4) | | |||
| (((PINA & (1 << 5)) ? 0 : 1 ) << 5) | | |||
| (((PINA & (1 << 6)) ? 0 : 1 ) << 6) | | |||
| (((PINA & (1 << 7)) ? 0 : 1 ) << 7) | | |||
| (((PINC & (1 << 7)) ? 0 : 1 ) << 8) | | |||
| (((PINC & (1 << 6)) ? 0 : 1 ) << 9) | | |||
| (((PINC & (1 << 5)) ? 0 : 1 ) << 10) | | |||
| (((PINC & (1 << 4)) ? 0 : 1 ) << 11) | | |||
| (((PINC & (1 << 3)) ? 0 : 1 ) << 12) | | |||
| (((PINC & (1 << 2)) ? 0 : 1 ) << 13) | | |||
| (((PIND & (1 << 7)) ? 0 : 1 ) << 14) | |||
| ); | |||
| switch (c) { | |||
| case 0: PORTB |= (1 << 3); break; | |||
| case 1: PORTB |= (1 << 4); break; | |||
| case 2: PORTB |= (1 << 5); break; | |||
| case 3: PORTB |= (1 << 6); break; | |||
| case 4: PORTB |= (1 << 7); break; | |||
| } | |||
| if (matrix_debouncing[c] != current_row) { | |||
| matrix_debouncing[c] = current_row; | |||
| debouncing = DEBOUNCE; | |||
| } | |||
| } | |||
| if (debouncing) { | |||
| if (--debouncing) { | |||
| _delay_ms(1); | |||
| } else { | |||
| for (uint8_t i = 0; i < MATRIX_ROWS; i++) { | |||
| matrix[i] = matrix_debouncing[i]; | |||
| } | |||
| } | |||
| } | |||
| matrix_scan_quantum(); | |||
| return 1; | |||
| } | |||
| inline matrix_row_t matrix_get_row(uint8_t row) { | |||
| return matrix[row]; | |||
| } | |||
| void matrix_print(void) { | |||
| } | |||