You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

237 lines
8.5 KiB

2021 May 29 Breaking Changes Update (#13034) * Add Per Key functionality for AutoShift (#11536) * LED Matrix: Reactive effect buffers & advanced indicators (#12588) * [Keyboard] kint36: switch to sym_eager_pk debouncing (#12626) * [Keyboard] kint2pp: reduce input latency by ≈10ms (#12625) * LED Matrix: Split (#12633) * [CI] Format code according to conventions (#12650) * feat: infinite timeout for leader key (#6580) * feat: implement leader_no_timeout logic * docs(leader_key): infinite leader timeout docs * Format code according to conventions (#12680) * Update ADC driver for STM32F1xx, STM32F3xx, STM32F4xx (#12403) * Fix default ADC_RESOLUTION for ADCv3 (and ADCv4) Recent ChibiOS update removed ADC_CFGR1_RES_10BIT from the ADCv3 headers (that macro should not have been there, because ADCv3 has CFGR instead of CFGR1). Fix the default value for ADC_RESOLUTION to use ADC_CFGR_RES_10BITS if it is defined (that name is used for ADCv3 and ADCv4). * Update ADC docs to match the actually used resolution ADC driver for ChibiOS actually uses the 10-bit resolution by default (probably to match AVR); fix the documentation accordingly. Also add both ADC_CFGR_RES_10BITS and ADC_CFGR1_RES_10BIT constants (these names differ according to the ADC implementation in the particular MCU). * Fix pinToMux() for B12 and B13 on STM32F3xx Testing on STM32F303CCT6 revealed that the ADC mux values for B12 and B13 pins were wrong. * Add support for all possible analog pins on STM32F1xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 on STM32F1xx (they are the same at least for STM32F103x8 and larger F103 devices, and also F102, F105, F107 families). Actually tested on STM32F103C8T6 (therefore pins C0...C5 were not tested). Pins F6...F10, which are present on STM32F103x[C-G] in 144-pin packages, cannot be supported at the moment, because those pins are connected only to ADC3, but the ChibiOS ADC driver for STM32F1xx supports only ADC1. * Add support for all possible analog pins on STM32F4xx Added ADC mux values for pins A0...A7, B0, B1, C0...C5 and optionally F3...F10 (if STM32_ADC_USE_ADC3 is enabled). These mux values are apparently the same for all F4xx devices, except some smaller devices may not have ADC3. Actually tested on STM32F401CCU6, STM32F401CEU6, STM32F411CEU6 (using various WeAct “Blackpill” boards); only pins A0...A7, B0, B1 were tested. Pins F3...F10 are inside `#if STM32_ADC_USE_ADC3` because some devices which don't have ADC3 also don't have the GPIOF port, therefore the code which refers to Fx pins does not compile. * Fix STM32F3xx ADC mux table in documentation The ADC driver documentation had some errors in the mux table for STM32F3xx. Fix this table to match the datasheet and the actual code (mux settings for B12 and B13 were also tested on a real STM32F303CCT6 chip). * Add STM32F1xx ADC pins to the documentation * Add STM32F4xx ADC pins to the documentation * Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) (#12600) * Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example. * Update flashing.md * Update chconf.h * Update config.h * Update halconf.h * Update mcuconf.h * eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. (#12671) * Add support for MCU = STM32F446 (#12619) * Add support for MCU = STM32F446 * Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h * Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64 * stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled. * Format code according to conventions (#12682) * Format code according to conventions (#12687) * Add STM32L433 and L443 support (#12063) * initial L433 commit * change to XC * fix L433 * disable all peripherals * update system and peripheral clocks * 433 change * use its own board files * revert its own board files * l433 specific change * fix stm32l432xx define * remove duplicate #define * fix bootloader jump * move to L443xx and add i2c2, spi2, usart3 to mcuconf.h * move to L443 * move to L443 * fix sdmmc in mcuconf.h * include STM32L443 * add L443 * Include L443 in compatible microcontrollers * Include L443 in compatible microcontrollers * Update config bootloader jump description * Update ChibiOS define reasoning * Update quantum/mcu_selection.mk * fix git conflict * Updated Function96 with V2 files and removed chconf.h and halconf.h (#12613) * Fix bad PR merge for #6580. (#12721) * Change RGB/LED Matrix to use a simple define for USB suspend (#12697) * [CI] Format code according to conventions (#12731) * Fixing transport's led/rgb matrix suspend state logic (#12770) * [CI] Format code according to conventions (#12772) * Fix comment parsing (#12750) * Added OLED fade out support (#12086) * fix some references to bin/qmk that slipped in (#12832) * Resolve a number of warnings in `qmk generate-api` (#12833) * New command: qmk console (#12828) * stash poc * stash * tidy up implementation * Tidy up slightly for review * Tidy up slightly for review * Bodge environment to make tests pass * Refactor away from asyncio due to windows issues * Filter devices * align vid/pid printing * Add hidapi to the installers * start preparing for multiple hid_listeners * udev rules for hid_listen * refactor to move closer to end state * very basic implementation of the threaded model * refactor how vid/pid/index are supplied and parsed * windows improvements * read the report directly when usage page isn't available * add per-device colors, the choice to show names or numbers, and refactor * add timestamps * Add support for showing bootloaders * tweak the color for bootloaders * Align bootloader disconnect with connect color * add support for showing all bootloaders * fix the pyusb check * tweaks * fix exception * hide a stack trace behind -v * add --no-bootloaders option * add documentation for qmk console * Apply suggestions from code review * pyformat * clean up and flesh out KNOWN_BOOTLOADERS * Remove pointless SERIAL_LINK_ENABLE rules (#12846) * Make Swap Hands use PROGMEM (#12284) This converts the array that the Swap Hands feature uses to use PROGMEM, and to read from that array, as such. Since this array never changes at runtime, there is no reason to keep it in memory. Especially for AVR boards, as memory is a precious resource. * Fix another bin/qmk reference (#12856) * [Keymap] Turn OLED off on suspend in soundmonster keymap (#10419) * Fixup build errors on `develop` branch. (#12723) * LED Matrix: Effects! (#12651) * Fix syntax error when compiling for ARM (#12866) * Remove KEYMAP and LAYOUT_kc (#12160) * alias KEYMAP to LAYOUT * remove KEYMAP and LAYOUT_kc * Add setup, clone, and env to the list of commands we allow even with broken modules (#12868) * Rename `point_t` -> `led_point_t` (#12864) * [Keyboard] updated a vendor name / fixed minor keymap issues (#12881) * Add missing LED Matrix suspend code to suspend.c (#12878) * LED Matrix: Documentation (#12685) * Deprecate `send_unicode_hex_string()` (#12602) * Fix spelling mistake regarding LED Matrix in split_common. (#12888) * [Keymap] Fix QWERTY/DVORAK status output for kzar keymap (#12895) * Use milc.subcommand.config instead of qmk.cli.config (#12915) * Use milc.subcommand.config instead * pyformat * remove the config test * Add function to allow repeated blinking of one layer (#12237) * Implement function rgblight_blink_layer_repeat to allow repeated blinking of one layer at a time * Update doc * Rework rgblight blinking according to requested change * optimize storage * Fixup housekeeping from being invoked twice per loop. (#12933) * matrix: wait for row signal to go HIGH for every row (#12945) I noticed this discrepancy (last row of the matrix treated differently than the others) when optimizing the input latency of my keyboard controller, see also https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/ Before this commit, when tuning the delays I noticed ghost key presses when pressing the F2 key, which is on the last row of the keyboard matrix: the dead_grave key, which is on the first row of the keyboard matrix, would be incorrectly detected as pressed. After this commit, all keyboard matrix rows are interpreted correctly. I suspect that my setup is more susceptible to this nuance than others because I use GPIO_INPUT_PIN_DELAY=0 and hence don’t have another delay that might mask the problem. * ensure we do not conflict with existing keymap aliases (#12976) * Add support for up to 4 IS31FL3733 drivers (#12342) * Convert Encoder callbacks to be boolean functions (#12805) * [Keyboard] Fix Terrazzo build failure (#12977) * Do not hard set config in CPTC files (#11864) * [Keyboard] Corne - Remove legacy revision support (#12226) * [Keymap] Update to Drashna keymap and user code (based on develop) (#12936) * Add Full-duplex serial driver for ARM boards (#9842) * Document LED_MATRIX_FRAMEBUFFER_EFFECTS (#12987) * Backlight: add defines for default level and breathing state (#12560) * Add dire message about LUFA mass storage bootloader (#13014) * [Keyboard] Remove redundant legacy and common headers for crkbd (#13023) Was causing compiler errors on some systems. * Fix keyboards/keymaps for boolean encoder callback changes (#12985) * `backlight.c`: include `eeprom.h` (#13024) * Add changelog for 2021-05-29 Breaking Changes merge (#12939) * Add ChangeLog for 2021-05-29 Breaking Changes Merge: initial version * Add recent develop changes * Sort recent develop changes * Remove sections for ChibiOS changes per tzarc No ChibiOS changes this round. * Add and sort recent develop changes * add notes about keyboard moves/deletions * import changelog for PR 12172 Documents the change to BOOTMAGIC_ENABLE. * update section headings * re-sort changelog * add additional note regarding Bootmagic changes * remove changelog timestamp * update dates in main Breaking Changes docs * fix broken section anchors in previous changelogs * add link to backlight/eeprom patch to changelog * highlight some more changes * link PRs from section headers * Restore standard readme * run: qmk cformat --core-only
3 years ago
  1. /* Copyright 2017 Jason Williams
  2. * Copyright 2018 Jack Humbert
  3. * Copyright 2018 Yiancar
  4. *
  5. * This program is free software: you can redistribute it and/or modify
  6. * it under the terms of the GNU General Public License as published by
  7. * the Free Software Foundation, either version 2 of the License, or
  8. * (at your option) any later version.
  9. *
  10. * This program is distributed in the hope that it will be useful,
  11. * but WITHOUT ANY WARRANTY; without even the implied warranty of
  12. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  13. * GNU General Public License for more details.
  14. *
  15. * You should have received a copy of the GNU General Public License
  16. * along with this program. If not, see <http://www.gnu.org/licenses/>.
  17. */
  18. #include "is31fl3733.h"
  19. #include "i2c_master.h"
  20. #include "wait.h"
  21. // This is a 7-bit address, that gets left-shifted and bit 0
  22. // set to 0 for write, 1 for read (as per I2C protocol)
  23. // The address will vary depending on your wiring:
  24. // 00 <-> GND
  25. // 01 <-> SCL
  26. // 10 <-> SDA
  27. // 11 <-> VCC
  28. // ADDR1 represents A1:A0 of the 7-bit address.
  29. // ADDR2 represents A3:A2 of the 7-bit address.
  30. // The result is: 0b101(ADDR2)(ADDR1)
  31. #define ISSI_ADDR_DEFAULT 0x50
  32. #define ISSI_COMMANDREGISTER 0xFD
  33. #define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
  34. #define ISSI_INTERRUPTMASKREGISTER 0xF0
  35. #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
  36. #define ISSI_PAGE_LEDCONTROL 0x00 // PG0
  37. #define ISSI_PAGE_PWM 0x01 // PG1
  38. #define ISSI_PAGE_AUTOBREATH 0x02 // PG2
  39. #define ISSI_PAGE_FUNCTION 0x03 // PG3
  40. #define ISSI_REG_CONFIGURATION 0x00 // PG3
  41. #define ISSI_REG_GLOBALCURRENT 0x01 // PG3
  42. #define ISSI_REG_RESET 0x11 // PG3
  43. #define ISSI_REG_SWPULLUP 0x0F // PG3
  44. #define ISSI_REG_CSPULLUP 0x10 // PG3
  45. #ifndef ISSI_TIMEOUT
  46. # define ISSI_TIMEOUT 100
  47. #endif
  48. #ifndef ISSI_PERSISTENCE
  49. # define ISSI_PERSISTENCE 0
  50. #endif
  51. // Transfer buffer for TWITransmitData()
  52. uint8_t g_twi_transfer_buffer[20];
  53. // These buffers match the IS31FL3733 PWM registers.
  54. // The control buffers match the PG0 LED On/Off registers.
  55. // Storing them like this is optimal for I2C transfers to the registers.
  56. // We could optimize this and take out the unused registers from these
  57. // buffers and the transfers in IS31FL3733_write_pwm_buffer() but it's
  58. // probably not worth the extra complexity.
  59. uint8_t g_pwm_buffer[DRIVER_COUNT][192];
  60. bool g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
  61. uint8_t g_led_control_registers[DRIVER_COUNT][24] = {0};
  62. bool g_led_control_registers_update_required[DRIVER_COUNT] = {false};
  63. bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
  64. // If the transaction fails function returns false.
  65. g_twi_transfer_buffer[0] = reg;
  66. g_twi_transfer_buffer[1] = data;
  67. #if ISSI_PERSISTENCE > 0
  68. for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
  69. if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) {
  70. return false;
  71. }
  72. }
  73. #else
  74. if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) {
  75. return false;
  76. }
  77. #endif
  78. return true;
  79. }
  80. bool IS31FL3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
  81. // Assumes PG1 is already selected.
  82. // If any of the transactions fails function returns false.
  83. // Transmit PWM registers in 12 transfers of 16 bytes.
  84. // g_twi_transfer_buffer[] is 20 bytes
  85. // Iterate over the pwm_buffer contents at 16 byte intervals.
  86. for (int i = 0; i < 192; i += 16) {
  87. g_twi_transfer_buffer[0] = i;
  88. // Copy the data from i to i+15.
  89. // Device will auto-increment register for data after the first byte
  90. // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
  91. for (int j = 0; j < 16; j++) {
  92. g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
  93. }
  94. #if ISSI_PERSISTENCE > 0
  95. for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
  96. if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) {
  97. return false;
  98. }
  99. }
  100. #else
  101. if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) {
  102. return false;
  103. }
  104. #endif
  105. }
  106. return true;
  107. }
  108. void IS31FL3733_init(uint8_t addr, uint8_t sync) {
  109. // In order to avoid the LEDs being driven with garbage data
  110. // in the LED driver's PWM registers, shutdown is enabled last.
  111. // Set up the mode and other settings, clear the PWM registers,
  112. // then disable software shutdown.
  113. // Sync is passed so set it according to the datasheet.
  114. // Unlock the command register.
  115. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
  116. // Select PG0
  117. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
  118. // Turn off all LEDs.
  119. for (int i = 0x00; i <= 0x17; i++) {
  120. IS31FL3733_write_register(addr, i, 0x00);
  121. }
  122. // Unlock the command register.
  123. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
  124. // Select PG1
  125. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
  126. // Set PWM on all LEDs to 0
  127. // No need to setup Breath registers to PWM as that is the default.
  128. for (int i = 0x00; i <= 0xBF; i++) {
  129. IS31FL3733_write_register(addr, i, 0x00);
  130. }
  131. // Unlock the command register.
  132. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
  133. // Select PG3
  134. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
  135. // Set global current to maximum.
  136. IS31FL3733_write_register(addr, ISSI_REG_GLOBALCURRENT, 0xFF);
  137. // Disable software shutdown.
  138. IS31FL3733_write_register(addr, ISSI_REG_CONFIGURATION, (sync << 6) | 0x01);
  139. // Wait 10ms to ensure the device has woken up.
  140. wait_ms(10);
  141. }
  142. void IS31FL3733_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
  143. if (index >= 0 && index < DRIVER_LED_TOTAL) {
  144. is31_led led = g_is31_leds[index];
  145. g_pwm_buffer[led.driver][led.r] = red;
  146. g_pwm_buffer[led.driver][led.g] = green;
  147. g_pwm_buffer[led.driver][led.b] = blue;
  148. g_pwm_buffer_update_required[led.driver] = true;
  149. }
  150. }
  151. void IS31FL3733_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
  152. for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
  153. IS31FL3733_set_color(i, red, green, blue);
  154. }
  155. }
  156. void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bool blue) {
  157. is31_led led = g_is31_leds[index];
  158. uint8_t control_register_r = led.r / 8;
  159. uint8_t control_register_g = led.g / 8;
  160. uint8_t control_register_b = led.b / 8;
  161. uint8_t bit_r = led.r % 8;
  162. uint8_t bit_g = led.g % 8;
  163. uint8_t bit_b = led.b % 8;
  164. if (red) {
  165. g_led_control_registers[led.driver][control_register_r] |= (1 << bit_r);
  166. } else {
  167. g_led_control_registers[led.driver][control_register_r] &= ~(1 << bit_r);
  168. }
  169. if (green) {
  170. g_led_control_registers[led.driver][control_register_g] |= (1 << bit_g);
  171. } else {
  172. g_led_control_registers[led.driver][control_register_g] &= ~(1 << bit_g);
  173. }
  174. if (blue) {
  175. g_led_control_registers[led.driver][control_register_b] |= (1 << bit_b);
  176. } else {
  177. g_led_control_registers[led.driver][control_register_b] &= ~(1 << bit_b);
  178. }
  179. g_led_control_registers_update_required[led.driver] = true;
  180. }
  181. void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
  182. if (g_pwm_buffer_update_required[index]) {
  183. // Firstly we need to unlock the command register and select PG1.
  184. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
  185. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
  186. // If any of the transactions fail we risk writing dirty PG0,
  187. // refresh page 0 just in case.
  188. if (!IS31FL3733_write_pwm_buffer(addr, g_pwm_buffer[index])) {
  189. g_led_control_registers_update_required[index] = true;
  190. }
  191. }
  192. g_pwm_buffer_update_required[index] = false;
  193. }
  194. void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index) {
  195. if (g_led_control_registers_update_required[index]) {
  196. // Firstly we need to unlock the command register and select PG0
  197. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
  198. IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
  199. for (int i = 0; i < 24; i++) {
  200. IS31FL3733_write_register(addr, i, g_led_control_registers[index][i]);
  201. }
  202. }
  203. g_led_control_registers_update_required[index] = false;
  204. }