clang-format changes
This commit is contained in:
		
							parent
							
								
									61af76a10d
								
							
						
					
					
						commit
						b624f32f94
					
				
					 502 changed files with 32259 additions and 39062 deletions
				
			
		| 
						 | 
				
			
			@ -21,22 +21,24 @@
 | 
			
		|||
 | 
			
		||||
#define COMBO1 RSFT(LCTL(KC_O))
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [0] = {
 | 
			
		||||
        // 0    1      2      3        4        5        6       7            8      9
 | 
			
		||||
        {KC_A,  KC_B,  KC_NO, KC_LSFT, KC_RSFT, KC_LCTL, COMBO1, SFT_T(KC_P), M(0),  KC_NO},
 | 
			
		||||
        {KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,       KC_NO, KC_NO},
 | 
			
		||||
        {KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,       KC_NO, KC_NO},
 | 
			
		||||
        {KC_C,  KC_D,  KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,       KC_NO, KC_NO},
 | 
			
		||||
    },
 | 
			
		||||
const uint16_t PROGMEM
 | 
			
		||||
               keymaps[][MATRIX_ROWS][MATRIX_COLS] =
 | 
			
		||||
        {
 | 
			
		||||
            [0] =
 | 
			
		||||
                {
 | 
			
		||||
                    // 0    1      2      3        4        5        6       7            8      9
 | 
			
		||||
                    {KC_A, KC_B, KC_NO, KC_LSFT, KC_RSFT, KC_LCTL, COMBO1, SFT_T(KC_P), M(0), KC_NO},
 | 
			
		||||
                    {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
 | 
			
		||||
                    {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
 | 
			
		||||
                    {KC_C, KC_D, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO},
 | 
			
		||||
                },
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
 | 
			
		||||
    if (record->event.pressed) {
 | 
			
		||||
        switch(id) {
 | 
			
		||||
        case 0:
 | 
			
		||||
            return MACRO(D(LSFT), T(H), U(LSFT), T(E), T(L), T(L), T(O), T(SPACE), W(100), 
 | 
			
		||||
            D(LSFT), T(W), U(LSFT), I(10), T(O), T(R), T(L), T(D), D(LSFT), T(1), U(LSFT), END);
 | 
			
		||||
        switch (id) {
 | 
			
		||||
            case 0:
 | 
			
		||||
                return MACRO(D(LSFT), T(H), U(LSFT), T(E), T(L), T(L), T(O), T(SPACE), W(100), D(LSFT), T(W), U(LSFT), I(10), T(O), T(R), T(L), T(D), D(LSFT), T(1), U(LSFT), END);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    return MACRO_NONE;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,15 +41,15 @@ TEST_F(KeyPress, CorrectKeysAreReportedWhenTwoKeysArePressed) {
 | 
			
		|||
    TestDriver driver;
 | 
			
		||||
    press_key(1, 0);
 | 
			
		||||
    press_key(0, 3);
 | 
			
		||||
    //Note that QMK only processes one key at a time
 | 
			
		||||
    //See issue #1476 for more information
 | 
			
		||||
    // Note that QMK only processes one key at a time
 | 
			
		||||
    // See issue #1476 for more information
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_B)));
 | 
			
		||||
    keyboard_task();
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_B, KC_C)));
 | 
			
		||||
    keyboard_task();
 | 
			
		||||
    release_key(1, 0);
 | 
			
		||||
    release_key(0, 3);
 | 
			
		||||
    //Note that the first key released is the first one in the matrix order
 | 
			
		||||
    // Note that the first key released is the first one in the matrix order
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_C)));
 | 
			
		||||
    keyboard_task();
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -22,78 +22,50 @@ using testing::InvokeWithoutArgs;
 | 
			
		|||
 | 
			
		||||
class Macro : public TestFixture {};
 | 
			
		||||
 | 
			
		||||
#define AT_TIME(t) WillOnce(InvokeWithoutArgs([current_time]() {EXPECT_EQ(timer_elapsed32(current_time), t);}))
 | 
			
		||||
#define AT_TIME(t) WillOnce(InvokeWithoutArgs([current_time]() { EXPECT_EQ(timer_elapsed32(current_time), t); }))
 | 
			
		||||
 | 
			
		||||
TEST_F(Macro, PlayASimpleMacro) {
 | 
			
		||||
    TestDriver driver;
 | 
			
		||||
    InSequence s;
 | 
			
		||||
    press_key(8, 0);
 | 
			
		||||
    uint32_t current_time = timer_read32();
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_H)))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_E)))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_H))).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_E))).AT_TIME(0);
 | 
			
		||||
    // The macro system could actually skip these empty keyboard reports
 | 
			
		||||
    // it should be enough to just send a report with the next key down
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L)))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L)))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L))).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L))).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_O))).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_SPACE))).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).AT_TIME(100);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_W))).AT_TIME(100);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).AT_TIME(100);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(100);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_O)))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_SPACE)))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(0);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)))
 | 
			
		||||
        .AT_TIME(100);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_W)))
 | 
			
		||||
        .AT_TIME(100);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)))
 | 
			
		||||
        .AT_TIME(100);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(100);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_O)))
 | 
			
		||||
    // BUG: The timer should not really have advanced 10 ms here
 | 
			
		||||
    // See issue #1477
 | 
			
		||||
        // BUG: The timer should not really have advanced 10 ms here
 | 
			
		||||
        // See issue #1477
 | 
			
		||||
        .AT_TIME(110);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
    // BUG: The timer should not advance on both keydown and key-up
 | 
			
		||||
    // See issue #1477
 | 
			
		||||
        // BUG: The timer should not advance on both keydown and key-up
 | 
			
		||||
        // See issue #1477
 | 
			
		||||
        .AT_TIME(120);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_R)))
 | 
			
		||||
        .AT_TIME(130);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(140);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L)))
 | 
			
		||||
        .AT_TIME(150);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(160);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_D)))
 | 
			
		||||
        .AT_TIME(170);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(180);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)))
 | 
			
		||||
        .AT_TIME(190);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_1)))
 | 
			
		||||
        .AT_TIME(200);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)))
 | 
			
		||||
        .AT_TIME(210);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
 | 
			
		||||
        .AT_TIME(220);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_R))).AT_TIME(130);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(140);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L))).AT_TIME(150);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(160);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_D))).AT_TIME(170);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(180);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).AT_TIME(190);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_1))).AT_TIME(200);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).AT_TIME(210);
 | 
			
		||||
    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(220);
 | 
			
		||||
    run_one_scan_loop();
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue