make astyle

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
pull/389/head
Gergely Nagy 7 years ago
parent 559bfa0881
commit b7415039cb

@ -39,21 +39,21 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
Key_Keymap1), Key_Keymap1),
[1] = KEYMAP_STACKED [1] = KEYMAP_STACKED
( XXX ,XXX ,XXX ,XXX ,XXX ,XXX ,S(N6) (XXX, XXX, XXX, XXX, XXX, XXX, S(N6),
,XXX ,S(N1) ,S(N2) ,S(N3) ,S(N4) ,S(N5) ,S(ST1) XXX, S(N1), S(N2), S(N3), S(N4), S(N5), S(ST1),
,S(FN) ,S(S1) ,S(TL) ,S(PL) ,S(HL) ,S(ST1) S(FN), S(S1), S(TL), S(PL), S(HL), S(ST1),
,S(PWR) ,S(S2) ,S(KL) ,S(WL) ,S(RL) ,S(ST2) ,S(ST2) S(PWR), S(S2), S(KL), S(WL), S(RL), S(ST2), S(ST2),
,S(RE1) ,XXX ,S(A) ,S(O) S(RE1), XXX, S(A), S(O),
,___ ___,
,S(N7) ,XXX ,XXX ,XXX ,XXX ,XXX ,XXX S(N7), XXX, XXX, XXX, XXX, XXX, XXX,
,S(ST3) ,S(N8) ,S(N9) ,S(NA) ,S(NB) ,S(NC) ,XXX S(ST3), S(N8), S(N9), S(NA), S(NB), S(NC), XXX,
,S(ST3) ,S(FR) ,S(PR) ,S(LR) ,S(TR) ,S(DR) S(ST3), S(FR), S(PR), S(LR), S(TR), S(DR),
,S(ST4) ,S(ST4) ,S(RR) ,S(BR) ,S(GR) ,S(SR) ,S(ZR) S(ST4), S(ST4), S(RR), S(BR), S(GR), S(SR), S(ZR),
,S(E) ,S(U) ,XXX ,S(RE2) S(E), S(U), XXX, S(RE2),
,___), ___),
}; };
void setup() { void setup() {

@ -21,14 +21,14 @@
namespace kaleidoscope { namespace kaleidoscope {
namespace steno { namespace steno {
uint8_t GeminiPR::keys_held_; uint8_t GeminiPR::keys_held_;
uint8_t GeminiPR::state_[6]; uint8_t GeminiPR::state_[6];
void GeminiPR::begin(void) { void GeminiPR::begin(void) {
Kaleidoscope.useEventHandlerHook(eventHandlerHook); Kaleidoscope.useEventHandlerHook(eventHandlerHook);
} }
Key GeminiPR::eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_state) { Key GeminiPR::eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_state) {
if (mapped_key < geminipr::START || if (mapped_key < geminipr::START ||
mapped_key > geminipr::END) mapped_key > geminipr::END)
return mapped_key; return mapped_key;
@ -49,7 +49,7 @@ namespace steno {
} }
return Key_NoKey; return Key_NoKey;
} }
} }
} }

@ -25,7 +25,7 @@
namespace kaleidoscope { namespace kaleidoscope {
namespace steno { namespace steno {
class GeminiPR : public KaleidoscopePlugin { class GeminiPR : public KaleidoscopePlugin {
public: public:
GeminiPR(void) {}; GeminiPR(void) {};
@ -36,10 +36,10 @@ namespace steno {
static uint8_t state_[6]; static uint8_t state_[6];
static Key eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_state); static Key eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_state);
}; };
namespace geminipr { namespace geminipr {
enum { enum {
START = kaleidoscope::ranges::STENO_START, START = kaleidoscope::ranges::STENO_START,
FN = START, FN = START,
NUM, NUM,
@ -89,8 +89,8 @@ namespace steno {
NC, NC,
ZR, ZR,
END = ZR, END = ZR,
}; };
} }
} }
} }

Loading…
Cancel
Save