From 057ad4480ad4995c773434e0aa35a412e44d1b2e Mon Sep 17 00:00:00 2001 From: lewisxhe Date: Thu, 6 Feb 2025 14:30:47 +0800 Subject: [PATCH] Update example --- examples/UnitTest/UnitTest.ino | 4 +++- examples/UnitTest/ui.cpp | 19 +++++++++++++++++-- examples/UnitTest/utilities.h | 4 ++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/examples/UnitTest/UnitTest.ino b/examples/UnitTest/UnitTest.ino index d961f63..d01ddeb 100644 --- a/examples/UnitTest/UnitTest.ino +++ b/examples/UnitTest/UnitTest.ino @@ -317,7 +317,7 @@ bool setupRadio() SPI.end(); SPI.begin(BOARD_SPI_SCK, BOARD_SPI_MISO, BOARD_SPI_MOSI); //SD - int state = radio.begin(RADIO_FREQ); + int state = radio.begin(); if (state == RADIOLIB_ERR_NONE) { Serial.println("Start Radio success!"); } else { @@ -328,6 +328,8 @@ bool setupRadio() return false; } + Serial.printf("Freq:%.2f TxPower:%d Bandwidth:%.2f\n", RADIO_FREQ, RADIO_TX_POWER, RADIO_BANDWIDTH); + hasRadio = true; // set carrier frequency to 868.0 MHz diff --git a/examples/UnitTest/ui.cpp b/examples/UnitTest/ui.cpp index 094c4a1..a5001f6 100644 --- a/examples/UnitTest/ui.cpp +++ b/examples/UnitTest/ui.cpp @@ -149,13 +149,23 @@ void updateNoiseLabel(uint32_t cnt) } const char *radio_freq_list = +#ifdef JAPAN_MIC + "920MHZ"; +#else "433MHZ\n" "470MHZ\n" "850MHZ\n" "868MHZ\n" "915MHZ\n" "923MHZ"; -const float freq_list[] = {433.0, 470.0, 850.0, 868.0, 915.0, 923.0}; +#endif +const float freq_list[] = { +#ifdef JAPAN_MIC + 920.0 +#else + 433.0, 470.0, 850.0, 868.0, 915.0, 923.0 +#endif +}; const char *radio_bandwidth_list = "125KHz\n" @@ -273,7 +283,12 @@ void setupUI(void) section = lv_menu_section_create(sub_rf_setting_page); sub_section.push_back(section); - create_dropdown(section, NULL, "Freq", radio_freq_list, 2, radio_freq_cb); +#ifdef JAPAN_MIC + uint8_t freq_index = 0; +#else + uint8_t freq_index = 2; +#endif + create_dropdown(section, NULL, "Freq", radio_freq_list, freq_index, radio_freq_cb); create_dropdown(section, NULL, "BandWidth", radio_bandwidth_list, 0, radio_bandwidth_cb); create_dropdown(section, NULL, "TxPower", radio_power_level_list, 6, radio_power_cb); create_dropdown(section, NULL, "Interval", radio_tx_interval_list, 3, radio_interval_cb); diff --git a/examples/UnitTest/utilities.h b/examples/UnitTest/utilities.h index 3ca5aa7..1d1817d 100644 --- a/examples/UnitTest/utilities.h +++ b/examples/UnitTest/utilities.h @@ -60,8 +60,12 @@ #ifndef RADIO_FREQ +#ifdef JAPAN_MIC +#define RADIO_FREQ 920.0 +#else #define RADIO_FREQ 868.0 #endif +#endif #ifndef RADIO_BANDWIDTH #define RADIO_BANDWIDTH 125.0