diff options
Diffstat (limited to 'keyboards/ergotaco')
| -rw-r--r-- | keyboards/ergotaco/keymaps/default/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/ergotaco/matrix.c | 31 | ||||
| -rw-r--r-- | keyboards/ergotaco/rules.mk | 20 |
3 files changed, 10 insertions, 47 deletions
diff --git a/keyboards/ergotaco/keymaps/default/rules.mk b/keyboards/ergotaco/keymaps/default/rules.mk index e394fbf1e6..870d047dc9 100644 --- a/keyboards/ergotaco/keymaps/default/rules.mk +++ b/keyboards/ergotaco/keymaps/default/rules.mk @@ -1,9 +1,3 @@ -#---------------------------------------------------------------------------- -# make ergotaco:default:dfu -# Make sure you have dfu-programmer installed! -#---------------------------------------------------------------------------- -# Firmware options - #Debug options VERBOSE = yes DEBUG_MATRIX_SCAN_RATE = no diff --git a/keyboards/ergotaco/matrix.c b/keyboards/ergotaco/matrix.c index f7ceb194ad..e28f754e67 100644 --- a/keyboards/ergotaco/matrix.c +++ b/keyboards/ergotaco/matrix.c @@ -26,9 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "debug.h" #include "util.h" #include QMK_KEYBOARD_H -#ifdef DEBUG_MATRIX_SCAN_RATE -#include "timer.h" -#endif #ifndef DEBOUNCE # define DEBOUNCE 5 @@ -70,12 +67,6 @@ static void select_row(uint8_t row); static uint8_t mcp23018_reset_loop; // static uint16_t mcp23018_reset_loop; -#ifdef DEBUG_MATRIX_SCAN_RATE -uint32_t matrix_timer; -uint32_t matrix_scan_count; -#endif - - __attribute__ ((weak)) void matrix_init_user(void) {} @@ -121,10 +112,6 @@ void matrix_init(void) } } -#ifdef DEBUG_MATRIX_SCAN_RATE - matrix_timer = timer_read32(); - matrix_scan_count = 0; -#endif matrix_init_quantum(); } @@ -138,12 +125,6 @@ void matrix_power_up(void) { for (uint8_t i=0; i < MATRIX_ROWS; i++) { matrix[i] = 0; } - -#ifdef DEBUG_MATRIX_SCAN_RATE - matrix_timer = timer_read32(); - matrix_scan_count = 0; -#endif - } // Returns a matrix_row_t whose bits are set if the corresponding key should be @@ -192,18 +173,6 @@ uint8_t matrix_scan(void) } } -#ifdef DEBUG_MATRIX_SCAN_RATE - matrix_scan_count++; - uint32_t timer_now = timer_read32(); - if (TIMER_DIFF_32(timer_now, matrix_timer)>1000) { - print("matrix scan frequency: "); - pdec(matrix_scan_count); - print("\n"); - - matrix_timer = timer_now; - matrix_scan_count = 0; - } -#endif for (uint8_t i = 0; i < MATRIX_ROWS_PER_SIDE; i++) { select_row(i); // and select on left hand diff --git a/keyboards/ergotaco/rules.mk b/keyboards/ergotaco/rules.mk index 0af3e34740..cd8ebc58f0 100644 --- a/keyboards/ergotaco/rules.mk +++ b/keyboards/ergotaco/rules.mk @@ -1,15 +1,15 @@ -#---------------------------------------------------------------------------- -# make ergotaco:default:dfu -# Make sure you have dfu-programmer installed! -# Do not edit this file! Make a copy of keymaps/default and modify that! -#---------------------------------------------------------------------------- - -# Hardware info +# MCU name MCU = atmega32u4 -F_CPU = 16000000 -ARCH = AVR8 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp BOOTLOADER = atmel-dfu -F_USB = $(F_CPU) CUSTOM_MATRIX = yes EXTRAKEY_ENABLE = yes |