LORA: update test

pull/14049/head
jeromecoutant 2020-12-15 14:17:06 +01:00
parent 80aa710a48
commit c3664d2339
3 changed files with 78 additions and 191 deletions

View File

@ -12,6 +12,7 @@ The default mbed_app.json file provides configuration for some already supported
You can use the following command to run tests:
`mbed test -n mbed-os-tests-lorawan-loraradio -m TARGET -t GCC_ARM --app-config mbed-os/TESTS/lorawan/loraradio/template_mbed_app.txt`
`mbed test -n connectivity-lorawan-tests-tests-lorawan-loraradio -m TARGET -t GCC_ARM -v --app-config connectivity/lorawan/tests/TESTS/lorawan/loraradio/template_mbed_app.txt
`
Replace TARGET with the target device.

View File

@ -33,16 +33,18 @@
#define SX1272 0xFF
#define SX1276 0xEE
#if (MBED_CONF_APP_LORA_RADIO == SX1272)
#ifndef MBED_CONF_LORA_RADIO
#error [NOT_SUPPORTED] Lora radio is not set
#else
#if (MBED_CONF_LORA_RADIO == SX1272)
#include "SX1272_LoRaRadio.h"
#elif (MBED_CONF_APP_LORA_RADIO == SX1276)
#elif (MBED_CONF_LORA_RADIO == SX1276)
#include "SX1276_LoRaRadio.h"
#else
#error [NOT_SUPPORTED] Requires parameters from application config file.
#error Lora radio is not configured
#endif
#if (MBED_CONF_APP_LORA_RADIO == SX1272) || (MBED_CONF_APP_LORA_RADIO == SX1276)
using namespace utest::v1;
using namespace mbed;
@ -203,50 +205,12 @@ utest::v1::status_t test_setup(const size_t number_of_cases)
utest::v1::status_t case_setup_handler(const Case *const source, const size_t index_of_case)
{
#if (MBED_CONF_APP_LORA_RADIO == SX1272)
#if (MBED_CONF_LORA_RADIO == SX1272)
radio = new SX1272_LoRaRadio();
radio = new SX1272_LoRaRadio(MBED_CONF_APP_LORA_SPI_MOSI,
MBED_CONF_APP_LORA_SPI_MISO,
MBED_CONF_APP_LORA_SPI_SCLK,
MBED_CONF_APP_LORA_CS,
MBED_CONF_APP_LORA_RESET,
MBED_CONF_APP_LORA_DIO0,
MBED_CONF_APP_LORA_DIO1,
MBED_CONF_APP_LORA_DIO2,
MBED_CONF_APP_LORA_DIO3,
MBED_CONF_APP_LORA_DIO4,
MBED_CONF_APP_LORA_DIO5,
MBED_CONF_APP_LORA_RF_SWITCH_CTL1,
MBED_CONF_APP_LORA_RF_SWITCH_CTL2,
MBED_CONF_APP_LORA_TXCTL,
MBED_CONF_APP_LORA_RXCTL,
MBED_CONF_APP_LORA_ANT_SWITCH,
MBED_CONF_APP_LORA_PWR_AMP_CTL,
MBED_CONF_APP_LORA_TCXO);
#elif (MBED_CONF_LORA_RADIO == SX1276)
radio = new SX1276_LoRaRadio();
#elif (MBED_CONF_APP_LORA_RADIO == SX1276)
radio = new SX1276_LoRaRadio(MBED_CONF_APP_LORA_SPI_MOSI,
MBED_CONF_APP_LORA_SPI_MISO,
MBED_CONF_APP_LORA_SPI_SCLK,
MBED_CONF_APP_LORA_CS,
MBED_CONF_APP_LORA_RESET,
MBED_CONF_APP_LORA_DIO0,
MBED_CONF_APP_LORA_DIO1,
MBED_CONF_APP_LORA_DIO2,
MBED_CONF_APP_LORA_DIO3,
MBED_CONF_APP_LORA_DIO4,
MBED_CONF_APP_LORA_DIO5,
MBED_CONF_APP_LORA_RF_SWITCH_CTL1,
MBED_CONF_APP_LORA_RF_SWITCH_CTL2,
MBED_CONF_APP_LORA_TXCTL,
MBED_CONF_APP_LORA_RXCTL,
MBED_CONF_APP_LORA_ANT_SWITCH,
MBED_CONF_APP_LORA_PWR_AMP_CTL,
MBED_CONF_APP_LORA_TCXO);
#else
#error [NOT_SUPPORTED] Unknown LoRa radio specified (SX1272,SX1276 are valid)
#endif
TEST_ASSERT(radio);
@ -260,12 +224,12 @@ utest::v1::status_t case_teardown_handler(const Case *const source, const size_t
{
radio->sleep();
#if (MBED_CONF_APP_LORA_RADIO == SX1272)
#if (MBED_CONF_LORA_RADIO == SX1272)
delete static_cast<SX1272_LoRaRadio *>(radio);
#elif (MBED_CONF_APP_LORA_RADIO == SX1276)
#elif (MBED_CONF_LORA_RADIO == SX1276)
delete static_cast<SX1276_LoRaRadio *>(radio);
#else
#error [NOT_SUPPORTED] Unknown LoRa radio specified (SX1272,SX1276 are valid)
#endif
radio = NULL;
@ -288,5 +252,5 @@ int main()
return !Harness::run(specification);
}
#endif // (MBED_CONF_APP_LORA_RADIO == SX1272) || (MBED_CONF_APP_LORA_RADIO == SX1276)
#endif // (MBED_CONF_LORA_RADIO)
#endif // !defined(MBED_CONF_RTOS_PRESENT)

View File

@ -1,160 +1,82 @@
{
"config": {
"lora-radio": {
"help": "Which radio to use (options: SX1272,SX1276)",
"value": "SX1276"
},
"lora-spi-mosi": { "value": "NC" },
"lora-spi-miso": { "value": "NC" },
"lora-spi-sclk": { "value": "NC" },
"lora-cs": { "value": "NC" },
"lora-reset": { "value": "NC" },
"lora-dio0": { "value": "NC" },
"lora-dio1": { "value": "NC" },
"lora-dio2": { "value": "NC" },
"lora-dio3": { "value": "NC" },
"lora-dio4": { "value": "NC" },
"lora-dio5": { "value": "NC" },
"lora-rf-switch-ctl1": { "value": "NC" },
"lora-rf-switch-ctl2": { "value": "NC" },
"lora-txctl": { "value": "NC" },
"lora-rxctl": { "value": "NC" },
"lora-ant-switch": { "value": "NC" },
"lora-pwr-amp-ctl": { "value": "NC" },
"lora-tcxo": { "value": "NC" }
},
"target_overrides": {
"K64F": {
"lora-spi-mosi": "D11",
"lora-spi-miso": "D12",
"lora-spi-sclk": "D13",
"lora-cs": "D10",
"lora-reset": "A0",
"lora-dio0": "D2",
"lora-dio1": "D3",
"lora-dio2": "D4",
"lora-dio3": "D5",
"lora-dio4": "D8",
"lora-dio5": "D9",
"lora-rf-switch-ctl1": "NC",
"lora-rf-switch-ctl2": "NC",
"lora-txctl": "NC",
"lora-rxctl": "NC",
"lora-ant-switch": "A4",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"target.components_add": ["SX1276"],
"sx1276-lora-driver.spi-mosi": "D11",
"sx1276-lora-driver.spi-miso": "D12",
"sx1276-lora-driver.spi-sclk": "D13",
"sx1276-lora-driver.spi-cs": "D10",
"sx1276-lora-driver.reset": "A0",
"sx1276-lora-driver.dio0": "D2",
"sx1276-lora-driver.dio1": "D3",
"sx1276-lora-driver.dio2": "D4",
"sx1276-lora-driver.dio3": "D5",
"sx1276-lora-driver.dio4": "D8",
"sx1276-lora-driver.dio5": "D9",
"sx1276-lora-driver.ant-switch": "A4"
},
"DISCO_L072CZ_LRWAN1": {
"lora-radio": "SX1276",
"lora-spi-mosi": "PA_7",
"lora-spi-miso": "PA_6",
"lora-spi-sclk": "PB_3",
"lora-cs": "PA_15",
"lora-reset": "PC_0",
"lora-dio0": "PB_4",
"lora-dio1": "PB_1",
"lora-dio2": "PB_0",
"lora-dio3": "PC_13",
"lora-dio4": "NC",
"lora-dio5": "NC",
"lora-rf-switch-ctl1": "NC",
"lora-rf-switch-ctl2": "NC",
"lora-txctl": "PC_2",
"lora-rxctl": "PA_1",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "PC_1",
"lora-tcxo": "PA_12"
},
"XDOT_L151CC": {
"lora-radio": "SX1272",
"lora-spi-mosi": "LORA_MOSI",
"lora-spi-miso": "LORA_MISO",
"lora-spi-sclk": "LORA_SCK",
"lora-cs": "LORA_NSS",
"lora-reset": "LORA_RESET",
"lora-dio0": "LORA_DIO0",
"lora-dio1": "LORA_DIO1",
"lora-dio2": "LORA_DIO2",
"lora-dio3": "LORA_DIO3",
"lora-dio4": "LORA_DIO4",
"lora-dio5": "NC",
"lora-rf-switch-ctl1": "NC",
"lora-rf-switch-ctl2": "NC",
"lora-txctl": "NC",
"lora-rxctl": "NC",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"target.components_add": ["SX1272"],
"sx1272-lora-driver.spi-mosi": "LORA_MOSI",
"sx1272-lora-driver.spi-miso": "LORA_MISO",
"sx1272-lora-driver.spi-sclk": "LORA_SCK",
"sx1272-lora-driver.spi-cs": "LORA_NSS",
"sx1272-lora-driver.reset": "LORA_RESET",
"sx1272-lora-driver.dio0": "LORA_DIO0",
"sx1272-lora-driver.dio1": "LORA_DIO1",
"sx1272-lora-driver.dio2": "LORA_DIO2",
"sx1272-lora-driver.dio3": "LORA_DIO3",
"sx1272-lora-driver.dio4": "LORA_DIO4"
},
"LTEK_FF1705": {
"lora-radio": "SX1272",
"lora-spi-mosi": "LORA_MOSI",
"lora-spi-miso": "LORA_MISO",
"lora-spi-sclk": "LORA_SCK",
"lora-cs": "LORA_NSS",
"lora-reset": "LORA_RESET",
"lora-dio0": "LORA_DIO0",
"lora-dio1": "LORA_DIO1",
"lora-dio2": "LORA_DIO2",
"lora-dio3": "LORA_DIO3",
"lora-dio4": "LORA_DIO4",
"lora-dio5": "NC",
"lora-rf-switch-ctl1": "NC",
"lora-rf-switch-ctl2": "NC",
"lora-txctl": "NC",
"lora-rxctl": "NC",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"target.components_add": ["SX1272"],
"sx1272-lora-driver.spi-mosi": "LORA_MOSI",
"sx1272-lora-driver.spi-miso": "LORA_MISO",
"sx1272-lora-driver.spi-sclk": "LORA_SCK",
"sx1272-lora-driver.spi-cs": "LORA_NSS",
"sx1272-lora-driver.reset": "LORA_RESET",
"sx1272-lora-driver.dio0": "LORA_DIO0",
"sx1272-lora-driver.dio1": "LORA_DIO1",
"sx1272-lora-driver.dio2": "LORA_DIO2",
"sx1272-lora-driver.dio3": "LORA_DIO3",
"sx1272-lora-driver.dio4": "LORA_DIO4"
},
"MTS_MDOT_F411RE": {
"lora-radio": "SX1272",
"lora-spi-mosi": "LORA_MOSI",
"lora-spi-miso": "LORA_MISO",
"lora-spi-sclk": "LORA_SCK",
"lora-cs": "LORA_NSS",
"lora-reset": "LORA_RESET",
"lora-dio0": "LORA_DIO0",
"lora-dio1": "LORA_DIO1",
"lora-dio2": "LORA_DIO2",
"lora-dio3": "LORA_DIO3",
"lora-dio4": "LORA_DIO4",
"lora-dio5": "LORA_DIO5",
"lora-rf-switch-ctl1": "NC",
"lora-rf-switch-ctl2": "NC",
"lora-txctl": "LORA_TXCTL",
"lora-rxctl": "LORA_RXCTL",
"lora-ant-switch": "NC",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"target.components_add": ["SX1272"],
"sx1272-lora-driver.spi-mosi": "LORA_MOSI",
"sx1272-lora-driver.spi-miso": "LORA_MISO",
"sx1272-lora-driver.spi-sclk": "LORA_SCK",
"sx1272-lora-driver.spi-cs": "LORA_NSS",
"sx1272-lora-driver.reset": "LORA_RESET",
"sx1272-lora-driver.dio0": "LORA_DIO0",
"sx1272-lora-driver.dio1": "LORA_DIO1",
"sx1272-lora-driver.dio2": "LORA_DIO2",
"sx1272-lora-driver.dio3": "LORA_DIO3",
"sx1272-lora-driver.dio4": "LORA_DIO4",
"sx1272-lora-driver.dio5": "LORA_DIO5"
},
"ADV_WISE_1510": {
"lora-radio": "SX1276",
"lora-spi-mosi": "SPI_RF_MOSI",
"lora-spi-miso": "SPI_RF_MISO",
"lora-spi-sclk": "SPI_RF_SCK",
"lora-cs": "SPI_RF_CS",
"lora-reset": "SPI_RF_RESET",
"lora-dio0": "DIO0",
"lora-dio1": "DIO1",
"lora-dio2": "DIO2",
"lora-dio3": "DIO3",
"lora-dio4": "DIO4",
"lora-dio5": "DIO5",
"lora-rf-switch-ctl1": "NC",
"lora-rf-switch-ctl2": "NC",
"lora-txctl": "NC",
"lora-rxctl": "NC",
"lora-ant-switch": "ANT_SWITCH",
"lora-pwr-amp-ctl": "NC",
"lora-tcxo": "NC"
"target.components_add": ["SX1276"],
"sx1276-lora-driver.spi-mosi": "SPI_RF_MOSI",
"sx1276-lora-driver.spi-miso": "SPI_RF_MISO",
"sx1276-lora-driver.spi-sclk": "SPI_RF_SCK",
"sx1276-lora-driver.spi-cs": "SPI_RF_CS",
"sx1276-lora-driver.reset": "SPI_RF_RESET",
"sx1276-lora-driver.dio0": "DIO0",
"sx1276-lora-driver.dio1": "DIO1",
"sx1276-lora-driver.dio2": "DIO2",
"sx1276-lora-driver.dio3": "DIO3",
"sx1276-lora-driver.dio4": "DIO4",
"sx1276-lora-driver.dio5": "DIO5",
"sx1276-lora-driver.ant-switch": "ANT_SWITCH"
}
}
}