sys/shell/commands/sc_sht1x.c: fix style

This commit is contained in:
Marian Buschsieweke 2021-04-01 10:19:30 +02:00
parent 80aaf265d6
commit 78aa197ab8
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F

View File

@ -34,19 +34,19 @@ extern sht1x_dev_t sht1x_devs[SHT1X_NUM];
static sht1x_dev_t *get_dev(int argc, char **argv) static sht1x_dev_t *get_dev(int argc, char **argv)
{ {
switch (argc) { switch (argc) {
case 1: case 1:
return &sht1x_devs[0]; return &sht1x_devs[0];
case 2: case 2:
{ {
int pos = atoi(argv[1]); int pos = atoi(argv[1]);
if ((pos < 0) || (pos >= (int)SHT1X_NUM)) { if ((pos < 0) || (pos >= (int)SHT1X_NUM)) {
printf("No SHT10/SHT11/SHT15 device with number %i\n", pos); printf("No SHT10/SHT11/SHT15 device with number %i\n", pos);
return NULL; return NULL;
}
return &sht1x_devs[pos];
} }
default: return &sht1x_devs[pos];
break; }
default:
break;
} }
printf("Usage: %s [DEVICE_NUMBER]\n", argv[0]); printf("Usage: %s [DEVICE_NUMBER]\n", argv[0]);
@ -67,24 +67,24 @@ static int read_sensor(int16_t *temp, int16_t *hum, int argc, char **argv)
} }
switch (sht1x_read(dev, temp, hum)) { switch (sht1x_read(dev, temp, hum)) {
case 0: case 0:
break; break;
case -EIO: case -EIO:
error_msg("gpio_init() failed"); error_msg("gpio_init() failed");
return -1; return -1;
case -EBADMSG: case -EBADMSG:
error_msg("CRC checksum error"); error_msg("CRC checksum error");
return -1; return -1;
case -ECANCELED: case -ECANCELED:
error_msg("Measurement timed out"); error_msg("Measurement timed out");
return -1; return -1;
case -EPROTO: case -EPROTO:
error_msg("Sensor did not acknowledge command"); error_msg("Sensor did not acknowledge command");
return -1; return -1;
default: default:
/* Should never happen, but better safe the sorry */ /* Should never happen, but better safe the sorry */
error_msg("Unknown error"); error_msg("Unknown error");
return -1; return -1;
} }
return 0; return 0;
@ -209,118 +209,118 @@ int _sht_config_handler(int argc, char **argv)
} }
switch (argv[i][1]) { switch (argv[i][1]) {
case 'd': case 'd':
if (++i >= argc) { if (++i >= argc) {
missing_argument(i - 1, argv); missing_argument(i - 1, argv);
return -1; return -1;
} }
dev_num = atoi(argv[i]); dev_num = atoi(argv[i]);
if ((dev_num < 0) || (dev_num >= (int)SHT1X_NUM)) { if ((dev_num < 0) || (dev_num >= (int)SHT1X_NUM)) {
printf("No SHT10/11/15 sensor with number %i\n", dev_num); printf("No SHT10/11/15 sensor with number %i\n", dev_num);
return -1; return -1;
} }
break; break;
case 't': case 't':
if (++i >= argc) { if (++i >= argc) {
missing_argument(i - 1, argv); missing_argument(i - 1, argv);
return -1; return -1;
} }
temp_off = atoi(argv[i]); temp_off = atoi(argv[i]);
break;
case 'h':
if (++i >= argc) {
missing_argument(i - 1, argv);
return -1;
}
hum_off = atoi(argv[i]);
break;
case 'r':
if (++i >= argc) {
missing_argument(i - 1, argv);
return -1;
}
if ((!argv[i][0]) || (argv[i][1])) {
invalid_argument(i - 1, argv, "l, h");
return -1;
}
switch (argv[i][0]) {
case 'l':
set_conf |= SHT1X_CONF_LOW_RESOLUTION;
break; break;
case 'h': case 'h':
if (++i >= argc) { unset_conf |= SHT1X_CONF_LOW_RESOLUTION;
missing_argument(i - 1, argv);
return -1;
}
hum_off = atoi(argv[i]);
break;
case 'r':
if (++i >= argc) {
missing_argument(i - 1, argv);
return -1;
}
if ((!argv[i][0]) || (argv[i][1])) {
invalid_argument(i - 1, argv, "l, h");
return -1;
}
switch (argv[i][0]) {
case 'l':
set_conf |= SHT1X_CONF_LOW_RESOLUTION;
break;
case 'h':
unset_conf |= SHT1X_CONF_LOW_RESOLUTION;
break;
default:
invalid_argument(i - 1, argv, "l, h");
return -1;
}
break;
case 'c':
if (++i >= argc) {
missing_argument(i - 1, argv);
return -1;
}
if ((!argv[i][0]) || (argv[i][1])) {
invalid_argument(i - 1, argv, "y, n");
return -1;
}
switch (argv[i][0]) {
case 'y':
set_conf |= SHT1X_CONF_SKIP_CALIBRATION;
break;
case 'n':
unset_conf |= SHT1X_CONF_SKIP_CALIBRATION;
break;
default:
invalid_argument(i - 1, argv, "y, n");
return -1;
}
break;
case 'H':
if (++i >= argc) {
missing_argument(i - 1, argv);
return -1;
}
if ((!argv[i][0]) || (argv[i][1])) {
invalid_argument(i - 1, argv, "y, n");
return -1;
}
switch (argv[i][0]) {
case 'y':
set_conf |= SHT1X_CONF_ENABLE_HEATER;
break;
case 'n':
unset_conf |= SHT1X_CONF_ENABLE_HEATER;
break;
default:
invalid_argument(i - 1, argv, "y, n");
return -1;
}
break;
case 'C':
if (++i >= argc) {
missing_argument(i - 1, argv);
return -1;
}
if ((!argv[i][0]) || (argv[i][1])) {
invalid_argument(i - 1, argv, "y, n");
return -1;
}
switch (argv[i][0]) {
case 'y':
unset_conf |= SHT1X_CONF_SKIP_CRC;
break;
case 'n':
set_conf |= SHT1X_CONF_SKIP_CRC;
break;
default:
invalid_argument(i - 1, argv, "y, n");
return -1;
}
break; break;
default: default:
unknown_parameter(i, argv); invalid_argument(i - 1, argv, "l, h");
return -1; return -1;
}
break;
case 'c':
if (++i >= argc) {
missing_argument(i - 1, argv);
return -1;
}
if ((!argv[i][0]) || (argv[i][1])) {
invalid_argument(i - 1, argv, "y, n");
return -1;
}
switch (argv[i][0]) {
case 'y':
set_conf |= SHT1X_CONF_SKIP_CALIBRATION;
break;
case 'n':
unset_conf |= SHT1X_CONF_SKIP_CALIBRATION;
break;
default:
invalid_argument(i - 1, argv, "y, n");
return -1;
}
break;
case 'H':
if (++i >= argc) {
missing_argument(i - 1, argv);
return -1;
}
if ((!argv[i][0]) || (argv[i][1])) {
invalid_argument(i - 1, argv, "y, n");
return -1;
}
switch (argv[i][0]) {
case 'y':
set_conf |= SHT1X_CONF_ENABLE_HEATER;
break;
case 'n':
unset_conf |= SHT1X_CONF_ENABLE_HEATER;
break;
default:
invalid_argument(i - 1, argv, "y, n");
return -1;
}
break;
case 'C':
if (++i >= argc) {
missing_argument(i - 1, argv);
return -1;
}
if ((!argv[i][0]) || (argv[i][1])) {
invalid_argument(i - 1, argv, "y, n");
return -1;
}
switch (argv[i][0]) {
case 'y':
unset_conf |= SHT1X_CONF_SKIP_CRC;
break;
case 'n':
set_conf |= SHT1X_CONF_SKIP_CRC;
break;
default:
invalid_argument(i - 1, argv, "y, n");
return -1;
}
break;
default:
unknown_parameter(i, argv);
return -1;
} }
} }
@ -330,24 +330,24 @@ int _sht_config_handler(int argc, char **argv)
new_conf &= ~(unset_conf); new_conf &= ~(unset_conf);
new_conf |= set_conf; new_conf |= set_conf;
switch (sht1x_configure(&sht1x_devs[dev_num], new_conf)) { switch (sht1x_configure(&sht1x_devs[dev_num], new_conf)) {
case 0: case 0:
break; break;
case -EIO: case -EIO:
error_msg("gpio_init() failed"); error_msg("gpio_init() failed");
return -1; return -1;
case -EBADMSG: case -EBADMSG:
error_msg("CRC checksum error"); error_msg("CRC checksum error");
return -1; return -1;
case -ECANCELED: case -ECANCELED:
error_msg("Sensor did not apply configuration"); error_msg("Sensor did not apply configuration");
return -1; return -1;
case -EPROTO: case -EPROTO:
error_msg("Sensor did not acknowledge command"); error_msg("Sensor did not acknowledge command");
return -1; return -1;
default: default:
/* Should never happen, but better safe the sorry */ /* Should never happen, but better safe the sorry */
error_msg("Unknown error"); error_msg("Unknown error");
return -1; return -1;
} }
} }