* Moved contents of rgblight_reconfig.h to rgblight_post_config.h. In #3582, rgblight_reconfig.h had to be newly created. Now, the build system of qmk_firmware has a post_cofig feature, so that what was done in rgblight_reconfig.h can now be realized in rgblight_post_config.h. **This commit does not change the build result.** Testing script ```shell # build on master git checkout master echo master > /tmp/master_md5.txt # RGBLIGHT_ENABLE = no make HELIX=verbose helix/rev2:default:clean make HELIX=verbose helix/rev2:default md5 helix_rev2_default.hex >> /tmp/master_md5.txt # RGBLIGHT_ENABLE = yes, with animations make HELIX=verbose helix/rev2/back:default:clean make HELIX=verbose helix/rev2/back:default md5 helix_rev2_back_default.hex >> /tmp/master_md5.txt # RGBLIGHT_ENABLE = yes, without animations make HELIX=verbose,no_ani helix/rev2/back:default:clean make HELIX=verbose,no_ani helix/rev2/back:default md5 helix_rev2_back_default.hex >> /tmp/master_md5.txt # build on refactor_rgblight_reconfig.h git checkout refactor_rgblight_reconfig.h echo refactor_rgblight_reconfig.h > /tmp/branch_md5.txt # RGBLIGHT_ENABLE = no make HELIX=verbose helix/rev2:default:clean make HELIX=verbose helix/rev2:default md5 helix_rev2_default.hex >> /tmp/branch_md5.txt # RGBLIGHT_ENABLE = yes, with animations make HELIX=verbose helix/rev2/back:default:clean make HELIX=verbose helix/rev2/back:default md5 helix_rev2_back_default.hex >> /tmp/branch_md5.txt # RGBLIGHT_ENABLE = yes, without animations make HELIX=verbose,no_ani helix/rev2/back:default:clean make HELIX=verbose,no_ani helix/rev2/back:default md5 helix_rev2_back_default.hex >> /tmp/branch_md5.txt diff -u /tmp/master_md5.txt /tmp/branch_md5.txt ``` Test result: ``` --- /tmp/master_md5.txt 2020-01-03 15:42:22.000000000 +0900 +++ /tmp/branch_md5.txt 2020-01-03 15:42:42.000000000 +0900 @@ -1,4 +1,4 @@ -master +refactor_rgblight_reconfig.h MD5 (helix_rev2_default.hex) = f360032edd522448366d471d8f4f8181 MD5 (helix_rev2_back_default.hex) = 0c663acc6cccc44476b3b969ad22a48f MD5 (helix_rev2_back_default.hex) = e66b1195ff6d38e6e22c975b8ae42fd3 ``` * Expressions that are too long are difficult to read, so wrap them. * Edit the expression again * remove `defined(RGBLIGHT_ANIMATIONS)` in `tmk_core/common/*/suspend.c`, `tmk_core/protocol/*/main.c` move contents of rgblight_reconfig.h to rgblight.h. The following changes were made to rgblight.h. ```diff +#ifdef RGBLIGHT_USE_TIMER void rgblight_task(void); void rgblight_timer_init(void); void rgblight_timer_enable(void); void rgblight_timer_disable(void); void rgblight_timer_toggle(void); +#else +#define rgblight_task() +#define rgblight_timer_init() +#define rgblight_timer_enable() +#define rgblight_timer_disable() +#define rgblight_timer_toggle() +#endif ``` The following changes were made to tmk_core/common/avr/suspend.c, tmk_core/common/chibios/suspend.c, tmk_core/protocol/chibios/main.c, tmk_core/protocol/lufa/lufa.c, tmk_core/protocol/vusb/main.c. ```diff -# ifdef RGBLIGHT_ANIMATIONS rgblight_timer_enable(); -# endif ``` ```diff -#if defined(RGBLIGHT_ANIMATIONS) && defined(RGBLIGHT_ENABLE) +#if defined(RGBLIGHT_ENABLE) rgblight_task(); #endif ``` * remove 'defined(RGBLIGHT_ANIMATIONS)' in tmk_core/common/keyboard.c Co-authored-by: Joel Challis <git@zvecr.com>
		
			
				
	
	
		
			230 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			230 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * (c) 2015 flabberast <s3+flabbergast@sdfeu.org>
 | |
|  *
 | |
|  * Based on the following work:
 | |
|  *  - Guillaume Duc's raw hid example (MIT License)
 | |
|  *    https://github.com/guiduc/usb-hid-chibios-example
 | |
|  *  - PJRC Teensy examples (MIT License)
 | |
|  *    https://www.pjrc.com/teensy/usb_keyboard.html
 | |
|  *  - hasu's TMK keyboard code (GPL v2 and some code Modified BSD)
 | |
|  *    https://github.com/tmk/tmk_keyboard/
 | |
|  *  - ChibiOS demo code (Apache 2.0 License)
 | |
|  *    http://www.chibios.org
 | |
|  *
 | |
|  * Since some GPL'd code is used, this work is licensed under
 | |
|  * GPL v2 or later.
 | |
|  */
 | |
| 
 | |
| #include "ch.h"
 | |
| #include "hal.h"
 | |
| 
 | |
| #include "usb_main.h"
 | |
| 
 | |
| /* TMK includes */
 | |
| #include "report.h"
 | |
| #include "host.h"
 | |
| #include "host_driver.h"
 | |
| #include "keyboard.h"
 | |
| #include "action.h"
 | |
| #include "action_util.h"
 | |
| #include "mousekey.h"
 | |
| #include "led.h"
 | |
| #include "sendchar.h"
 | |
| #include "debug.h"
 | |
| #include "printf.h"
 | |
| 
 | |
| #if defined(RGBLIGHT_ENABLE)
 | |
| #    include "rgblight.h"
 | |
| #endif
 | |
| #ifdef SLEEP_LED_ENABLE
 | |
| #    include "sleep_led.h"
 | |
| #endif
 | |
| #ifdef SERIAL_LINK_ENABLE
 | |
| #    include "serial_link/system/serial_link.h"
 | |
| #endif
 | |
| #ifdef VISUALIZER_ENABLE
 | |
| #    include "visualizer/visualizer.h"
 | |
| #endif
 | |
| #ifdef MIDI_ENABLE
 | |
| #    include "qmk_midi.h"
 | |
| #endif
 | |
| #ifdef STM32_EEPROM_ENABLE
 | |
| #    include "eeprom_stm32.h"
 | |
| #endif
 | |
| #include "suspend.h"
 | |
| #include "wait.h"
 | |
| 
 | |
| /* -------------------------
 | |
|  *   TMK host driver defs
 | |
|  * -------------------------
 | |
|  */
 | |
| 
 | |
| /* declarations */
 | |
| uint8_t keyboard_leds(void);
 | |
| void    send_keyboard(report_keyboard_t *report);
 | |
| void    send_mouse(report_mouse_t *report);
 | |
| void    send_system(uint16_t data);
 | |
| void    send_consumer(uint16_t data);
 | |
| 
 | |
| /* host struct */
 | |
| host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
 | |
| 
 | |
| #ifdef VIRTSER_ENABLE
 | |
| void virtser_task(void);
 | |
| #endif
 | |
| 
 | |
| #ifdef RAW_ENABLE
 | |
| void raw_hid_task(void);
 | |
| #endif
 | |
| 
 | |
| #ifdef CONSOLE_ENABLE
 | |
| void console_task(void);
 | |
| #endif
 | |
| #ifdef MIDI_ENABLE
 | |
| void midi_ep_task(void);
 | |
| #endif
 | |
| 
 | |
| /* TESTING
 | |
|  * Amber LED blinker thread, times are in milliseconds.
 | |
|  */
 | |
| /* set this variable to non-zero anywhere to blink once */
 | |
| // static THD_WORKING_AREA(waThread1, 128);
 | |
| // static THD_FUNCTION(Thread1, arg) {
 | |
| 
 | |
| //   (void)arg;
 | |
| //   chRegSetThreadName("blinker");
 | |
| //   while (true) {
 | |
| //     systime_t time;
 | |
| 
 | |
| //     time = USB_DRIVER.state == USB_ACTIVE ? 250 : 500;
 | |
| //     palClearLine(LINE_CAPS_LOCK);
 | |
| //     chSysPolledDelayX(MS2RTC(STM32_HCLK, time));
 | |
| //     palSetLine(LINE_CAPS_LOCK);
 | |
| //     chSysPolledDelayX(MS2RTC(STM32_HCLK, time));
 | |
| //   }
 | |
| // }
 | |
| 
 | |
| /* Main thread
 | |
|  */
 | |
| int main(void) {
 | |
|     /* ChibiOS/RT init */
 | |
|     halInit();
 | |
|     chSysInit();
 | |
| 
 | |
| #ifdef STM32_EEPROM_ENABLE
 | |
|     EEPROM_Init();
 | |
| #endif
 | |
| 
 | |
|     // TESTING
 | |
|     // chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
 | |
| 
 | |
|     keyboard_setup();
 | |
| 
 | |
|     /* Init USB */
 | |
|     init_usb_driver(&USB_DRIVER);
 | |
| 
 | |
|     /* init printf */
 | |
|     init_printf(NULL, sendchar_pf);
 | |
| 
 | |
| #ifdef MIDI_ENABLE
 | |
|     setup_midi();
 | |
| #endif
 | |
| 
 | |
| #ifdef SERIAL_LINK_ENABLE
 | |
|     init_serial_link();
 | |
| #endif
 | |
| 
 | |
| #ifdef VISUALIZER_ENABLE
 | |
|     visualizer_init();
 | |
| #endif
 | |
| 
 | |
|     host_driver_t *driver = NULL;
 | |
| 
 | |
|     /* Wait until the USB or serial link is active */
 | |
|     while (true) {
 | |
| #if defined(WAIT_FOR_USB) || defined(SERIAL_LINK_ENABLE)
 | |
|         if (USB_DRIVER.state == USB_ACTIVE) {
 | |
|             driver = &chibios_driver;
 | |
|             break;
 | |
|         }
 | |
| #else
 | |
|         driver = &chibios_driver;
 | |
|         break;
 | |
| #endif
 | |
| #ifdef SERIAL_LINK_ENABLE
 | |
|         if (is_serial_link_connected()) {
 | |
|             driver = get_serial_link_driver();
 | |
|             break;
 | |
|         }
 | |
|         serial_link_update();
 | |
| #endif
 | |
|         wait_ms(50);
 | |
|     }
 | |
| 
 | |
|     /* Do need to wait here!
 | |
|      * Otherwise the next print might start a transfer on console EP
 | |
|      * before the USB is completely ready, which sometimes causes
 | |
|      * HardFaults.
 | |
|      */
 | |
|     wait_ms(50);
 | |
| 
 | |
|     print("USB configured.\n");
 | |
| 
 | |
|     /* init TMK modules */
 | |
|     keyboard_init();
 | |
|     host_set_driver(driver);
 | |
| 
 | |
| #ifdef SLEEP_LED_ENABLE
 | |
|     sleep_led_init();
 | |
| #endif
 | |
| 
 | |
|     print("Keyboard start.\n");
 | |
| 
 | |
|     /* Main loop */
 | |
|     while (true) {
 | |
| #if !defined(NO_USB_STARTUP_CHECK)
 | |
|         if (USB_DRIVER.state == USB_SUSPENDED) {
 | |
|             print("[s]");
 | |
| #    ifdef VISUALIZER_ENABLE
 | |
|             visualizer_suspend();
 | |
| #    endif
 | |
|             while (USB_DRIVER.state == USB_SUSPENDED) {
 | |
|                 /* Do this in the suspended state */
 | |
| #    ifdef SERIAL_LINK_ENABLE
 | |
|                 serial_link_update();
 | |
| #    endif
 | |
|                 suspend_power_down();  // on AVR this deep sleeps for 15ms
 | |
|                 /* Remote wakeup */
 | |
|                 if (suspend_wakeup_condition()) {
 | |
|                     usbWakeupHost(&USB_DRIVER);
 | |
|                 }
 | |
|             }
 | |
|             /* Woken up */
 | |
|             // variables has been already cleared by the wakeup hook
 | |
|             send_keyboard_report();
 | |
| #    ifdef MOUSEKEY_ENABLE
 | |
|             mousekey_send();
 | |
| #    endif /* MOUSEKEY_ENABLE */
 | |
| 
 | |
| #    ifdef VISUALIZER_ENABLE
 | |
|             visualizer_resume();
 | |
| #    endif
 | |
|         }
 | |
| #endif
 | |
| 
 | |
|         keyboard_task();
 | |
| #ifdef CONSOLE_ENABLE
 | |
|         console_task();
 | |
| #endif
 | |
| #ifdef MIDI_ENABLE
 | |
|         midi_ep_task();
 | |
| #endif
 | |
| #ifdef VIRTSER_ENABLE
 | |
|         virtser_task();
 | |
| #endif
 | |
| #ifdef RAW_ENABLE
 | |
|         raw_hid_task();
 | |
| #endif
 | |
|     }
 | |
| }
 |