i2c spi buses: enforce drivers to set default SPI/I2C bus frequency

Not a lot of drivers use the global default, which is somewhat arbitrary.
This commit is contained in:
Beat Küng
2020-03-17 23:31:17 -04:00
committed by Daniel Agar
parent 8ebde51648
commit d6bb5b3b9e
13 changed files with 60 additions and 2 deletions
@@ -98,6 +98,7 @@ extern "C" int dps310_main(int argc, char *argv[])
using ThisDriver = DPS310;
BusCLIArguments cli{true, true};
cli.i2c_address = 0x77;
cli.default_i2c_frequency = 400000;
cli.default_spi_frequency = 10 * 1000 * 1000;
const char *verb = cli.parseDefaultArguments(argc, argv);
@@ -89,6 +89,7 @@ extern "C" int lps22hb_main(int argc, char *argv[])
{
using ThisDriver = LPS22HB;
BusCLIArguments cli{true, true};
cli.default_i2c_frequency = 400000;
cli.default_spi_frequency = 10 * 1000 * 1000;
const char *verb = cli.parseDefaultArguments(argc, argv);
@@ -89,7 +89,9 @@ extern "C" int lps25h_main(int argc, char *argv[])
{
using ThisDriver = LPS25H;
BusCLIArguments cli{true, true};
cli.default_i2c_frequency = 400000;
cli.default_spi_frequency = 11 * 1000 * 1000;
const char *verb = cli.parseDefaultArguments(argc, argv);
if (!verb) {
@@ -67,6 +67,8 @@ extern "C" int mpl3115a2_main(int argc, char *argv[])
{
using ThisDriver = MPL3115A2;
BusCLIArguments cli{true, false};
cli.default_i2c_frequency = 400000;
const char *verb = cli.parseDefaultArguments(argc, argv);
if (!verb) {
@@ -96,6 +96,8 @@ extern "C" int ms5611_main(int argc, char *argv[])
int ch;
BusCLIArguments cli{true, true};
cli.type = MS5611_DEVICE;
cli.default_i2c_frequency = 400000;
cli.default_spi_frequency = 20 * 1000 * 1000;
uint16_t dev_type_driver = DRV_BARO_DEVTYPE_MS5611;
while ((ch = cli.getopt(argc, argv, "T:")) != EOF) {
@@ -816,6 +816,7 @@ extern "C" __EXPORT int vl53lxx_main(int argc, char *argv[])
int ch;
using ThisDriver = VL53LXX;
BusCLIArguments cli{true, false};
cli.default_i2c_frequency = 400000;
cli.orientation = distance_sensor_s::ROTATION_DOWNWARD_FACING;
while ((ch = cli.getopt(argc, argv, "R:")) != EOF) {
+1
View File
@@ -128,6 +128,7 @@ mpu6000_main(int argc, char *argv[])
using ThisDriver = MPU6000;
BusCLIArguments cli{true, true};
cli.type = MPU_DEVICE_TYPE_MPU6000;
cli.default_i2c_frequency = 400000;
cli.default_spi_frequency = 1000 * 1000; // low speed bus frequency
while ((ch = cli.getopt(argc, argv, "T:R:")) != EOF) {
+1
View File
@@ -430,6 +430,7 @@ extern "C" __EXPORT int irlock_main(int argc, char *argv[])
using ThisDriver = IRLOCK;
BusCLIArguments cli{true, false};
cli.i2c_address = IRLOCK_I2C_ADDRESS;
cli.default_i2c_frequency = 400000;
const char *verb = cli.parseDefaultArguments(argc, argv);
@@ -271,6 +271,7 @@ ak09916_main(int argc, char *argv[])
int ch;
using ThisDriver = AK09916;
BusCLIArguments cli{true, false};
cli.default_i2c_frequency = 400000;
while ((ch = cli.getopt(argc, argv, "R:")) != EOF) {
switch (ch) {
+1
View File
@@ -66,6 +66,7 @@ extern "C" __EXPORT int pcf8583_main(int argc, char *argv[])
{
using ThisDriver = PCF8583;
BusCLIArguments cli{true, false};
cli.default_i2c_frequency = 400000;
const char *verb = cli.parseDefaultArguments(argc, argv);
+22
View File
@@ -110,6 +110,8 @@ bool I2CSPICLITest::test_basic()
{
BusCLIArguments cli{true, true};
cli.default_i2c_frequency = 11111;
cli.default_spi_frequency = 22222;
const char *argv[] = { "-S", "-b", "3", "stop"};
CLIArgsHelper cli_args(argv, 4);
const char *verb = cli.parseDefaultArguments(cli_args.argc, cli_args.argv);
@@ -121,6 +123,8 @@ bool I2CSPICLITest::test_basic()
{
BusCLIArguments cli{true, true};
cli.default_i2c_frequency = 11111;
cli.default_spi_frequency = 22222;
cli.i2c_address = 0xab;
const char *argv[] = { "start", "-X", "-a", "0x14"};
CLIArgsHelper cli_args(argv, 4);
@@ -139,6 +143,7 @@ bool I2CSPICLITest::test_invalid()
{
// SPI disabled, but SPI option provided
BusCLIArguments cli{true, false};
cli.default_i2c_frequency = 11111;
const char *argv[] = { "start", "-S"};
CLIArgsHelper cli_args(argv, 2);
const char *verb = cli.parseDefaultArguments(cli_args.argc, cli_args.argv);
@@ -148,15 +153,28 @@ bool I2CSPICLITest::test_invalid()
{
// Unknown argument
BusCLIArguments cli{true, true};
cli.default_i2c_frequency = 11111;
cli.default_spi_frequency = 22222;
const char *argv[] = { "start", "-I", "-x", "3"};
CLIArgsHelper cli_args(argv, 3);
const char *verb = cli.parseDefaultArguments(cli_args.argc, cli_args.argv);
ut_assert_true(verb == nullptr);
}
{
// default bus frequency not set
BusCLIArguments cli{true, true};
const char *argv[] = { "start", "-I"};
CLIArgsHelper cli_args(argv, 2);
const char *verb = cli.parseDefaultArguments(cli_args.argc, cli_args.argv);
ut_assert_true(verb == nullptr);
}
{
// Another unknown argument
BusCLIArguments cli{true, true};
cli.default_i2c_frequency = 11111;
cli.default_spi_frequency = 22222;
const char *argv[] = { "-x", "start" };
CLIArgsHelper cli_args(argv, 2);
const char *verb = cli.parseDefaultArguments(cli_args.argc, cli_args.argv);
@@ -170,6 +188,8 @@ bool I2CSPICLITest::test_custom()
{
// custom argument
BusCLIArguments cli{true, true};
cli.default_i2c_frequency = 11111;
cli.default_spi_frequency = 22222;
const char *argv[] = { "start", "-T", "432", "-a", "12"};
CLIArgsHelper cli_args(argv, 5);
int ch;
@@ -196,6 +216,8 @@ bool I2CSPICLITest::test_custom()
{
// duplicate argument
BusCLIArguments cli{true, true};
cli.default_i2c_frequency = 11111;
cli.default_spi_frequency = 22222;
const char *argv[] = { "start"};
CLIArgsHelper cli_args(argv, 1);
int ch;