summaryrefslogtreecommitdiff
path: root/keyboard/atreus
diff options
context:
space:
mode:
Diffstat (limited to 'keyboard/atreus')
-rw-r--r--keyboard/atreus/Makefile4
-rw-r--r--keyboard/atreus/README.md4
-rw-r--r--keyboard/atreus/atreus.c8
-rw-r--r--keyboard/atreus/atreus.h4
-rw-r--r--keyboard/atreus/keymaps/default.c (renamed from keyboard/atreus/keymaps/keymap_default.c)0
-rw-r--r--keyboard/atreus/keymaps/gerb.c (renamed from keyboard/atreus/keymaps/keymap_gerb.c)0
6 files changed, 10 insertions, 10 deletions
diff --git a/keyboard/atreus/Makefile b/keyboard/atreus/Makefile
index 2e542d62ed..a6fddd70d2 100644
--- a/keyboard/atreus/Makefile
+++ b/keyboard/atreus/Makefile
@@ -53,9 +53,9 @@ TARGET_DIR = .
SRC = atreus.c
ifdef KEYMAP
- SRC := keymaps/keymap_$(KEYMAP).c $(SRC)
+ SRC := keymaps/$(KEYMAP).c $(SRC)
else
- SRC := keymaps/keymap_default.c $(SRC)
+ SRC := keymaps/default.c $(SRC)
endif
ifdef TEENSY2
diff --git a/keyboard/atreus/README.md b/keyboard/atreus/README.md
index 4db7ac1203..aacf2841f4 100644
--- a/keyboard/atreus/README.md
+++ b/keyboard/atreus/README.md
@@ -177,10 +177,10 @@ Depending on which keymap you would like to use, you will have to compile slight
To build with the default keymap, simply run `make`.
### Other Keymaps
-Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `keymap_<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
+Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files.
To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like:
```
$ make KEYMAP=[default|jack|<name>]
```
-Keymaps follow the format **__keymap\_\<name\>.c__** and are stored in the `keymaps` folder.
+Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
diff --git a/keyboard/atreus/atreus.c b/keyboard/atreus/atreus.c
index bfc893084f..9d1de631bb 100644
--- a/keyboard/atreus/atreus.c
+++ b/keyboard/atreus/atreus.c
@@ -1,16 +1,16 @@
#include "atreus.h"
__attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
// leave these blank
};
__attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
// leave these blank
};
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up
@@ -19,7 +19,7 @@ void * matrix_init_kb(void) {
}
};
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
// put your looping keyboard code here
// runs every cycle (a lot)
diff --git a/keyboard/atreus/atreus.h b/keyboard/atreus/atreus.h
index 9dd77859f9..8d5989e442 100644
--- a/keyboard/atreus/atreus.h
+++ b/keyboard/atreus/atreus.h
@@ -22,7 +22,7 @@
{ k2a, k30, k31, k32, k33, k34, k36, k37, k38, k39, k3a } \
}
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
#endif
diff --git a/keyboard/atreus/keymaps/keymap_default.c b/keyboard/atreus/keymaps/default.c
index 1c4280ff56..1c4280ff56 100644
--- a/keyboard/atreus/keymaps/keymap_default.c
+++ b/keyboard/atreus/keymaps/default.c
diff --git a/keyboard/atreus/keymaps/keymap_gerb.c b/keyboard/atreus/keymaps/gerb.c
index 1ba3942e3b..1ba3942e3b 100644
--- a/keyboard/atreus/keymaps/keymap_gerb.c
+++ b/keyboard/atreus/keymaps/gerb.c