diff options
| -rw-r--r-- | keyboards/handwired/promethium/config.h | 104 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/keymaps/priyadi/config.h | 2 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/keymaps/priyadi/keymap.c | 69 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/promethium.c | 4 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/promethium.h | 105 | 
5 files changed, 168 insertions, 116 deletions
| diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h index fd45c2bfe3..24f02993fb 100644 --- a/keyboards/handwired/promethium/config.h +++ b/keyboards/handwired/promethium/config.h @@ -152,6 +152,110 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  //#define NO_ACTION_MACRO  //#define NO_ACTION_FUNCTION +#define PS2_INIT_DELAY 2000 +#define BATTERY_PIN 9 +#define BATTERY_POLL 30000 +#define MAX_VOLTAGE 4.2 +#define MIN_VOLTAGE 3.2 + +#define KEYMAP( \ +    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ +    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ +    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ +    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c \ +) \ +{ \ +    {k11, k12, k13, k14, k15, k16}, \ +    {k21, k22, k23, k24, k25, k26}, \ +    {k31, k32, k33, k34, k35, k36}, \ +    {k41, k42, k43, k44, k45, k46}, \ +    {k17, k18, k19, k1a, k1b, k1c}, \ +    {k27, k28, k29, k2a, k2b, k2c}, \ +    {k37, k38, k39, k3a, k3b, k3c}, \ +    {k47, k48, k49, k4a, k4b, k4c} \ +} + +#ifndef __ASSEMBLER__ // assembler doesn't like enum in .h file +enum led_sequence { +  LED_IND_BLUETOOTH, +  LED_IND_USB, +  LED_IND_BATTERY, + +  LED_IND_FUN, +  LED_IND_NUM, +  LED_IND_EMOJI, + +  LED_BKSP, +  LED_ENT, +  LED_RSFT, +  LED_RCTL, + +  LED_RGUI, +  LED_SLSH, +  LED_SCLN, +  LED_P, + +  LED_O, +  LED_L, +  LED_DOT, +  LED_RALT, + +  LED_EMOJI, +  LED_COMM, +  LED_K, +  LED_I, + +  LED_U, +  LED_J, +  LED_M, +  LED_FUN, + +  LED_RSPC, +  LED_N, +  LED_HH, +  LED_Y, + +  LED_TRACKPOINT3, +  LED_TRACKPOINT2, +  LED_TRACKPOINT1, + +  LED_LSPC, +  LED_B, +  LED_G, +  LED_T, + +  LED_R, +  LED_F, +  LED_V, +  LED_NUM, + +  LED_PUNC, +  LED_C, +  LED_D, +  LED_E, + +  LED_W, +  LED_S, +  LED_X, +  LED_LALT, + +  LED_LGUI, +  LED_Z, +  LED_A, +  LED_Q, + +  LED_TAB, +  LED_ESC, +  LED_LSFT, +  LED_LCTL, + +  LED_TOTAL +}; + +#define RGB_DI_PIN B5 +#define RGBSPS_NUM LED_TOTAL +#endif +  /* PS/2 mouse */  #ifdef PS2_USE_BUSYWAIT  #   define PS2_CLOCK_PORT  PORTD diff --git a/keyboards/handwired/promethium/keymaps/priyadi/config.h b/keyboards/handwired/promethium/keymaps/priyadi/config.h index 00f9fed313..3f5dd5817d 100644 --- a/keyboards/handwired/promethium/keymaps/priyadi/config.h +++ b/keyboards/handwired/promethium/keymaps/priyadi/config.h @@ -14,8 +14,6 @@  #define PREVENT_STUCK_MODIFIERS  #define RGBSPS_ENABLE -#define RGB_DI_PIN B5 -#define RGBSPS_NUM 57  #define UNICODE_TYPE_DELAY 0 diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c index cdec187ee5..2c43f98847 100644 --- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c +++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c @@ -74,6 +74,7 @@ uint8_t glow_mode = GLOW_MIN;  void turn_off_capslock(void);  extern keymap_config_t keymap_config; +// layers, ordering is important!  enum layers {    _QWERTY,    _DVORAK, @@ -89,9 +90,10 @@ enum layers {    _FUN,    _PUNC, +  _EMPTY,    _EMOJI,    _GUI, -  _SYS, +  _SYS  };  // double-space layer @@ -130,6 +132,7 @@ enum planck_keycodes {    KEYCODE_END  }; +#define EMPTY MO(_EMPTY)  #define NUM MO(_NUM)  #define FUN MO(_FUN)  #define FUN0 LT(_FUN, KC_0) @@ -237,6 +240,11 @@ enum unicode_name {    LOMEG,    FSIGM, + +  LTEQ, +  GTEQ, +  NOTEQ, +  PLMIN,  };  const uint32_t PROGMEM unicode_map[] = { @@ -338,6 +346,12 @@ const uint32_t PROGMEM unicode_map[] = {    [LPSI] = 0x03C8,    [LOMEG] = 0x03C9,    [FSIGM] = 0x03C2, + +  // other +  [LTEQ] = 0x2264, // less than or equal +  [GTEQ] = 0x2265, // greater than or equal +  [NOTEQ] = 0x2260, // not equal +  [PLMIN] = 0xB1, // plus minus  };  // RGBSPS @@ -551,14 +565,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * |------+------+------+------+------+------|------+------+------+------+------+------|   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |   * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Func |Greek | GUI  |AltGr | Ctrl | + * | Ctrl | Alt  | GUI  | Punc | Num  |    Space    | Fun  |Greek | GUI  |AltGr | Ctrl |   * `-----------------------------------------------------------------------------------'   */  [_QWERTY] = KEYMAP(    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT ,    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, -  KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, NUM,     LSPACE,  RSPACE,  FUN,     GREEK,   KC_RGUI, KC_RALT, KC_RCTL +  KC_LCTL, KC_LALT, KC_LGUI, EMPTY,   NUM,     LSPACE,  RSPACE,  FUN,     GREEK,   KC_RGUI, KC_RALT, KC_RCTL  ),  /* Dvorak @@ -646,31 +660,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  /* Punc   * ,-----------------------------------------------------------------------------------. - * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  |   `  | + * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   ≤  |   ≥  |   `  |   * |------+------+------+------+------+-------------+------+------+------+------+------| - * |      |   *  |   \  |   -  |   =  |   /  |      |   (  |   )  |   <  |   >  |      | + * |      |   *  |   \  |   -  |   =  |   /  |   ≠  |   (  |   )  |   <  |   >  |      |   * |------+------+------+------+------+------|------+------+------+------+------+------| - * |   &  |   ^  |   |  |   _  |   +  |   ?  |      |   [  |   ]  |   {  |   }  |   :  | + * |   &  |   ^  |   |  |   _  |   +  |   ?  |   ±  |   [  |   ]  |   {  |   }  |   :  |   * |------+------+------+------+------+------+------+------+------+------+------+------|   * |      |      |      |      |      |             |      |      |      |      |      |   * `-----------------------------------------------------------------------------------'   */  [_PUNC] = KEYMAP( -  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, -  KC_GRV,  KC_ASTR, KC_BSLS, KC_MINS,  KC_EQL, KC_SLSH, XXXXXXX, KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______, -  KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, XXXXXXX, KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_COLN, +  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, X(LTEQ), X(GTEQ), _______, +  KC_GRV,  KC_ASTR, KC_BSLS, KC_MINS,  KC_EQL, KC_SLSH, X(NOTEQ),KC_LPRN, KC_RPRN, KC_LABK, KC_RABK, _______, +  KC_AMPR, KC_CIRC, KC_PIPE, KC_UNDS, KC_PLUS, KC_QUES, X(PLMIN),KC_LBRC, KC_RBRC, KC_LCBR, KC_RCBR, KC_COLN,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  ),  /* Num   * ,-----------------------------------------------------------------------------------. - * |   ~  |   !  |   @  |   #  |   $  |   %  |   A  |   7  |   8  |   9  |   D  |   `  | + * |   ~  |   !  |   @  |   #  |   $  |   %  |   A  |   7  |   8  |   9  |   D  |      |   * |------+------+------+------+------+-------------+------+------+------+------+------| - * |      |   *  |   \  |   -  |   =  |   /  |   B  |   4  |   5  |   6  |   E  |      | + * |   `  |   *  |   \  |   -  |   =  |   /  |   B  |   4  |   5  |   6  |   E  |      |   * |------+------+------+------+------+------|------+------+------+------+------+------|   * |   &  |   ^  |   |  |   _  |   +  |   ?  |   C  |   1  |   2  |   3  |   F  |  :   |   * |------+------+------+------+------+------+------+------+------+------+------+------| - * |      |      |      |      |      |      |   x  |   0  |   ,  |   .  |      |      | + * |      |      |      |      |      |      |      |   0  |   ,  |   .  |   x  |      |   * `-----------------------------------------------------------------------------------'   */  [_NUM] = KEYMAP( @@ -734,6 +748,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  ), +/* Empty + * ,-----------------------------------------------------------------------------------. + * |      |      |      |      |      |      |      |      |      |      |      |      | + * |------+------+------+------+------+-------------+------+------+------+------+------| + * |      |      |      |      |      |      |      |      |      |      |      |      | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |      |      |      |      |      |      |      |      |      |      |      |      | + * |------+------+------+------+------+------+------+------+------+------+------+------| + * |      |      |      |      |      |      |      |      |      |      |      |      | + * `-----------------------------------------------------------------------------------' + */ +[_EMPTY] = KEYMAP( +  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ +), +  /* Emoji   * ,-----------------------------------------------------------------------------------.   * |      |      |      |      |      |      |      |      |      |      |      |      | @@ -749,7 +781,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    X(HART2), X(CRY2),X(WEARY),X(EYERT),X(SMIRK), X(TJOY),X(RECYC),X(UNAMU),X(MUSIC),X(OKHND),X(PENSV), X(PHEW),    X(THMUP), X(PRAY),X(SMILE),X(SMIL2),X(FLUSH), X(GRIN),X(HEART),  X(BYE), X(KISS),X(CELEB), X(COOL),X(NOEVS),    X(THMDN),X(SLEEP), X(CLAP),  X(CRY),  X(VIC),X(BHART),  X(SUN),X(SMEYE), X(WINK), X(MOON),X(CONFU),X(NOEVH), -    X(POO), X(EYES), _______,X(HUNRD), X(SKULL),X(HORNS), X(HALO), X(FEAR),X(YUMMY),_______,X(DISAP),X(NOEVK) +    X(POO), X(EYES), X(HUNRD),_______, X(SKULL),X(HORNS), X(HALO), X(FEAR),_______,X(YUMMY),X(DISAP),X(NOEVK)  ),  /* GUI @@ -788,6 +820,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______  ), +  };  void persistant_default_layer_set(uint16_t default_layer) { @@ -831,6 +864,16 @@ uint32_t layer_state_set_kb(uint32_t state)    } else {      state &= ~(1UL<<_PUNC);    } + +  // turn on emoji layer if empty and greek layer are on +  if ( +    (state & ((1UL<<_EMPTY) | (1UL<<_GREEKU))) == ((1UL<<_EMPTY) | (1UL<<_GREEKU)) +    || (state & ((1UL<<_EMPTY) | (1UL<<_GREEKL))) == ((1UL<<_EMPTY) | (1UL<<_GREEKL)) +  ) { +    state |= (1UL<<_EMOJI); +  } else { +    state &= ~(1UL<<_EMOJI); +  }    return state;  } diff --git a/keyboards/handwired/promethium/promethium.c b/keyboards/handwired/promethium/promethium.c index 62e2281fac..4943f8c9fc 100644 --- a/keyboards/handwired/promethium/promethium.c +++ b/keyboards/handwired/promethium/promethium.c @@ -36,3 +36,7 @@ void led_set_kb(uint8_t usb_led) {      led_set_user(usb_led);  } +__attribute__ ((weak)) +void led_set_user(uint8_t usb_led) { +} + diff --git a/keyboards/handwired/promethium/promethium.h b/keyboards/handwired/promethium/promethium.h index caad5258e4..260f140c55 100644 --- a/keyboards/handwired/promethium/promethium.h +++ b/keyboards/handwired/promethium/promethium.h @@ -1,107 +1,10 @@  #ifndef PROMETHIUM_H  #define PROMETHIUM_H -#include "quantum.h" +#include "stdint.h" -#define PS2_INIT_DELAY 2000 -#define BATTERY_PIN 9 -#define BATTERY_POLL 30000 -#define MAX_VOLTAGE 4.2 -#define MIN_VOLTAGE 3.2 - -#define KEYMAP( \ -    k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ -    k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ -    k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ -    k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c \ -) \ -{ \ -    {k11, k12, k13, k14, k15, k16}, \ -    {k21, k22, k23, k24, k25, k26}, \ -    {k31, k32, k33, k34, k35, k36}, \ -    {k41, k42, k43, k44, k45, k46}, \ -    {k17, k18, k19, k1a, k1b, k1c}, \ -    {k27, k28, k29, k2a, k2b, k2c}, \ -    {k37, k38, k39, k3a, k3b, k3c}, \ -    {k47, k48, k49, k4a, k4b, k4c} \ -} - - - -enum led_sequence { -  LED_IND_BLUETOOTH, -  LED_IND_USB, -  LED_IND_BATTERY, - -  LED_IND_FUN, -  LED_IND_NUM, -  LED_IND_EMOJI, - -  LED_BKSP, -  LED_ENT, -  LED_RSFT, -  LED_RCTL, - -  LED_RGUI, -  LED_SLSH, -  LED_SCLN, -  LED_P, - -  LED_O, -  LED_L, -  LED_DOT, -  LED_RALT, - -  LED_EMOJI, -  LED_COMM, -  LED_K, -  LED_I, - -  LED_U, -  LED_J, -  LED_M, -  LED_FUN, - -  LED_RSPC, -  LED_N, -  LED_HH, -  LED_Y, - -  LED_TRACKPOINT3, -  LED_TRACKPOINT2, -  LED_TRACKPOINT1, - -  LED_LSPC, -  LED_B, -  LED_G, -  LED_T, - -  LED_R, -  LED_F, -  LED_V, -  LED_NUM, - -  LED_PUNC, -  LED_C, -  LED_D, -  LED_E, - -  LED_W, -  LED_S, -  LED_X, -  LED_LALT, - -  LED_LGUI, -  LED_Z, -  LED_A, -  LED_Q, - -  LED_TAB, -  LED_ESC, -  LED_LSFT, -  LED_LCTL, -}; +void battery_poll(uint8_t level); +void led_set_kb(uint8_t usb_led); +void led_set_user(uint8_t usb_led);  #endif - -void battery_poll(uint8_t level);
\ No newline at end of file | 
