From 626e36c6e4c50273b7800923638fcd6828efcaa3 Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Sat, 22 Oct 2022 13:00:03 +0300 Subject: [PATCH] root: fromat folder with clang-formatter --- GMP252Sensor/inc/GMP252.h | 16 +-- GMP252Sensor/src/GMP252.cpp | 22 ++-- StateHandler/src/Counter.cpp | 21 ++-- Timer/src/Timer.cpp | 8 +- esp-vent-main/src/I2C.cpp | 201 +++++++++++++++++++---------------- esp-vent-main/src/I2C.h | 34 +++--- 6 files changed, 168 insertions(+), 134 deletions(-) diff --git a/GMP252Sensor/inc/GMP252.h b/GMP252Sensor/inc/GMP252.h index 9a0ecb6..81f55dc 100644 --- a/GMP252Sensor/inc/GMP252.h +++ b/GMP252Sensor/inc/GMP252.h @@ -11,15 +11,17 @@ #include "ModbusMaster.h" #include "ModbusRegister.h" -class GMP252 { +class GMP252 +{ public: - GMP252(); - int read(); - virtual ~GMP252(); + GMP252 (); + int read (); + virtual ~GMP252 (); + private: - ModbusMaster sens; - ModbusRegister regInt; - ModbusRegister regFloat; + ModbusMaster sens; + ModbusRegister regInt; + ModbusRegister regFloat; }; #endif /* GMP252_H_ */ diff --git a/GMP252Sensor/src/GMP252.cpp b/GMP252Sensor/src/GMP252.cpp index 8ec7783..d3a7af7 100644 --- a/GMP252Sensor/src/GMP252.cpp +++ b/GMP252Sensor/src/GMP252.cpp @@ -7,19 +7,21 @@ #include "GMP252.h" -GMP252::GMP252(): sens{240}, regInt{&sens, 0x0100}, regFloat{&sens, 0x0000}{ - - sens.begin(9600); +GMP252::GMP252 () + : sens{ 240 }, regInt{ &sens, 0x0100 }, regFloat{ &sens, 0x0000 } +{ + sens.begin (9600); } -int GMP252:: read() { - int result = regInt.read(); - return result; +int +GMP252::read () +{ + int result = regInt.read (); + return result; } - -GMP252::~GMP252() { - // TODO Auto-generated destructor stub +GMP252::~GMP252 () +{ + // TODO Auto-generated destructor stub } - diff --git a/StateHandler/src/Counter.cpp b/StateHandler/src/Counter.cpp index 39cec29..a06dca8 100644 --- a/StateHandler/src/Counter.cpp +++ b/StateHandler/src/Counter.cpp @@ -52,13 +52,16 @@ Counter::Counter (unsigned int down, unsigned int up) void Counter::setInit (unsigned int newInit) { - if(newInit > up_lim){ - init = up_lim; - } - else if(newInit < down_lim){ - init = down_lim; - } - else{ - init = newInit; - } + if (newInit > up_lim) + { + init = up_lim; + } + else if (newInit < down_lim) + { + init = down_lim; + } + else + { + init = newInit; + } } diff --git a/Timer/src/Timer.cpp b/Timer/src/Timer.cpp index 5478d2a..0b93fe3 100644 --- a/Timer/src/Timer.cpp +++ b/Timer/src/Timer.cpp @@ -12,7 +12,7 @@ extern "C" void SysTick_Handler (void) { - systicks++; + systicks++; if (timer > 0) timer--; } @@ -65,6 +65,8 @@ Timer::resetCounter () counter.store (0, std::memory_order_relaxed); } -uint32_t millis() { - return systicks; +uint32_t +millis () +{ + return systicks; } diff --git a/esp-vent-main/src/I2C.cpp b/esp-vent-main/src/I2C.cpp index 938f126..2a732eb 100644 --- a/esp-vent-main/src/I2C.cpp +++ b/esp-vent-main/src/I2C.cpp @@ -3,7 +3,8 @@ * * Created on: 21.2.2016 * Author: krl - * Based on example provided by NXP Semiconductors. See copyright notice below. + * Based on example provided by NXP Semiconductors. See copyright notice + * below. */ /* @@ -21,123 +22,141 @@ * all warranties, express or implied, including all implied warranties of * merchantability, fitness for a particular purpose and non-infringement of * intellectual property rights. NXP Semiconductors assumes no responsibility - * or liability for the use of the software, conveys no license or rights under any - * patent, copyright, mask work right, or any other intellectual property rights in - * or to any products. NXP Semiconductors reserves the right to make changes - * in the software without notification. NXP Semiconductors also makes no - * representation or warranty that such application will be suitable for the + * or liability for the use of the software, conveys no license or rights under + * any patent, copyright, mask work right, or any other intellectual property + * rights in or to any products. NXP Semiconductors reserves the right to make + * changes in the software without notification. NXP Semiconductors also makes + * no representation or warranty that such application will be suitable for the * specified use without further testing or modification. * * @par * Permission to use, copy, modify, and distribute this software and its * documentation is hereby granted, under NXP Semiconductors' and its - * licensor's relevant copyrights in the software, without fee, provided that it - * is used in conjunction with NXP Semiconductors microcontrollers. This + * licensor's relevant copyrights in the software, without fee, provided that + * it is used in conjunction with NXP Semiconductors microcontrollers. This * copyright, permission, and disclaimer notice must appear in all copies of * this code. */ #include "I2C.h" - -I2C::I2C(const I2C_config &cfg): device(nullptr) { - if(cfg.device_number == 0) { - device = LPC_I2C0; - // board init must have been called before the pins can be configured - Chip_IOCON_PinMuxSet(LPC_IOCON, 0, 22, IOCON_DIGMODE_EN | cfg.i2c_mode); - Chip_IOCON_PinMuxSet(LPC_IOCON, 0, 23, IOCON_DIGMODE_EN | cfg.i2c_mode); - Chip_SWM_EnableFixedPin(SWM_FIXED_I2C0_SCL); - Chip_SWM_EnableFixedPin(SWM_FIXED_I2C0_SDA); - } - else { - // currently we support only I2C number 0 - } - - if(device) { - /* Enable I2C clock and reset I2C peripheral - the boot ROM does not - do this */ - Chip_I2C_Init(device); - - /* Setup clock rate for I2C */ - Chip_I2C_SetClockDiv(device, cfg.clock_divider); - - /* Setup I2CM transfer rate */ - Chip_I2CM_SetBusSpeed(device, cfg.speed); - - /* Enable Master Mode */ - Chip_I2CM_Enable(device); - } -} - -I2C::~I2C() { - // TODO Auto-generated destructor stub -} - -bool I2C::write(uint8_t devAddr, uint8_t *txBuffPtr, uint16_t txSize) +I2C::I2C (const I2C_config &cfg) : device (nullptr) { - return transaction(devAddr, txBuffPtr, txSize, nullptr, 0); + if (cfg.device_number == 0) + { + device = LPC_I2C0; + // board init must have been called before the pins can be configured + Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 22, IOCON_DIGMODE_EN | cfg.i2c_mode); + Chip_IOCON_PinMuxSet (LPC_IOCON, 0, 23, IOCON_DIGMODE_EN | cfg.i2c_mode); + Chip_SWM_EnableFixedPin (SWM_FIXED_I2C0_SCL); + Chip_SWM_EnableFixedPin (SWM_FIXED_I2C0_SDA); + } + else + { + // currently we support only I2C number 0 + } + + if (device) + { + /* Enable I2C clock and reset I2C peripheral - the boot ROM does not + do this */ + Chip_I2C_Init (device); + + /* Setup clock rate for I2C */ + Chip_I2C_SetClockDiv (device, cfg.clock_divider); + + /* Setup I2CM transfer rate */ + Chip_I2CM_SetBusSpeed (device, cfg.speed); + + /* Enable Master Mode */ + Chip_I2CM_Enable (device); + } } -bool I2C::read(uint8_t devAddr, uint8_t *rxBuffPtr, uint16_t rxSize) +I2C::~I2C () { - return transaction(devAddr, nullptr, 0, rxBuffPtr, rxSize); + // TODO Auto-generated destructor stub } +bool +I2C::write (uint8_t devAddr, uint8_t *txBuffPtr, uint16_t txSize) +{ + return transaction (devAddr, txBuffPtr, txSize, nullptr, 0); +} -bool I2C::transaction(uint8_t devAddr, uint8_t *txBuffPtr, uint16_t txSize, uint8_t *rxBuffPtr, uint16_t rxSize) { - I2CM_XFER_T i2cmXferRec; +bool +I2C::read (uint8_t devAddr, uint8_t *rxBuffPtr, uint16_t rxSize) +{ + return transaction (devAddr, nullptr, 0, rxBuffPtr, rxSize); +} - // make sure that master is idle - while(!Chip_I2CM_IsMasterPending(LPC_I2C0)); +bool +I2C::transaction (uint8_t devAddr, uint8_t *txBuffPtr, uint16_t txSize, + uint8_t *rxBuffPtr, uint16_t rxSize) +{ + I2CM_XFER_T i2cmXferRec; - /* Setup I2C transfer record */ - i2cmXferRec.slaveAddr = devAddr; - i2cmXferRec.status = 0; - i2cmXferRec.txSz = txSize; - i2cmXferRec.rxSz = rxSize; - i2cmXferRec.txBuff = txBuffPtr; - i2cmXferRec.rxBuff = rxBuffPtr; + // make sure that master is idle + while (!Chip_I2CM_IsMasterPending (LPC_I2C0)) + ; - I2CM_XferBlocking(LPC_I2C0, &i2cmXferRec); - // Chip_I2CM_XferBlocking returns before stop condition is fully completed - // therefore we need to wait for master to be idle when doing back-to-back transactions (see beginning of the function) + /* Setup I2C transfer record */ + i2cmXferRec.slaveAddr = devAddr; + i2cmXferRec.status = 0; + i2cmXferRec.txSz = txSize; + i2cmXferRec.rxSz = rxSize; + i2cmXferRec.txBuff = txBuffPtr; + i2cmXferRec.rxBuff = rxBuffPtr; - /* Test for valid operation */ - if (i2cmXferRec.status == I2CM_STATUS_OK) { - return true; - } - else { - return false; - } + I2CM_XferBlocking (LPC_I2C0, &i2cmXferRec); + // Chip_I2CM_XferBlocking returns before stop condition is fully completed + // therefore we need to wait for master to be idle when doing back-to-back + // transactions (see beginning of the function) + + /* Test for valid operation */ + if (i2cmXferRec.status == I2CM_STATUS_OK) + { + return true; + } + else + { + return false; + } } /* Transmit and Receive data in master mode */ -/* This duplicates (and combines) the functionality of Chip_I2CM_Xfer and Chip_I2CM_XferBlocking with a modification - * that allows us to do a zero length write (needed to use honeywell humidity/temp sensor) +/* This duplicates (and combines) the functionality of Chip_I2CM_Xfer and + * Chip_I2CM_XferBlocking with a modification that allows us to do a zero + * length write (needed to use honeywell humidity/temp sensor) */ -uint32_t I2C::I2CM_XferBlocking(LPC_I2C_T *pI2C, I2CM_XFER_T *xfer) +uint32_t +I2C::I2CM_XferBlocking (LPC_I2C_T *pI2C, I2CM_XFER_T *xfer) { - uint32_t ret = 0; - /* start transfer */ + uint32_t ret = 0; + /* start transfer */ - /* set the transfer status as busy */ - xfer->status = I2CM_STATUS_BUSY; - /* Clear controller state. */ - Chip_I2CM_ClearStatus(pI2C, I2C_STAT_MSTRARBLOSS | I2C_STAT_MSTSTSTPERR); - /* Write Address and RW bit to data register */ - //Chip_I2CM_WriteByte(pI2C, (xfer->slaveAddr << 1) | (xfer->txSz == 0)); // original NXP version - // krl : both read and write lenght is 0 --> write (for honeywell temp sensor) - Chip_I2CM_WriteByte(pI2C, (xfer->slaveAddr << 1) | (xfer->txSz == 0 && xfer->rxSz != 0)); - /* Enter to Master Transmitter mode */ - Chip_I2CM_SendStart(pI2C); + /* set the transfer status as busy */ + xfer->status = I2CM_STATUS_BUSY; + /* Clear controller state. */ + Chip_I2CM_ClearStatus (pI2C, I2C_STAT_MSTRARBLOSS | I2C_STAT_MSTSTSTPERR); + /* Write Address and RW bit to data register */ + // Chip_I2CM_WriteByte(pI2C, (xfer->slaveAddr << 1) | (xfer->txSz == 0)); // + // original NXP version + // krl : both read and write lenght is 0 --> write (for honeywell temp + // sensor) + Chip_I2CM_WriteByte (pI2C, (xfer->slaveAddr << 1) + | (xfer->txSz == 0 && xfer->rxSz != 0)); + /* Enter to Master Transmitter mode */ + Chip_I2CM_SendStart (pI2C); - while (ret == 0) { - /* wait for status change interrupt */ - while (!Chip_I2CM_IsMasterPending(pI2C)) {} - /* call state change handler */ - ret = Chip_I2CM_XferHandler(pI2C, xfer); - } - return ret; + while (ret == 0) + { + /* wait for status change interrupt */ + while (!Chip_I2CM_IsMasterPending (pI2C)) + { + } + /* call state change handler */ + ret = Chip_I2CM_XferHandler (pI2C, xfer); + } + return ret; } - - diff --git a/esp-vent-main/src/I2C.h b/esp-vent-main/src/I2C.h index d72610d..a8ff4ff 100644 --- a/esp-vent-main/src/I2C.h +++ b/esp-vent-main/src/I2C.h @@ -10,24 +10,30 @@ #include "chip.h" -struct I2C_config { - unsigned int device_number; - unsigned int speed; - unsigned int clock_divider; - unsigned int i2c_mode; - I2C_config(): device_number(0), speed(100000), clock_divider(40), i2c_mode(IOCON_SFI2C_EN) {}; +struct I2C_config +{ + unsigned int device_number; + unsigned int speed; + unsigned int clock_divider; + unsigned int i2c_mode; + I2C_config () + : device_number (0), speed (100000), clock_divider (40), + i2c_mode (IOCON_SFI2C_EN){}; }; -class I2C { +class I2C +{ public: - I2C(const I2C_config &cfg); - virtual ~I2C(); - bool transaction(uint8_t devAddr, uint8_t *txBuffPtr, uint16_t txSize, uint8_t *rxBuffPtr, uint16_t rxSize); - bool write(uint8_t devAddr, uint8_t *txBuffPtr, uint16_t txSize); - bool read(uint8_t devAddr, uint8_t *rxBuffPtr, uint16_t rxSize); + I2C (const I2C_config &cfg); + virtual ~I2C (); + bool transaction (uint8_t devAddr, uint8_t *txBuffPtr, uint16_t txSize, + uint8_t *rxBuffPtr, uint16_t rxSize); + bool write (uint8_t devAddr, uint8_t *txBuffPtr, uint16_t txSize); + bool read (uint8_t devAddr, uint8_t *rxBuffPtr, uint16_t rxSize); + private: - LPC_I2C_T *device; - static uint32_t I2CM_XferBlocking(LPC_I2C_T *pI2C, I2CM_XFER_T *xfer); + LPC_I2C_T *device; + static uint32_t I2CM_XferBlocking (LPC_I2C_T *pI2C, I2CM_XFER_T *xfer); }; #endif /* I2C_H_ */