From fc5f6887cb7edbfe7a34634e04c00b22da504322 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Mon, 27 Mar 2023 22:42:52 +0200 Subject: [PATCH] Adjust name from CMT2300a to CMT2300A --- lib/CMT2300a/cmt2300wrapper.cpp | 12 ++++++------ lib/CMT2300a/cmt2300wrapper.h | 4 ++-- lib/Hoymiles/src/HoymilesRadio_CMT.cpp | 2 +- lib/Hoymiles/src/HoymilesRadio_CMT.h | 2 +- webapp/src/components/RadioInfo.vue | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/CMT2300a/cmt2300wrapper.cpp b/lib/CMT2300a/cmt2300wrapper.cpp index 603d1b0..99c70eb 100644 --- a/lib/CMT2300a/cmt2300wrapper.cpp +++ b/lib/CMT2300a/cmt2300wrapper.cpp @@ -6,7 +6,7 @@ #include "cmt2300a.h" #include "cmt2300a_params.h" -CMT2300a::CMT2300a(uint8_t pin_sdio, uint8_t pin_clk, uint8_t pin_cs, uint8_t pin_fcs, uint32_t spi_speed) +CMT2300A::CMT2300A(uint8_t pin_sdio, uint8_t pin_clk, uint8_t pin_cs, uint8_t pin_fcs, uint32_t spi_speed) { _pin_sdio = pin_sdio; _pin_clk = pin_clk; @@ -15,17 +15,17 @@ CMT2300a::CMT2300a(uint8_t pin_sdio, uint8_t pin_clk, uint8_t pin_cs, uint8_t pi _spi_speed = spi_speed; } -bool CMT2300a::begin(void) +bool CMT2300A::begin(void) { return _init_pins() && _init_radio(); } -bool CMT2300a::isChipConnected() +bool CMT2300A::isChipConnected() { return CMT2300A_IsExist(); } -bool CMT2300a::setPALevel(int8_t level) +bool CMT2300A::setPALevel(int8_t level) { uint16_t Tx_dBm_word; switch (level) { @@ -138,14 +138,14 @@ bool CMT2300a::setPALevel(int8_t level) return true; } -bool CMT2300a::_init_pins() +bool CMT2300A::_init_pins() { CMT2300A_InitSpi(_pin_sdio, _pin_clk, _pin_cs, _pin_fcs, _spi_speed); return true; // assuming pins are connected properly } -bool CMT2300a::_init_radio() +bool CMT2300A::_init_radio() { if (!CMT2300A_Init()) { return false; diff --git a/lib/CMT2300a/cmt2300wrapper.h b/lib/CMT2300a/cmt2300wrapper.h index 143817b..ac1c9d8 100644 --- a/lib/CMT2300a/cmt2300wrapper.h +++ b/lib/CMT2300a/cmt2300wrapper.h @@ -8,9 +8,9 @@ #define FH_OFFSET 100 // value * CMT2300A_ONE_STEP_SIZE = channel frequency offset #define CMT_SPI_SPEED 4000000 // 4 MHz -class CMT2300a { +class CMT2300A { public: - CMT2300a(uint8_t pin_sdio, uint8_t pin_clk, uint8_t pin_cs, uint8_t pin_fcs, uint32_t _spi_speed = CMT_SPI_SPEED); + CMT2300A(uint8_t pin_sdio, uint8_t pin_clk, uint8_t pin_cs, uint8_t pin_fcs, uint32_t _spi_speed = CMT_SPI_SPEED); bool begin(void); diff --git a/lib/Hoymiles/src/HoymilesRadio_CMT.cpp b/lib/Hoymiles/src/HoymilesRadio_CMT.cpp index e10950c..54d13d9 100644 --- a/lib/Hoymiles/src/HoymilesRadio_CMT.cpp +++ b/lib/Hoymiles/src/HoymilesRadio_CMT.cpp @@ -287,7 +287,7 @@ void HoymilesRadio_CMT::init(int8_t pin_sdio, int8_t pin_clk, int8_t pin_cs, int { _dtuSerial.u64 = 0; - _radio.reset(new CMT2300a(pin_sdio, pin_clk, pin_cs, pin_fcs)); + _radio.reset(new CMT2300A(pin_sdio, pin_clk, pin_cs, pin_fcs)); _radio->begin(); diff --git a/lib/Hoymiles/src/HoymilesRadio_CMT.h b/lib/Hoymiles/src/HoymilesRadio_CMT.h index fdcad94..b78a560 100644 --- a/lib/Hoymiles/src/HoymilesRadio_CMT.h +++ b/lib/Hoymiles/src/HoymilesRadio_CMT.h @@ -51,7 +51,7 @@ private: void sendEsbPacket(CommandAbstract* cmd); - std::unique_ptr _radio; + std::unique_ptr _radio; volatile bool _packetReceived = false; diff --git a/webapp/src/components/RadioInfo.vue b/webapp/src/components/RadioInfo.vue index a59cee4..2ebf721 100644 --- a/webapp/src/components/RadioInfo.vue +++ b/webapp/src/components/RadioInfo.vue @@ -40,13 +40,13 @@ - {{ $t('radioinfo.Status', { module: "CMT2300a" }) }} + {{ $t('radioinfo.Status', { module: "CMT2300A" }) }} - {{ $t('radioinfo.ChipStatus', { module: "CMT2300a" }) }} + {{ $t('radioinfo.ChipStatus', { module: "CMT2300A" }) }}