Skip to content

Commit

Permalink
Camel casing
Browse files Browse the repository at this point in the history
  • Loading branch information
@soylentOrange
soylentOrange committed Apr 30, 2023
1 parent 7e10979 commit 129b7c6
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 42 deletions.
30 changes: 15 additions & 15 deletions examples/BME280_full_example/BME280_full_example.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@
// int32_t g_temperature; // current temperature - value of 1234 would be 12.34 °C

// // uncomment this block to get temperature as integer and float
// ForcedBMX280_float climateSensor = ForcedBMX280_float();
// float g_temperature_float; // current temperature
// ForcedBMX280Float climateSensor = ForcedBMX280Float();
// float g_temperatureFloat; // current temperature

// uncomment this block to get temperature and pressure as integer
// ForcedBMP280 climateSensor = ForcedBMP280();
// int32_t g_temperature; // current temperature
// uint32_t g_pressure; // current pressure

// // uncomment this block to get temperature and pressure as integer and float
// ForcedBMP280_float climateSensor = ForcedBMP280_float();
// ForcedBMP280Float climateSensor = ForcedBMP280Float();
// int32_t g_temperature; // current temperature
// uint32_t g_pressure; // current pressure
// float g_temperature_float; // current temperature
// float g_pressure_float; // current pressure
// float g_temperatureFloat; // current temperature
// float g_pressureFloat; // current pressure

// // uncomment this block to get temperature, pressure and humidity as integer
// ForcedBME280 climateSensor = ForcedBME280();
Expand All @@ -50,13 +50,13 @@
// uint32_t g_humidity; // current humidity

// uncomment this block to get temperature, pressure and humidity as integer and float
ForcedBME280_float climateSensor = ForcedBME280_float();
ForcedBME280Float climateSensor = ForcedBME280Float();
int32_t g_temperature; // current temperature
uint32_t g_pressure; // current pressure
uint32_t g_humidity; // current humidity
float g_temperature_float; // current temperature
float g_pressure_float; // current pressure
float g_humidity_float; // current humidity
float g_temperatureFloat; // current temperature
float g_pressureFloat; // current pressure
float g_humidityFloat; // current humidity


// UART control interface
Expand Down Expand Up @@ -108,9 +108,9 @@ void loop() {
// Serial.println(" °C");

// uncomment this block to print temperature - float
g_temperature_float = climateSensor.getTemperatureCelsius_float(true);
g_temperatureFloat = climateSensor.getTemperatureCelsiusAsFloat(true);
Serial.print("Temperature: ");
Serial.print(g_temperature_float);
Serial.print(g_temperatureFloat);
Serial.println(" °C");

// // uncomment this block to print pressure - uint32_t
Expand All @@ -122,9 +122,9 @@ void loop() {
// Serial.println(" hPa");

// uncomment this block to print pressure - float
g_pressure_float = climateSensor.getPressure_float();
g_pressureFloat = climateSensor.getPressureAsFloat();
Serial.print("Pressure: ");
Serial.print(g_pressure_float);
Serial.print(g_pressureFloat);
Serial.println(" hPa");

// // uncomment this block to print humidity - uint32_t
Expand All @@ -136,9 +136,9 @@ void loop() {
// Serial.println(" %rh");

// uncomment this block to print humidity - float
g_humidity_float = climateSensor.getRelativeHumidity_float();
g_humidityFloat = climateSensor.getRelativeHumidityAsFloat();
Serial.print("Humidity: ");
Serial.print(g_humidity_float);
Serial.print(g_humidityFloat);
Serial.println(" %rh");
}
}
24 changes: 12 additions & 12 deletions src/forcedBMX280.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,10 @@ int32_t ForcedBMX280::getTemperatureCelsius(const bool performMeasurement) {
/// This creates an object from the mandatory TwoWire-bus
/// and the address of the chip to communicate with.
#ifdef FORCED_BMX280_ATTINY
ForcedBMX280_float::ForcedBMX280_float(USI_TWI& bus, const uint8_t address)
ForcedBMX280Float::ForcedBMX280Float(USI_TWI& bus, const uint8_t address)
:
#else
ForcedBMX280_float::ForcedBMX280_float(TwoWire& bus, const uint8_t address)
ForcedBMX280Float::ForcedBMX280Float(TwoWire& bus, const uint8_t address)
:
#endif
_bus(bus),
Expand All @@ -252,7 +252,7 @@ ForcedBMX280_float::ForcedBMX280_float(TwoWire& bus, const uint8_t address)
/// Get Temperature Celsius
/// \details
/// This function retrieves the compensated temperature
float ForcedBMX280_float::getTemperatureCelsius_float(const bool performMeasurement) {
float ForcedBMX280Float::getTemperatureCelsiusAsFloat(const bool performMeasurement) {
return float(getTemperatureCelsius(performMeasurement) / 100.0);
}

Expand Down Expand Up @@ -354,10 +354,10 @@ uint32_t ForcedBMP280::getPressure(const bool performMeasurement) {
/// This creates an object from the mandatory TwoWire-bus
/// and the address of the chip to communicate with.
#ifdef FORCED_BMX280_ATTINY
ForcedBMP280_float::ForcedBMP280_float(USI_TWI& bus, const uint8_t address)
ForcedBMP280Float::ForcedBMP280Float(USI_TWI& bus, const uint8_t address)
:
#else
ForcedBMP280_float::ForcedBMP280_float(TwoWire& bus, const uint8_t address)
ForcedBMP280Float::ForcedBMP280Float(TwoWire& bus, const uint8_t address)
:
#endif
_bus(bus),
Expand All @@ -369,7 +369,7 @@ ForcedBMP280_float::ForcedBMP280_float(TwoWire& bus, const uint8_t address)
/// Get Temperature Celsius
/// \details
/// This function retrieves the compensated temperature
float ForcedBMP280_float::getTemperatureCelsius_float(const bool performMeasurement) {
float ForcedBMP280Float::getTemperatureCelsiusAsFloat(const bool performMeasurement) {
return float(getTemperatureCelsius(performMeasurement) / 100.0);
}

Expand All @@ -378,7 +378,7 @@ float ForcedBMP280_float::getTemperatureCelsius_float(const bool performMeasurem
/// Get Pressure
/// \details
/// This function retrieves the compensated pressure
float ForcedBMP280_float::getPressure_float(const bool performMeasurement) {
float ForcedBMP280Float::getPressureAsFloat(const bool performMeasurement) {
return float(getPressure(performMeasurement) / 100.0);
}

Expand Down Expand Up @@ -510,10 +510,10 @@ uint32_t ForcedBME280::getRelativeHumidity(const bool performMeasurement) {
/// This creates an object from the mandatory TwoWire-bus
/// and the address of the chip to communicate with.
#ifdef FORCED_BMX280_ATTINY
ForcedBME280_float::ForcedBME280_float(USI_TWI& bus, const uint8_t address)
ForcedBME280Float::ForcedBME280Float(USI_TWI& bus, const uint8_t address)
:
#else
ForcedBME280_float::ForcedBME280_float(TwoWire& bus, const uint8_t address)
ForcedBME280Float::ForcedBME280Float(TwoWire& bus, const uint8_t address)
:
#endif
_bus(bus),
Expand All @@ -525,15 +525,15 @@ ForcedBME280_float::ForcedBME280_float(TwoWire& bus, const uint8_t address)
/// Get Temperature Celsius
/// \details
/// This function retrieves the compensated temperature
float ForcedBME280_float::getTemperatureCelsius_float(const bool performMeasurement) {
float ForcedBME280Float::getTemperatureCelsiusAsFloat(const bool performMeasurement) {
return float(getTemperatureCelsius(performMeasurement) / 100.0);
}

/// \brief
/// Get Pressure
/// \details
/// This function retrieves the compensated pressure
float ForcedBME280_float::getPressure_float(const bool performMeasurement) {
float ForcedBME280Float::getPressureAsFloat(const bool performMeasurement) {
return float(getPressure(performMeasurement) / 100.0);
}

Expand All @@ -542,6 +542,6 @@ float ForcedBME280_float::getPressure_float(const bool performMeasurement) {
/// \details
/// This function retrieves the compensated humidity as described
/// on page 50 of the BME280 Datasheet.
float ForcedBME280_float::getRelativeHumidity_float(const bool performMeasurement) {
float ForcedBME280Float::getRelativeHumidityAsFloat(const bool performMeasurement) {
return float(getRelativeHumidity(performMeasurement) / 100.0);
}
30 changes: 15 additions & 15 deletions src/forcedBMX280.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class ForcedBMX280 {
int32_t getTemperatureCelsius(const bool performMeasurement = false);
};

class ForcedBMX280_float : public ForcedBMX280 {
class ForcedBMX280Float : public ForcedBMX280 {
protected:
#ifdef FORCED_BMX280_ATTINY
USI_TWI& _bus;
Expand All @@ -96,12 +96,12 @@ class ForcedBMX280_float : public ForcedBMX280 {

public:
#ifdef FORCED_BMX280_ATTINY
ForcedBMX280_float(USI_TWI& buss = TinyWireM, const uint8_t address = BMX280_I2C_ADDR);
ForcedBMX280Float(USI_TWI& buss = TinyWireM, const uint8_t address = BMX280_I2C_ADDR);
#else
ForcedBMX280_float(TwoWire& bus = Wire, const uint8_t address = BMX280_I2C_ADDR);
ForcedBMX280Float(TwoWire& bus = Wire, const uint8_t address = BMX280_I2C_ADDR);
#endif

float getTemperatureCelsius_float(const bool performMeasurement = false);
float getTemperatureCelsiusAsFloat(const bool performMeasurement = false);
};

class ForcedBMP280 : public ForcedBMX280 {
Expand All @@ -128,7 +128,7 @@ class ForcedBMP280 : public ForcedBMX280 {
uint32_t getPressure(const bool performMeasurement = false);
};

class ForcedBMP280_float : public ForcedBMP280 {
class ForcedBMP280Float : public ForcedBMP280 {
protected:
#ifdef FORCED_BMX280_ATTINY
USI_TWI& _bus;
Expand All @@ -139,13 +139,13 @@ class ForcedBMP280_float : public ForcedBMP280 {

public:
#ifdef FORCED_BMX280_ATTINY
ForcedBMP280_float(USI_TWI& bus = TinyWireM, const uint8_t address = BMX280_I2C_ADDR);
ForcedBMP280Float(USI_TWI& bus = TinyWireM, const uint8_t address = BMX280_I2C_ADDR);
#else
ForcedBMP280_float(TwoWire& bus = Wire, const uint8_t address = BMX280_I2C_ADDR);
ForcedBMP280Float(TwoWire& bus = Wire, const uint8_t address = BMX280_I2C_ADDR);
#endif

float getTemperatureCelsius_float(const bool performMeasurement = false);
float getPressure_float(const bool performMeasurement = false);
float getTemperatureCelsiusAsFloat(const bool performMeasurement = false);
float getPressureAsFloat(const bool performMeasurement = false);
};


Expand Down Expand Up @@ -174,7 +174,7 @@ class ForcedBME280 : public ForcedBMP280 {
uint32_t getRelativeHumidity(const bool performMeasurement = false);
};

class ForcedBME280_float : public ForcedBME280 {
class ForcedBME280Float : public ForcedBME280 {
protected:
#ifdef FORCED_BMX280_ATTINY
USI_TWI& _bus;
Expand All @@ -185,14 +185,14 @@ class ForcedBME280_float : public ForcedBME280 {

public:
#ifdef FORCED_BMX280_ATTINY
ForcedBME280_float(USI_TWI& bus = TinyWireM, const uint8_t address = BMX280_I2C_ADDR);
ForcedBME280Float(USI_TWI& bus = TinyWireM, const uint8_t address = BMX280_I2C_ADDR);
#else
ForcedBME280_float(TwoWire& bus = Wire, const uint8_t address = BMX280_I2C_ADDR);
ForcedBME280Float(TwoWire& bus = Wire, const uint8_t address = BMX280_I2C_ADDR);
#endif

float getTemperatureCelsius_float(const bool performMeasurement = false);
float getPressure_float(const bool performMeasurement = false);
float getRelativeHumidity_float(const bool performMeasurement = false);
float getTemperatureCelsiusAsFloat(const bool performMeasurement = false);
float getPressureAsFloat(const bool performMeasurement = false);
float getRelativeHumidityAsFloat(const bool performMeasurement = false);
};


Expand Down

0 comments on commit 129b7c6

Please sign in to comment.