ducky: clang-format matrix and one2mini.c

keyboards/ducky/one2mini/matrix.c

@@ -69,46 +69,23 @@ static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
 static void select_col(uint8_t col);
 #endif
 
-__attribute__ ((weak))
+__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); }
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
 
-__attribute__ ((weak))
+__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); }
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
 
-__attribute__ ((weak))
+__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
 
-__attribute__ ((weak))
+__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
 
-__attribute__ ((weak))
+__attribute__((weak)) void matrix_init_user(void) {}
-void matrix_init_user(void) {
-}
 
-__attribute__ ((weak))
+__attribute__((weak)) void matrix_scan_user(void) {}
-void matrix_scan_user(void) {
-}
 
-inline
+inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
 
-inline
+inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
 
 void matrix_init(void) {
-
     unselect_rows();
     init_cols();
 
@@ -122,8 +99,7 @@ void matrix_init(void) {
     matrix_init_quantum();
 }
 
-uint8_t matrix_scan(void)
+uint8_t matrix_scan(void) {
-{
     bool changed = false;
 
     // Set row, read cols
@@ -137,15 +113,9 @@ uint8_t matrix_scan(void)
     return (uint8_t)changed;
 }
 
-inline
+inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
 
-inline
+inline matrix_row_t matrix_get_row(uint8_t row) {
-matrix_row_t matrix_get_row(uint8_t row)
-{
     // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a
     // switch blocker installed and the switch is always pressed.
 #ifdef MATRIX_MASKED
@@ -155,19 +125,18 @@ matrix_row_t matrix_get_row(uint8_t row)
 #endif
 }
 
-void matrix_print(void)
+void matrix_print(void) {
-{
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        phex(row);
+        print(": ");
         print_matrix_row(row);
         print("\n");
     }
 }
 
-uint8_t matrix_key_count(void)
+uint8_t matrix_key_count(void) {
-{
     uint8_t count = 0;
     for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
         count += matrix_bitpop(i);
@@ -175,15 +144,13 @@ uint8_t matrix_key_count(void)
     return count;
 }
 
-static void init_cols(void)
+static void init_cols(void) {
-{
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
         setPinInputHigh(col_pins[x]);
     }
 }
 
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-{
     // Store last value of row prior to reading
     matrix_row_t last_row_value = current_matrix[current_row];
 
@@ -196,7 +163,6 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
 
     // For each col...
     for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-
         // Select the col pin to read (active low)
         uint8_t pin_state = readPin(col_pins[col_index]);
 
@@ -210,19 +176,14 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
     return (last_row_value != current_matrix[current_row]);
 }
 
-static void select_row(uint8_t row)
+static void select_row(uint8_t row) {
-{
     setPinOutput(row_pins[row]);
     writePinLow(row_pins[row]);
 }
 
-static void unselect_row(uint8_t row)
+static void unselect_row(uint8_t row) { writePinHigh(row_pins[row]); }
-{
-    writePinHigh(row_pins[row]);
-}
 
-static void unselect_rows(void)
+static void unselect_rows(void) {
-{
     for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
         writePinHigh(row_pins[x]);
     }

keyboards/ducky/one2mini/one2mini.c

@@ -1,4 +1,5 @@
 /* Copyright 2019 /u/KeepItUnder
+ * Copyright 2020 Reza Jelveh
  *
  * 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
@@ -31,16 +32,14 @@ void bootmagic_lite(void) {
 
     valMatrixRow = matrix_get_row(2);
 
-    if ( ( valMatrixRow & (1<<3) ) &&
+    if ((valMatrixRow & (1 << 3)) && (valMatrixRow & (1 << 9))) {
-      ( valMatrixRow & (1<<9) ) ) {
         // Jump to bootloader.
         bootloader_jump();
     }
 
     valMatrixRow = matrix_get_row(3);
 
-    if ( ( valMatrixRow & (1<<2) ) &&
+    if ((valMatrixRow & (1 << 2)) && (valMatrixRow & (1 << 3))) {
-      ( valMatrixRow & (1<<3) ) ) {
         // Jump to bootloader.
         bootloader_jump();
     }