fixes s60_x keyboard

example_keyboards
Jack Humbert 8 years ago
parent 43aa59c703
commit d1d2b87f97

@ -1 +0,0 @@
#include "s60-x.h"

@ -32,6 +32,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 5 #define MATRIX_ROWS 5
#define MATRIX_COLS 15 #define MATRIX_COLS 15
/* number of backlight levels */
#define BACKLIGHT_PIN B7
#ifdef BACKLIGHT_PIN
#define BACKLIGHT_LEVELS 3
#endif
/* COL2ROW or ROW2COL */ /* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW
@ -43,4 +49,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
) )
#ifdef SUBPROJECT_default
#include "default/config.h"
#endif
#ifdef SUBPROJECT_rgb
#include "rgb/config.h"
#endif
#endif #endif

@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "s60-x.h" #include "s60_x.h"
//make keymap a little easier to read //make keymap a little easier to read
#define _______ KC_TRNS #define _______ KC_TRNS

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
/* Main layer: Test layout, using all keys. /* Main layer: Test layout, using all keys.

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
#define _DEFAULT 0 #define _DEFAULT 0
#define _FN 1 #define _FN 1
@ -73,12 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
) )
}; };
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
keyevent_t event = record->event;
switch (id) {
}
return MACRO_NONE; return MACRO_NONE;
} }
@ -108,42 +103,58 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
switch (id) { switch (id) {
case RGBLED_TOGGLE: case RGBLED_TOGGLE:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef RGB_ENABLE
rgblight_toggle(); rgblight_toggle();
#endif
} }
break; break;
case RGBLED_INCREASE_HUE: case RGBLED_INCREASE_HUE:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef RGB_ENABLE
rgblight_increase_hue(); rgblight_increase_hue();
#endif
} }
break; break;
case RGBLED_DECREASE_HUE: case RGBLED_DECREASE_HUE:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef RGB_ENABLE
rgblight_decrease_hue(); rgblight_decrease_hue();
#endif
} }
break; break;
case RGBLED_INCREASE_SAT: case RGBLED_INCREASE_SAT:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef RGB_ENABLE
rgblight_increase_sat(); rgblight_increase_sat();
#endif
} }
break; break;
case RGBLED_DECREASE_SAT: case RGBLED_DECREASE_SAT:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef RGB_ENABLE
rgblight_decrease_sat(); rgblight_decrease_sat();
#endif
} }
break; break;
case RGBLED_INCREASE_VAL: case RGBLED_INCREASE_VAL:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef RGB_ENABLE
rgblight_increase_val(); rgblight_increase_val();
#endif
} }
break; break;
case RGBLED_DECREASE_VAL: case RGBLED_DECREASE_VAL:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef RGB_ENABLE
rgblight_decrease_val(); rgblight_decrease_val();
#endif
} }
break; break;
case RGBLED_STEP_MODE: case RGBLED_STEP_MODE:
if (record->event.pressed) { if (record->event.pressed) {
#ifdef RGB_ENABLE
rgblight_step(); rgblight_step();
#endif
} }
break; break;
} }

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
/* 0: Main layer /* 0: Main layer

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
/* /*
* Hasu * Hasu

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
/* /*
* HHKB Layout * HHKB Layout

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
/* 0: Main layer /* 0: Main layer

@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "s60-x.h" #include "s60_x.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Layout 0: Default Layer /* Layout 0: Default Layer

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
/* Main layer: /* Main layer:

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* 0: qwerty /* 0: qwerty

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
// Poker fix with toggle and bit operation // Poker fix with toggle and bit operation
// Fn + Esc = ` // Fn + Esc = `

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
// Poker fix with set(state transition) // Poker fix with set(state transition)
// Fn + Esc = ` // Fn + Esc = `

@ -1,4 +1,4 @@
#include "s60-x.h" #include "s60_x.h"
/* /*
* SpaceFN * SpaceFN

@ -5,11 +5,6 @@ DIY compact keyboard designed by VinnyCordeiro for Sentraq. Most of the keymaps
## S60X Resources ## S60X Resources
- [Massdrop page](https://www.massdrop.com/buy/sentraq-60-diy-keyboard-kit?mode=guest_open) - [Massdrop page](https://www.massdrop.com/buy/sentraq-60-diy-keyboard-kit?mode=guest_open)
## Quickstart
If you just want to test a few layouts, the archive [s60-x_precompiled.zip](s60-x_precompiled.zip) contains pre-compiled .hex-files for all available keymaps. Not all of them are tested.
You only need to flash them onto your keyboard, which is explained below, there's no need to setup a build environment. For a full list
## Flashing your keyboard ## Flashing your keyboard
The recommended programs for flashing your keyboard are [Atmel FLIP](http://www.atmel.com/tools/FLIP.aspx) (Windows) and [dfu-programmer](http://dfu-programmer.sourceforge.net/) (Linux/Windows). The recommended programs for flashing your keyboard are [Atmel FLIP](http://www.atmel.com/tools/FLIP.aspx) (Windows) and [dfu-programmer](http://dfu-programmer.sourceforge.net/) (Linux/Windows).

@ -11,12 +11,6 @@
#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 } #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 }
#define UNUSED_PINS #define UNUSED_PINS
/* number of backlight levels */
#define BACKLIGHT_PIN B7
#ifdef BACKLIGHT_PIN
#define BACKLIGHT_LEVELS 3
#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE #define LOCKING_SUPPORT_ENABLE

@ -0,0 +1 @@
#include "s60_x.h"
Loading…
Cancel
Save