diff options
| -rw-r--r-- | keyboards/ps2avrGB/config.h | 2 | ||||
| -rw-r--r-- | keyboards/ps2avrGB/matrix.c | 3 | ||||
| -rw-r--r-- | keyboards/ps2avrGB/ps2avrGB.h | 12 | ||||
| -rw-r--r-- | keyboards/ps2avrGB/rules.mk | 47 |
4 files changed, 27 insertions, 37 deletions
diff --git a/keyboards/ps2avrGB/config.h b/keyboards/ps2avrGB/config.h index cd5d1ab5a..dfaea5979 100644 --- a/keyboards/ps2avrGB/config.h +++ b/keyboards/ps2avrGB/config.h | |||
| @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 18 | #ifndef CONFIG_H | 18 | #ifndef CONFIG_H |
| 19 | #define CONFIG_H | 19 | #define CONFIG_H |
| 20 | 20 | ||
| 21 | #include "config_common.h" | ||
| 22 | |||
| 23 | #define VENDOR_ID 0x20A0 | 21 | #define VENDOR_ID 0x20A0 |
| 24 | #define PRODUCT_ID 0x422D | 22 | #define PRODUCT_ID 0x422D |
| 25 | // TODO: share these strings with usbconfig.h | 23 | // TODO: share these strings with usbconfig.h |
diff --git a/keyboards/ps2avrGB/matrix.c b/keyboards/ps2avrGB/matrix.c index e487ca182..beaa54c40 100644 --- a/keyboards/ps2avrGB/matrix.c +++ b/keyboards/ps2avrGB/matrix.c | |||
| @@ -100,6 +100,5 @@ inline matrix_row_t matrix_get_row(uint8_t row) { | |||
| 100 | return matrix[row]; | 100 | return matrix[row]; |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | void matrix_print(void) | 103 | void matrix_print(void) { |
| 104 | { | ||
| 105 | } | 104 | } |
diff --git a/keyboards/ps2avrGB/ps2avrGB.h b/keyboards/ps2avrGB/ps2avrGB.h index 1da26adb2..1527c604e 100644 --- a/keyboards/ps2avrGB/ps2avrGB.h +++ b/keyboards/ps2avrGB/ps2avrGB.h | |||
| @@ -17,20 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 17 | #ifndef KEYMAP_COMMON_H | 17 | #ifndef KEYMAP_COMMON_H |
| 18 | #define KEYMAP_COMMON_H | 18 | #define KEYMAP_COMMON_H |
| 19 | 19 | ||
| 20 | #include <stdint.h> | ||
| 21 | #include <stdbool.h> | ||
| 22 | #include "keycode.h" | 20 | #include "keycode.h" |
| 23 | #include "action.h" | 21 | #include "action.h" |
| 24 | #include "action_code.h" | ||
| 25 | #include "action_layer.h" | ||
| 26 | #include "action_macro.h" | ||
| 27 | #include "action_util.h" | ||
| 28 | #include "report.h" | ||
| 29 | #include "host.h" | ||
| 30 | #include "print.h" | ||
| 31 | #include "debug.h" | ||
| 32 | #include "keymap.h" | ||
| 33 | |||
| 34 | 22 | ||
| 35 | #define KEYMAP( \ | 23 | #define KEYMAP( \ |
| 36 | K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, \ | 24 | K05, K25, K35, K45, K55, K06, KA6, KA7, K07, KB5, KC5, KD5, KE5, KD1, KE1, KE2, \ |
diff --git a/keyboards/ps2avrGB/rules.mk b/keyboards/ps2avrGB/rules.mk index d747e8929..e2b5922ea 100644 --- a/keyboards/ps2avrGB/rules.mk +++ b/keyboards/ps2avrGB/rules.mk | |||
| @@ -1,38 +1,43 @@ | |||
| 1 | # Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> | ||
| 2 | # | ||
| 3 | # This program is free software: you can redistribute it and/or modify | ||
| 4 | # it under the terms of the GNU General Public License as published by | ||
| 5 | # the Free Software Foundation, either version 2 of the License, or | ||
| 6 | # (at your option) any later version. | ||
| 7 | # | ||
| 8 | # This program is distributed in the hope that it will be useful, | ||
| 9 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | # GNU General Public License for more details. | ||
| 12 | # | ||
| 13 | # You should have received a copy of the GNU General Public License | ||
| 14 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | |||
| 1 | # MCU name | 16 | # MCU name |
| 2 | MCU = atmega32a | 17 | MCU = atmega32a |
| 3 | |||
| 4 | PROTOCOL = VUSB | 18 | PROTOCOL = VUSB |
| 5 | 19 | ||
| 6 | # disable UART since atmega32a apparently doesn't have it | 20 | # unsupported features for now |
| 7 | NO_UART = yes | 21 | NO_UART = yes |
| 8 | # this simplifies things for now | ||
| 9 | NO_SUSPEND_POWER_DOWN = yes | 22 | NO_SUSPEND_POWER_DOWN = yes |
| 23 | BACKLIGHT_ENABLE = no | ||
| 10 | 24 | ||
| 11 | # Processor frequency. | 25 | # processor frequency |
| 12 | # Normally the first thing your program should do is set the clock prescaler, | ||
| 13 | # so your program will run at the correct speed. You should also set this | ||
| 14 | # variable to same clock speed. The _delay_ms() macro uses this, and many | ||
| 15 | # examples use this variable to calculate timings. Do not add a "UL" here. | ||
| 16 | F_CPU = 12000000 | 26 | F_CPU = 12000000 |
| 17 | 27 | ||
| 18 | # Build Options | 28 | # build options |
| 19 | # comment out to disable the options. | 29 | BOOTMAGIC_ENABLE = yes |
| 20 | # | 30 | MOUSEKEY_ENABLE = yes |
| 21 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration | 31 | EXTRAKEY_ENABLE = yes |
| 22 | MOUSEKEY_ENABLE = yes # Mouse keys | 32 | CONSOLE_ENABLE = yes |
| 23 | EXTRAKEY_ENABLE = yes # Audio control and System control | 33 | COMMAND_ENABLE = yes |
| 24 | CONSOLE_ENABLE = yes # Console for debug | ||
| 25 | COMMAND_ENABLE = yes # Commands for debug and configuration | ||
| 26 | #BACKLIGHT_ENABLE = yes | ||
| 27 | 34 | ||
| 28 | # V-USB debug level: To use ps2_usart.c level must be 0 | ||
| 29 | # ps2_usart.c requires USART to receive PS/2 signal. | ||
| 30 | OPT_DEFS = -DDEBUG_LEVEL=0 | 35 | OPT_DEFS = -DDEBUG_LEVEL=0 |
| 31 | OPS_DEFS += -DPROTOCOL_VUSB | ||
| 32 | OPT_DEFS += -DBOOTLOADER_SIZE=2048 | 36 | OPT_DEFS += -DBOOTLOADER_SIZE=2048 |
| 33 | 37 | ||
| 38 | # custom matrix setup | ||
| 34 | CUSTOM_MATRIX = yes | 39 | CUSTOM_MATRIX = yes |
| 35 | SRC = matrix.c | 40 | SRC = matrix.c |
| 36 | 41 | ||
| 37 | #---------------- Programming Options -------------------------- | 42 | # programming options |
| 38 | PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex | 43 | PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex |
