Update .clang-format and apply
Update .clang-format for LLVM 14.0, available on Ubuntu 22.04. There is still plenty that clang-format sucks at or does wrong, so either add some more blocks to disable it, or just put up with it. Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
committed by
Jeremy Soller
Jeremy Soller
parent
c3267fc4ad
commit
e032c5f0f2
@ -18,9 +18,9 @@
|
||||
#include <string.h>
|
||||
|
||||
#ifndef __SCRATCH__
|
||||
#include <board/scratch.h>
|
||||
#include <board/kbled.h>
|
||||
#include <board/kbscan.h>
|
||||
#include <board/scratch.h>
|
||||
#include <board/kbled.h>
|
||||
#include <board/kbscan.h>
|
||||
#endif
|
||||
#include <board/smfi.h>
|
||||
#include <common/command.h>
|
||||
@ -118,15 +118,15 @@ static enum Result cmd_print(void) {
|
||||
|
||||
static enum Result cmd_fan_get(void) {
|
||||
switch (smfi_cmd[SMFI_CMD_DATA]) {
|
||||
case 0:
|
||||
// Get duty of fan 0
|
||||
smfi_cmd[SMFI_CMD_DATA + 1] = DCR2;
|
||||
return RES_OK;
|
||||
case 1:
|
||||
// Get duty of fan 1
|
||||
//TODO: only allow on platforms like addw2
|
||||
smfi_cmd[SMFI_CMD_DATA + 1] = DCR4;
|
||||
return RES_OK;
|
||||
case 0:
|
||||
// Get duty of fan 0
|
||||
smfi_cmd[SMFI_CMD_DATA + 1] = DCR2;
|
||||
return RES_OK;
|
||||
case 1:
|
||||
// Get duty of fan 1
|
||||
//TODO: only allow on platforms like addw2
|
||||
smfi_cmd[SMFI_CMD_DATA + 1] = DCR4;
|
||||
return RES_OK;
|
||||
}
|
||||
|
||||
// Failed if fan not found
|
||||
@ -135,15 +135,15 @@ static enum Result cmd_fan_get(void) {
|
||||
|
||||
static enum Result cmd_fan_set(void) {
|
||||
switch (smfi_cmd[SMFI_CMD_DATA]) {
|
||||
case 0:
|
||||
// Set duty cycle of fan 0
|
||||
DCR2 = smfi_cmd[SMFI_CMD_DATA + 1];
|
||||
return RES_OK;
|
||||
case 1:
|
||||
// Set duty cycle of fan 1
|
||||
//TODO: only allow on platforms like addw2
|
||||
DCR4 = smfi_cmd[SMFI_CMD_DATA + 1];
|
||||
return RES_OK;
|
||||
case 0:
|
||||
// Set duty cycle of fan 0
|
||||
DCR2 = smfi_cmd[SMFI_CMD_DATA + 1];
|
||||
return RES_OK;
|
||||
case 1:
|
||||
// Set duty cycle of fan 1
|
||||
//TODO: only allow on platforms like addw2
|
||||
DCR4 = smfi_cmd[SMFI_CMD_DATA + 1];
|
||||
return RES_OK;
|
||||
}
|
||||
|
||||
// Failed if fan not found
|
||||
@ -168,8 +168,7 @@ static enum Result cmd_keymap_set(void) {
|
||||
int16_t layer = smfi_cmd[SMFI_CMD_DATA];
|
||||
int16_t output = smfi_cmd[SMFI_CMD_DATA + 1];
|
||||
int16_t input = smfi_cmd[SMFI_CMD_DATA + 2];
|
||||
uint16_t key =
|
||||
((uint16_t)smfi_cmd[SMFI_CMD_DATA + 3]) |
|
||||
uint16_t key = ((uint16_t)smfi_cmd[SMFI_CMD_DATA + 3]) |
|
||||
(((uint16_t)smfi_cmd[SMFI_CMD_DATA + 4]) << 8);
|
||||
//TODO: consider only setting if the key has changed
|
||||
if (keymap_set(layer, output, input, key)) {
|
||||
@ -321,67 +320,67 @@ void smfi_event(void) {
|
||||
|
||||
switch (smfi_cmd[SMFI_CMD_CMD]) {
|
||||
#if !defined(__SCRATCH__)
|
||||
case CMD_PROBE:
|
||||
// Signature
|
||||
smfi_cmd[SMFI_CMD_DATA + 0] = 0x76;
|
||||
smfi_cmd[SMFI_CMD_DATA + 1] = 0xEC;
|
||||
// Version
|
||||
smfi_cmd[SMFI_CMD_DATA + 2] = 0x01;
|
||||
//TODO: bitmask of implemented commands?
|
||||
// Always successful
|
||||
smfi_cmd[SMFI_CMD_RES] = RES_OK;
|
||||
break;
|
||||
case CMD_BOARD:
|
||||
strncpy(&smfi_cmd[SMFI_CMD_DATA], board(), ARRAY_SIZE(smfi_cmd) - SMFI_CMD_DATA);
|
||||
// Always successful
|
||||
smfi_cmd[SMFI_CMD_RES] = RES_OK;
|
||||
break;
|
||||
case CMD_VERSION:
|
||||
strncpy(&smfi_cmd[SMFI_CMD_DATA], version(), ARRAY_SIZE(smfi_cmd) - SMFI_CMD_DATA);
|
||||
// Always successful
|
||||
smfi_cmd[SMFI_CMD_RES] = RES_OK;
|
||||
break;
|
||||
case CMD_PRINT:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_print();
|
||||
break;
|
||||
case CMD_FAN_GET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_fan_get();
|
||||
break;
|
||||
case CMD_FAN_SET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_fan_set();
|
||||
break;
|
||||
case CMD_KEYMAP_GET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_keymap_get();
|
||||
break;
|
||||
case CMD_KEYMAP_SET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_keymap_set();
|
||||
break;
|
||||
case CMD_LED_GET_VALUE:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_led_get_value();
|
||||
break;
|
||||
case CMD_LED_SET_VALUE:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_led_set_value();
|
||||
break;
|
||||
case CMD_LED_GET_COLOR:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_led_get_color();
|
||||
break;
|
||||
case CMD_LED_SET_COLOR:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_led_set_color();
|
||||
break;
|
||||
case CMD_MATRIX_GET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_matrix_get();
|
||||
break;
|
||||
case CMD_PROBE:
|
||||
// Signature
|
||||
smfi_cmd[SMFI_CMD_DATA + 0] = 0x76;
|
||||
smfi_cmd[SMFI_CMD_DATA + 1] = 0xEC;
|
||||
// Version
|
||||
smfi_cmd[SMFI_CMD_DATA + 2] = 0x01;
|
||||
//TODO: bitmask of implemented commands?
|
||||
// Always successful
|
||||
smfi_cmd[SMFI_CMD_RES] = RES_OK;
|
||||
break;
|
||||
case CMD_BOARD:
|
||||
strncpy(&smfi_cmd[SMFI_CMD_DATA], board(), ARRAY_SIZE(smfi_cmd) - SMFI_CMD_DATA);
|
||||
// Always successful
|
||||
smfi_cmd[SMFI_CMD_RES] = RES_OK;
|
||||
break;
|
||||
case CMD_VERSION:
|
||||
strncpy(&smfi_cmd[SMFI_CMD_DATA], version(), ARRAY_SIZE(smfi_cmd) - SMFI_CMD_DATA);
|
||||
// Always successful
|
||||
smfi_cmd[SMFI_CMD_RES] = RES_OK;
|
||||
break;
|
||||
case CMD_PRINT:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_print();
|
||||
break;
|
||||
case CMD_FAN_GET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_fan_get();
|
||||
break;
|
||||
case CMD_FAN_SET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_fan_set();
|
||||
break;
|
||||
case CMD_KEYMAP_GET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_keymap_get();
|
||||
break;
|
||||
case CMD_KEYMAP_SET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_keymap_set();
|
||||
break;
|
||||
case CMD_LED_GET_VALUE:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_led_get_value();
|
||||
break;
|
||||
case CMD_LED_SET_VALUE:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_led_set_value();
|
||||
break;
|
||||
case CMD_LED_GET_COLOR:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_led_get_color();
|
||||
break;
|
||||
case CMD_LED_SET_COLOR:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_led_set_color();
|
||||
break;
|
||||
case CMD_MATRIX_GET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_matrix_get();
|
||||
break;
|
||||
#endif // !defined(__SCRATCH__)
|
||||
case CMD_SPI:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_spi();
|
||||
break;
|
||||
case CMD_RESET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_reset();
|
||||
break;
|
||||
default:
|
||||
// Command not found
|
||||
smfi_cmd[SMFI_CMD_RES] = RES_ERR;
|
||||
break;
|
||||
case CMD_SPI:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_spi();
|
||||
break;
|
||||
case CMD_RESET:
|
||||
smfi_cmd[SMFI_CMD_RES] = cmd_reset();
|
||||
break;
|
||||
default:
|
||||
// Command not found
|
||||
smfi_cmd[SMFI_CMD_RES] = RES_ERR;
|
||||
break;
|
||||
}
|
||||
|
||||
// Mark command as finished
|
||||
|
||||
Reference in New Issue
Block a user