Add Danish keymap and sendstring LUT (#8218)

* uart.c fix from TMK

Backport from tmk/tmk_keyboard@c41e48a0ab

* Avoid deadlock when uart.c is usind in ISR

Backport from tmk/tmk_keyboard@55443fabb7

keyboards/cannonkeys/satisfaction75/config.h

@@ -35,8 +35,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B3, B4, A0, A2, A4, A3 }
 #define DIODE_DIRECTION COL2ROW
 
-#define ENCODERS_PAD_A { B9 }
+#define ENCODERS_PAD_A { B8 }
-#define ENCODERS_PAD_B { B8 }
+#define ENCODERS_PAD_B { B9 }
+
+#define ENCODER_RESOLUTION 2
 
 //LEDS A6, RGB B15
 #define BACKLIGHT_LEVELS 24

quantum/keymap_extras/keymap_danish.h

@@ -0,0 +1,153 @@
+/* Copyright 2019
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "keymap.h"
+
+// clang-format off
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ ½ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ + │ ´ │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Å │ ¨ │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Æ │ Ø │ ' │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+// Row 1
+#define DK_HALF KC_GRV  // ½
+#define DK_1    KC_1    // 1
+#define DK_2    KC_2    // 2
+#define DK_3    KC_3    // 3
+#define DK_4    KC_4    // 4
+#define DK_5    KC_5    // 5
+#define DK_6    KC_6    // 6
+#define DK_7    KC_7    // 7
+#define DK_8    KC_8    // 8
+#define DK_9    KC_9    // 9
+#define DK_0    KC_0    // 0
+#define DK_PLUS KC_MINS // +
+#define DK_ACUT KC_EQL  // ´ (dead)
+// Row 2
+#define DK_Q    KC_Q    // Q
+#define DK_W    KC_W    // W
+#define DK_E    KC_E    // E
+#define DK_R    KC_R    // R
+#define DK_T    KC_T    // T
+#define DK_Y    KC_Y    // Y
+#define DK_U    KC_U    // U
+#define DK_I    KC_I    // I
+#define DK_O    KC_O    // O
+#define DK_P    KC_P    // P
+#define DK_ARNG KC_LBRC // Å
+#define DK_DIAE KC_RBRC // ¨ (dead)
+// Row 3
+#define DK_A    KC_A    // A
+#define DK_S    KC_S    // S
+#define DK_D    KC_D    // D
+#define DK_F    KC_F    // F
+#define DK_G    KC_G    // G
+#define DK_H    KC_H    // H
+#define DK_J    KC_J    // J
+#define DK_K    KC_K    // K
+#define DK_L    KC_L    // L
+#define DK_AE   KC_SCLN // Æ
+#define DK_OSTR KC_QUOT // Ø
+#define DK_QUOT KC_NUHS // '
+// Row 4
+#define DK_LABK KC_NUBS // <
+#define DK_Z    KC_Z    // Z
+#define DK_X    KC_X    // X
+#define DK_C    KC_C    // C
+#define DK_V    KC_V    // V
+#define DK_B    KC_B    // B
+#define DK_N    KC_N    // N
+#define DK_M    KC_M    // M
+#define DK_COMM KC_COMM // ,
+#define DK_DOT  KC_DOT  // .
+#define DK_MINS KC_SLSH // -
+
+/* Shifted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │ § │ ! │ " │ # │ ¤ │ % │ & │ / │ ( │ ) │ = │ ? │ ` │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │ ^ │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │   │   │   │   │   │   │   │   │   │   │   │ * │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │ > │   │   │   │   │   │   │   │ ; │ : │ _ │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+// Row 1
+#define DK_SECT S(DK_HALF) // §
+#define DK_EXLM S(DK_1)    // !
+#define DK_DQUO S(DK_2)    // "
+#define DK_HASH S(DK_3)    // #
+#define DK_CURR S(DK_4)    // ¤
+#define DK_PERC S(DK_5)    // %
+#define DK_AMPR S(DK_6)    // &
+#define DK_SLSH S(DK_7)    // /
+#define DK_LPRN S(DK_8)    // (
+#define DK_RPRN S(DK_9)    // )
+#define DK_EQL  S(DK_0)    // =
+#define DK_QUES S(DK_PLUS) // ?
+#define DK_GRV  S(DK_ACUT) // ` (dead)
+// Row 2
+#define DK_CIRC S(DK_DIAE) // ^ (dead)
+// Row 3
+#define DK_ASTR S(DK_QUOT) // *
+// Row 4
+#define DK_RABK S(DK_LABK) // >
+#define DK_SCLN S(DK_COMM) // ;
+#define DK_COLN S(DK_DOT)  // :
+#define DK_UNDS S(DK_MINS) // _
+
+/* AltGr symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │   │   │ @ │ £ │ $ │ € │   │ { │ [ │ ] │ } │   │ | │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │ ~ │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
+ * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │    │ \ │   │   │   │   │   │   │ µ │   │   │   │          │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+// Row 1
+#define DK_AT   ALGR(DK_2)    // @
+#define DK_PND  ALGR(DK_3)    // £
+#define DK_DLR  ALGR(DK_4)    // $
+#define DK_EURO ALGR(DK_5)    // €
+#define DK_LCBR ALGR(DK_7)    // {
+#define DK_LBRC ALGR(DK_8)    // [
+#define DK_RBRC ALGR(DK_9)    // ]
+#define DK_RCBR ALGR(DK_0)    // }
+#define DK_PIPE ALGR(DK_ACUT) // |
+// Row 2
+#define DK_TILD ALGR(DK_DIAE) // ~ (dead)
+// Row 4
+#define DK_BSLS ALGR(DK_LABK) // (backslash)
+#define DK_MICR ALGR(DK_M)    // µ

quantum/keymap_extras/sendstring_danish.h

@@ -0,0 +1,99 @@
+/* Copyright 2019
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Sendstring lookup tables for Danish layouts
+
+#pragma once
+
+#include "keymap_danish.h"
+
+// clang-format off
+
+const bool ascii_to_shift_lut[128] PROGMEM = {
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+
+    0, 1, 1, 1, 0, 1, 1, 0,
+    1, 1, 1, 0, 0, 0, 0, 1,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 1, 0, 1, 1, 1,
+    0, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 0, 0, 0, 1, 1,
+    1, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0
+};
+
+const bool ascii_to_altgr_lut[128] PROGMEM = {
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+
+    0, 0, 0, 0, 1, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    1, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 1, 1, 1, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 1, 1, 1, 1, 0
+};
+
+const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
+    // NUL   SOH      STX      ETX      EOT      ENQ      ACK      BEL
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // BS    TAB      LF       VT       FF       CR       SO       SI
+    KC_BSPC, KC_TAB,  KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // DLE   DC1      DC2      DC3      DC4      NAK      SYN      ETB
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    // CAN   EM       SUB      ESC      FS       GS       RS       US
+    XXXXXXX, XXXXXXX, XXXXXXX, KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+
+    //       !        "        #        $        %        &        '
+    KC_SPC,  DK_1,    DK_2,    DK_3,    DK_4,    DK_5,    DK_6,    DK_QUOT,
+    // (     )        *        +        ,        -        .        /
+    DK_8,    DK_9,    DK_QUOT, DK_PLUS, DK_COMM, DK_MINS, DK_DOT,  DK_7,
+    // 0     1        2        3        4        5        6        7
+    DK_0,    DK_1,    DK_2,    DK_3,    DK_4,    DK_5,    DK_6,    DK_7,
+    // 8     9        :        ;        <        =        >        ?
+    DK_8,    DK_9,    DK_DOT,  DK_COMM, DK_LABK, DK_0,    DK_LABK, DK_PLUS,
+    // @     A        B        C        D        E        F        G
+    DK_2,    DK_A,    DK_B,    DK_C,    DK_D,    DK_E,    DK_F,    DK_G,
+    // H     I        J        K        L        M        N        O
+    DK_H,    DK_I,    DK_J,    DK_K,    DK_L,    DK_M,    DK_N,    DK_O,
+    // P     Q        R        S        T        U        V        W
+    DK_P,    DK_Q,    DK_R,    DK_S,    DK_T,    DK_U,    DK_V,    DK_W,
+    // X     Y        Z        [        \        ]        ^        _
+    DK_X,    DK_Y,    DK_Z,    DK_8,    DK_LABK, DK_9,    DK_DIAE, DK_MINS,
+    // `     a        b        c        d        e        f        g
+    DK_ACUT, DK_A,    DK_B,    DK_C,    DK_D,    DK_E,    DK_F,    DK_G,
+    // h     i        j        k        l        m        n        o
+    DK_H,    DK_I,    DK_J,    DK_K,    DK_L,    DK_M,    DK_N,    DK_O,
+    // p     q        r        s        t        u        v        w
+    DK_P,    DK_Q,    DK_R,    DK_S,    DK_T,    DK_U,    DK_V,    DK_W,
+    // x     y        z        {        |        }        ~        DEL
+    DK_X,    DK_Y,    DK_Z,    DK_7,    DK_ACUT, DK_0,    DK_DIAE, KC_DEL
+};

tmk_core/common/uart.c

@@ -31,9 +31,41 @@
 
 #include "uart.h"
 
+#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__)
+#    define UDRn UDR0
+#    define UBRRn UBRR0
+#    define UCSRnA UCSR0A
+#    define UCSRnB UCSR0B
+#    define UCSRnC UCSR0C
+#    define U2Xn U2X0
+#    define RXENn RXEN0
+#    define TXENn TXEN0
+#    define RXCIEn RXCIE0
+#    define UCSZn1 UCSZ01
+#    define UCSZn0 UCSZ00
+#    define UDRIEn UDRIE0
+#    define UDRE_vect USART_UDRE_vect
+#    define RX_vect USART_RX_vect
+#elif defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega32U2__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
+#    define UDRn UDR1
+#    define UBRRn UBRR1
+#    define UCSRnA UCSR1A
+#    define UCSRnB UCSR1B
+#    define UCSRnC UCSR1C
+#    define U2Xn U2X1
+#    define RXENn RXEN1
+#    define TXENn TXEN1
+#    define RXCIEn RXCIE1
+#    define UCSZn1 UCSZ11
+#    define UCSZn0 UCSZ10
+#    define UDRIEn UDRIE1
+#    define UDRE_vect USART1_UDRE_vect
+#    define RX_vect USART1_RX_vect
+#endif
+
 // These buffers may be any size from 2 to 256 bytes.
 #define RX_BUFFER_SIZE 64
-#define TX_BUFFER_SIZE 40
+#define TX_BUFFER_SIZE 256
 
 static volatile uint8_t tx_buffer[TX_BUFFER_SIZE];
 static volatile uint8_t tx_buffer_head;
@@ -45,10 +77,10 @@ static volatile uint8_t rx_buffer_tail;
 // Initialize the UART
 void uart_init(uint32_t baud) {
     cli();
-    UBRR0          = (F_CPU / 4 / baud - 1) / 2;
+    UBRRn          = (F_CPU / 4 / baud - 1) / 2;
-    UCSR0A         = (1 << U2X0);
+    UCSRnA         = (1 << U2Xn);
-    UCSR0B         = (1 << RXEN0) | (1 << TXEN0) | (1 << RXCIE0);
+    UCSRnB         = (1 << RXENn) | (1 << TXENn) | (1 << RXCIEn);
-    UCSR0C         = (1 << UCSZ01) | (1 << UCSZ00);
+    UCSRnC         = (1 << UCSZn1) | (1 << UCSZn0);
     tx_buffer_head = tx_buffer_tail = 0;
     rx_buffer_head = rx_buffer_tail = 0;
     sei();
@@ -60,12 +92,14 @@ void uart_putchar(uint8_t c) {
 
     i = tx_buffer_head + 1;
     if (i >= TX_BUFFER_SIZE) i = 0;
+    // return immediately to avoid deadlock when interrupt is disabled(called from ISR)
+    if (tx_buffer_tail == i && (SREG & (1 << SREG_I)) == 0) return;
     while (tx_buffer_tail == i)
         ;  // wait until space in buffer
     // cli();
     tx_buffer[i]   = c;
     tx_buffer_head = i;
-    UCSR0B         = (1 << RXEN0) | (1 << TXEN0) | (1 << RXCIE0) | (1 << UDRIE0);
+    UCSRB          = (1 << RXENn) | (1 << TXENn) | (1 << RXCIEn) | (1 << UDRIEn);
     // sei();
 }
 
@@ -95,12 +129,12 @@ uint8_t uart_available(void) {
 }
 
 // Transmit Interrupt
-ISR(USART_UDRE_vect) {
+ISR(UDRE_vect) {
     uint8_t i;
 
     if (tx_buffer_head == tx_buffer_tail) {
         // buffer is empty, disable transmit interrupt
-        UCSR0B = (1 << RXEN0) | (1 << TXEN0) | (1 << RXCIE0);
+        UCSRnB = (1 << RXENn) | (1 << TXENn) | (1 << RXCIEn);
     } else {
         i = tx_buffer_tail + 1;
         if (i >= TX_BUFFER_SIZE) i = 0;
@@ -110,10 +144,10 @@ ISR(USART_UDRE_vect) {
 }
 
 // Receive Interrupt
-ISR(USART_RX_vect) {
+ISR(RX_vect) {
     uint8_t c, i;
 
-    c = UDR0;
+    c = UDRn;
     i = rx_buffer_head + 1;
     if (i >= RX_BUFFER_SIZE) i = 0;
     if (i != rx_buffer_tail) {