moky/moky88: Remove use of deprecated defines (#24656)

This commit is contained in:
Joel Challis 2024-11-29 21:51:16 +00:00 committed by GitHub
parent 653d1a5e37
commit 50491c44ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 89 additions and 90 deletions

View File

@ -15,5 +15,4 @@
/* RGB Driver */
#define AW20216S_CS_PIN_1 D2
#define AW20216S_CS_PIN_2 B8
#define AW20216S_EN_PIN_1 B9
#define AW20216S_EN_PIN_2 B9
#define AW20216S_EN_PIN B9

View File

@ -23,97 +23,97 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
{0, CS18_SW2, CS17_SW2, CS16_SW2 }, // 0 Esc
{0, CS18_SW3, CS17_SW3, CS16_SW3 }, // 1 F1
{0, CS18_SW4, CS17_SW4, CS16_SW4 }, // 2 F2
{0, CS18_SW5, CS17_SW5, CS16_SW5 }, // 3 F3
{0, CS18_SW6, CS17_SW6, CS16_SW6 }, // 4 F4
{0, CS18_SW7, CS17_SW7, CS16_SW7 }, // 5 F5
{0, CS18_SW8, CS17_SW8, CS16_SW8 }, // 6 F6
{0, CS18_SW9, CS17_SW9, CS16_SW9 }, // 7 F7
{0, CS18_SW10, CS17_SW10, CS16_SW10 }, // 8 F8
{0, CS18_SW11, CS17_SW11, CS16_SW11 }, // 9 F9
{0, CS18_SW12, CS17_SW12, CS16_SW12 }, // 10 F10
{1, CS18_SW1, CS17_SW1, CS16_SW1 }, // 11 F11
{1, CS18_SW2, CS17_SW2, CS16_SW2 }, // 12 F12
{1, CS18_SW3, CS17_SW3, CS16_SW3 }, // 13 MUTE
{1, CS18_SW4, CS17_SW4, CS16_SW4 }, // 14 PSCR
{1, CS18_SW5, CS17_SW5, CS16_SW5 }, // 15 SCRL
{1, CS18_SW6, CS17_SW6, CS16_SW6 }, // 16 PAUSE
{0, SW2_CS18, SW2_CS17, SW2_CS16 }, // 0 Esc
{0, SW3_CS18, SW3_CS17, SW3_CS16 }, // 1 F1
{0, SW4_CS18, SW4_CS17, SW4_CS16 }, // 2 F2
{0, SW5_CS18, SW5_CS17, SW5_CS16 }, // 3 F3
{0, SW6_CS18, SW6_CS17, SW6_CS16 }, // 4 F4
{0, SW7_CS18, SW7_CS17, SW7_CS16 }, // 5 F5
{0, SW8_CS18, SW8_CS17, SW8_CS16 }, // 6 F6
{0, SW9_CS18, SW9_CS17, SW9_CS16 }, // 7 F7
{0, SW10_CS18, SW10_CS17, SW10_CS16 }, // 8 F8
{0, SW11_CS18, SW11_CS17, SW11_CS16 }, // 9 F9
{0, SW12_CS18, SW12_CS17, SW12_CS16 }, // 10 F10
{1, SW1_CS18, SW1_CS17, SW1_CS16 }, // 11 F11
{1, SW2_CS18, SW2_CS17, SW2_CS16 }, // 12 F12
{1, SW3_CS18, SW3_CS17, SW3_CS16 }, // 13 MUTE
{1, SW4_CS18, SW4_CS17, SW4_CS16 }, // 14 PSCR
{1, SW5_CS18, SW5_CS17, SW5_CS16 }, // 15 SCRL
{1, SW6_CS18, SW6_CS17, SW6_CS16 }, // 16 PAUSE
{0, CS15_SW2, CS14_SW2, CS13_SW2 }, // 17 `~
{0, CS15_SW3, CS14_SW3, CS13_SW3 }, // 18 1
{0, CS15_SW4, CS14_SW4, CS13_SW4 }, // 19 2
{0, CS15_SW5, CS14_SW5, CS13_SW5 }, // 20 3
{0, CS15_SW6, CS14_SW6, CS13_SW6 }, // 21 4
{0, CS15_SW7, CS14_SW7, CS13_SW7 }, // 22 5
{0, CS15_SW8, CS14_SW8, CS13_SW8 }, // 23 6
{0, CS15_SW9, CS14_SW9, CS13_SW9 }, // 24 7
{0, CS15_SW10, CS14_SW10, CS13_SW10 }, // 25 8
{0, CS15_SW11, CS14_SW11, CS13_SW11 }, // 26 9
{0, CS15_SW12, CS14_SW12, CS13_SW12 }, // 27 0
{1, CS15_SW1, CS14_SW1, CS13_SW1 }, // 28 -_
{1, CS15_SW2, CS14_SW2, CS13_SW2 }, // 29 =+
{1, CS15_SW3, CS14_SW3, CS13_SW3 }, // 30 BSPC
{1, CS15_SW4, CS14_SW4, CS13_SW4 }, // 31 INS
{1, CS15_SW5, CS14_SW5, CS13_SW5 }, // 32 HOME
{1, CS15_SW6, CS14_SW6, CS13_SW6 }, // 33 PGUP
{0, SW2_CS15, SW2_CS14, SW2_CS13 }, // 17 `~
{0, SW3_CS15, SW3_CS14, SW3_CS13 }, // 18 1
{0, SW4_CS15, SW4_CS14, SW4_CS13 }, // 19 2
{0, SW5_CS15, SW5_CS14, SW5_CS13 }, // 20 3
{0, SW6_CS15, SW6_CS14, SW6_CS13 }, // 21 4
{0, SW7_CS15, SW7_CS14, SW7_CS13 }, // 22 5
{0, SW8_CS15, SW8_CS14, SW8_CS13 }, // 23 6
{0, SW9_CS15, SW9_CS14, SW9_CS13 }, // 24 7
{0, SW10_CS15, SW10_CS14, SW10_CS13 }, // 25 8
{0, SW11_CS15, SW11_CS14, SW11_CS13 }, // 26 9
{0, SW12_CS15, SW12_CS14, SW12_CS13 }, // 27 0
{1, SW1_CS15, SW1_CS14, SW1_CS13 }, // 28 -_
{1, SW2_CS15, SW2_CS14, SW2_CS13 }, // 29 =+
{1, SW3_CS15, SW3_CS14, SW3_CS13 }, // 30 BSPC
{1, SW4_CS15, SW4_CS14, SW4_CS13 }, // 31 INS
{1, SW5_CS15, SW5_CS14, SW5_CS13 }, // 32 HOME
{1, SW6_CS15, SW6_CS14, SW6_CS13 }, // 33 PGUP
{0, CS12_SW2, CS11_SW2, CS10_SW2 }, // 34 Tab
{0, CS12_SW3, CS11_SW3, CS10_SW3 }, // 35 Q
{0, CS12_SW4, CS11_SW4, CS10_SW4 }, // 36 W
{0, CS12_SW5, CS11_SW5, CS10_SW5 }, // 37 E
{0, CS12_SW6, CS11_SW6, CS10_SW6 }, // 38 R
{0, CS12_SW7, CS11_SW7, CS10_SW7 }, // 39 T
{0, CS12_SW8, CS11_SW8, CS10_SW8 }, // 40 Y
{0, CS12_SW9, CS11_SW9, CS10_SW9 }, // 41 U
{0, CS12_SW10, CS11_SW10, CS10_SW10 }, // 42 I
{0, CS12_SW11, CS11_SW11, CS10_SW11 }, // 43 O
{0, CS12_SW12, CS11_SW12, CS10_SW12 }, // 44 P
{1, CS12_SW1, CS11_SW1, CS10_SW1 }, // 45 [{
{1, CS12_SW2, CS11_SW2, CS10_SW2 }, // 48 ]}
{1, CS12_SW3, CS11_SW3, CS10_SW3 }, // 47 \|
{1, CS12_SW4, CS11_SW4, CS10_SW4 }, // 48 Del
{1, CS12_SW5, CS11_SW5, CS10_SW5 }, // 49 End
{1, CS12_SW6, CS11_SW6, CS10_SW6 }, // 50 PGDN
{0, SW2_CS12, SW2_CS11, SW2_CS10 }, // 34 Tab
{0, SW3_CS12, SW3_CS11, SW3_CS10 }, // 35 Q
{0, SW4_CS12, SW4_CS11, SW4_CS10 }, // 36 W
{0, SW5_CS12, SW5_CS11, SW5_CS10 }, // 37 E
{0, SW6_CS12, SW6_CS11, SW6_CS10 }, // 38 R
{0, SW7_CS12, SW7_CS11, SW7_CS10 }, // 39 T
{0, SW8_CS12, SW8_CS11, SW8_CS10 }, // 40 Y
{0, SW9_CS12, SW9_CS11, SW9_CS10 }, // 41 U
{0, SW10_CS12, SW10_CS11, SW10_CS10 }, // 42 I
{0, SW11_CS12, SW11_CS11, SW11_CS10 }, // 43 O
{0, SW12_CS12, SW12_CS11, SW12_CS10 }, // 44 P
{1, SW1_CS12, SW1_CS11, SW1_CS10 }, // 45 [{
{1, SW2_CS12, SW2_CS11, SW2_CS10 }, // 48 ]}
{1, SW3_CS12, SW3_CS11, SW3_CS10 }, // 47 \|
{1, SW4_CS12, SW4_CS11, SW4_CS10 }, // 48 Del
{1, SW5_CS12, SW5_CS11, SW5_CS10 }, // 49 End
{1, SW6_CS12, SW6_CS11, SW6_CS10 }, // 50 PGDN
{0, CS1_SW2, CS2_SW2, CS3_SW2 }, // 51 Caps
{0, CS1_SW3, CS2_SW3, CS3_SW3 }, // 52 A
{0, CS1_SW4, CS2_SW4, CS3_SW4 }, // 33 S
{0, CS1_SW5, CS2_SW5, CS3_SW5 }, // 54 D
{0, CS1_SW6, CS2_SW6, CS3_SW6 }, // 55 F
{0, CS1_SW7, CS2_SW7, CS3_SW7 }, // 56 G
{0, CS1_SW8, CS2_SW8, CS3_SW8 }, // 57 H
{0, CS1_SW9, CS2_SW9, CS3_SW9 }, // 58 J
{0, CS1_SW10, CS2_SW10, CS3_SW10 }, // 59 K
{0, CS1_SW11, CS2_SW11, CS3_SW11 }, // 60 L
{0, CS1_SW12, CS2_SW12, CS3_SW12 }, // 61 ;:
{1, CS1_SW1, CS2_SW1, CS3_SW1 }, // 62 '
{1, CS1_SW3, CS2_SW3, CS3_SW3 }, // 63 Enter
{0, SW2_CS1, SW2_CS2, SW2_CS3 }, // 51 Caps
{0, SW3_CS1, SW3_CS2, SW3_CS3 }, // 52 A
{0, SW4_CS1, SW4_CS2, SW4_CS3 }, // 33 S
{0, SW5_CS1, SW5_CS2, SW5_CS3 }, // 54 D
{0, SW6_CS1, SW6_CS2, SW6_CS3 }, // 55 F
{0, SW7_CS1, SW7_CS2, SW7_CS3 }, // 56 G
{0, SW8_CS1, SW8_CS2, SW8_CS3 }, // 57 H
{0, SW9_CS1, SW9_CS2, SW9_CS3 }, // 58 J
{0, SW10_CS1, SW10_CS2, SW10_CS3 }, // 59 K
{0, SW11_CS1, SW11_CS2, SW11_CS3 }, // 60 L
{0, SW12_CS1, SW12_CS2, SW12_CS3 }, // 61 ;:
{1, SW1_CS1, SW1_CS2, SW1_CS3 }, // 62 '
{1, SW3_CS1, SW3_CS2, SW3_CS3 }, // 63 Enter
{0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 64 Shift
{0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 65 Z
{0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 66 X
{0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 67 C
{0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 68 V
{0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 69 B
{0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 70 N
{0, CS4_SW10, CS5_SW10, CS6_SW10 }, // 71 M
{0, CS4_SW11, CS5_SW11, CS6_SW11 }, // 72 ,<
{0, CS4_SW12, CS5_SW12, CS6_SW12 }, // 73 .>
{1, CS4_SW1, CS5_SW1, CS6_SW1 }, // 74 ?
{1, CS4_SW3, CS5_SW3, CS6_SW3 }, // 75 Shift
{1, CS4_SW5, CS5_SW5, CS6_SW5 }, // 76 Up
{0, SW2_CS4, SW2_CS5, SW2_CS6 }, // 64 Shift
{0, SW4_CS4, SW4_CS5, SW4_CS6 }, // 65 Z
{0, SW5_CS4, SW5_CS5, SW5_CS6 }, // 66 X
{0, SW6_CS4, SW6_CS5, SW6_CS6 }, // 67 C
{0, SW7_CS4, SW7_CS5, SW7_CS6 }, // 68 V
{0, SW8_CS4, SW8_CS5, SW8_CS6 }, // 69 B
{0, SW9_CS4, SW9_CS5, SW9_CS6 }, // 70 N
{0, SW10_CS4, SW10_CS5, SW10_CS6 }, // 71 M
{0, SW11_CS4, SW11_CS5, SW11_CS6 }, // 72 ,<
{0, SW12_CS4, SW12_CS5, SW12_CS6 }, // 73 .>
{1, SW1_CS4, SW1_CS5, SW1_CS6 }, // 74 ?
{1, SW3_CS4, SW3_CS5, SW3_CS6 }, // 75 Shift
{1, SW5_CS4, SW5_CS5, SW5_CS6 }, // 76 Up
{0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 77 Ctrl_L
{0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 78 Win_L
{0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 79 ALT_L
{0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 80 SPACE
{0, CS7_SW12, CS8_SW12, CS9_SW12 }, // 81 ALT_L
{1, CS7_SW1, CS8_SW1, CS9_SW1 }, // 82 Win_L
{1, CS7_SW2, CS8_SW2, CS9_SW2 }, // 83 Fn
{1, CS7_SW3, CS8_SW3, CS9_SW3 }, // 84 Ctrl_L
{1, CS7_SW4, CS8_SW4, CS9_SW4 }, // 85 Left
{1, CS7_SW5, CS8_SW5, CS9_SW5 }, // 86 Down
{1, CS7_SW6, CS8_SW6, CS9_SW6 }, // 87 Right
{0, SW2_CS7, SW2_CS8, SW2_CS9 }, // 77 Ctrl_L
{0, SW3_CS7, SW3_CS8, SW3_CS9 }, // 78 Win_L
{0, SW4_CS7, SW4_CS8, SW4_CS9 }, // 79 ALT_L
{0, SW8_CS7, SW8_CS8, SW8_CS9 }, // 80 SPACE
{0, SW12_CS7, SW12_CS8, SW12_CS9 }, // 81 ALT_L
{1, SW1_CS7, SW1_CS8, SW1_CS9 }, // 82 Win_L
{1, SW2_CS7, SW2_CS8, SW2_CS9 }, // 83 Fn
{1, SW3_CS7, SW3_CS8, SW3_CS9 }, // 84 Ctrl_L
{1, SW4_CS7, SW4_CS8, SW4_CS9 }, // 85 Left
{1, SW5_CS7, SW5_CS8, SW5_CS9 }, // 86 Down
{1, SW6_CS7, SW6_CS8, SW6_CS9 }, // 87 Right
};