diff --git a/main.cpp b/main.cpp index 695f1fe..95944af 100644 --- a/main.cpp +++ b/main.cpp @@ -61,7 +61,7 @@ DHT dht(MBED_CONF_APP_DHT_DATA, MBED_CONF_APP_DHT_TYPE); #endif #if MBED_CONF_APP_HX711_ENABLED -HX711 loadcell(MBED_CONF_APP_HX711_CLK, MBED_CONF_APP_HX711_DATA); +HX711 loadcell(MBED_CONF_APP_HX711_DATA, MBED_CONF_APP_HX711_CLK); #endif int main(void) { diff --git a/mbed_app.json b/mbed_app.json new file mode 100644 index 0000000..e72b2ef --- /dev/null +++ b/mbed_app.json @@ -0,0 +1,121 @@ +{ + "config": { + "tx-timer": { "value": 30000 }, + "lora-radio": { + "help": "Which radio to use (options: SX1272,SX1276)", + "value": "SX1276" + }, + "main_stack_size": { "value": 4096 }, + "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" }, + "battery-enabled": { "value": "false" }, + "battery-in-lpp": { "value": "false" }, + "battery-adc": { "value": "NC" }, + "battery-ratio": { "value": "2.0f" }, + "dht-enabled": { "value": "false" }, + "dht-type": { "value": "DHT::DHT22" }, + "dht-data": { "value": "NC" }, + "hx711-enabled": { "value": "false" }, + "hx711-clk": { "value": "NC" }, + "hx711-data": { "value": "NC" }, + "hx711-scale": { "value": "1.0f" }, + "hx711-offset": { "value": 0 } + }, + "target_overrides": { + "*": { + "platform.stdio-convert-newlines": true, + "platform.stdio-baud-rate": 115200, + "platform.default-serial-baud-rate": 115200, + "lora.app-port": 3, + "lora.over-the-air-activation": true, + "lora.duty-cycle-on": false, + "lora.phy": 0, + "lora.device-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }", + "lora.application-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }", + "lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }" + }, + + "NUCLEO_L073RZ": { + "main_stack_size": 1024, + "target.lpticker_lptim": 0, + "target.clock_source": "USE_PLL_HSI", + "lora.duty-cycle-on": false, + "tx-timer": 600000, + "lora-radio": "SX1272", + "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": "NC", + "lora-dio5": "NC", + "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", + "battery-enabled": true, + "battery-in-lpp": true, + "battery-adc": "A1", + "battery-ratio": "2.0f", + "dht-enabled": true, + "dht-data": "D8", + "dht-type": "DHT::DHT22", + "hx711-enabled": true, + "hx711-clk": "D6", + "hx711-data": "D7", + "hx711-scale": "21000.0f", + "hx711-offset": 59600 + }, + + "MTB_RAK811": { + "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": "NC", + "lora-rf-switch-ctl1": "NC", + "lora-rf-switch-ctl2": "NC", + "lora-txctl": "ANT_CTX_PA", + "lora-rxctl": "ANT_CRX_RX", + "lora-ant-switch": "NC", + "lora-pwr-amp-ctl": "NC", + "lora-tcxo": "RF_TCXO_EN", + "battery-enabled": true, + "battery-adc": "PA_2", + "dht-enabled": true, + "dht-data": "PA_1", + "dht-type": "DHT::DHT22" + } + }, + "macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_lora_config.h\""] +} diff --git a/mbed_app.json.sample b/mbed_app.json.sample deleted file mode 100644 index e198d9a..0000000 --- a/mbed_app.json.sample +++ /dev/null @@ -1,298 +0,0 @@ -{ - "config": { - "tx-timer": { "value": 30000 }, - "lora-radio": { - "help": "Which radio to use (options: SX1272,SX1276)", - "value": "SX1276" - }, - "main_stack_size": { "value": 4096 }, - "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" }, - "battery-enabled": { "value": "false" }, - "battery-in-lpp": { "value": "false" }, - "battery-adc": { "value": "NC" }, - "battery-ratio": { "value": "2.0f" }, - "dht-enabled": { "value": "false" }, - "dht-type": { "value": "DHT::DHT22" }, - "dht-data": { "value": "NC" }, - "hx711-enabled": { "value": "false" }, - "hx711-clk": { "value": "NC" }, - "hx711-data": { "value": "NC" }, - "hx711-scale": { "value": "1.0f" }, - "hx711-offset": { "value": 0 } - }, - "target_overrides": { - "*": { - "platform.stdio-convert-newlines": true, - "platform.stdio-baud-rate": 115200, - "platform.default-serial-baud-rate": 115200, - "lora.app-port": 3, - "lora.over-the-air-activation": true, - "lora.duty-cycle-on": false, - "lora.phy": 0, - "lora.device-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }", - "lora.application-eui": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }", - "lora.application-key": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }" - }, - - "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" - }, - - "DISCO_L072CZ_LRWAN1": { - "main_stack_size": 3072, - - "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" - }, - - "MTB_MURATA_ABZ": { - "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" - }, - - "MTB_MTS_XDOT": { - "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" - }, - - "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" - }, - - "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" - }, - - "MTB_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" - }, - - "MTB_RAK811": { - "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": "NC", - "lora-rf-switch-ctl1": "NC", - "lora-rf-switch-ctl2": "NC", - "lora-txctl": "ANT_CTX_PA", - "lora-rxctl": "ANT_CRX_RX", - "lora-ant-switch": "NC", - "lora-pwr-amp-ctl": "NC", - "lora-tcxo": "RF_TCXO_EN", - "battery-enabled": true, - "battery-adc": "PA_2", - "dht-enabled": true, - "dht-data": "PA_1", - "dht-type": "DHT::DHT22" - }, - - "NUCLEO_L073RZ": { - "main_stack_size": 1024, - "target.lpticker_lptim": 0, - "target.clock_source": "USE_PLL_HSI", - "lora.duty-cycle-on": false, - "tx-timer": 600000, - "lora-radio": "SX1272", - "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": "NC", - "lora-dio5": "NC", - "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", - "battery-enabled": true, - "battery-in-lpp": true, - "battery-adc": "A1", - "battery-ratio": "2.0f", - "dht-enabled": true, - "dht-data": "D8", - "dht-type": "DHT::DHT22", - "hx711-enabled": true, - "hx711-clk": "D7", - "hx711-data": "D6", - "hx711-scale": "21000.0f", - "hx711-offset": 59600 - } - }, - "macros": ["MBEDTLS_USER_CONFIG_FILE=\"mbedtls_lora_config.h\""] -}