diff --git a/src/adxrs610/adxrs610.h b/src/adxrs610/adxrs610.h index 5076fa31..e63dfc0d 100644 --- a/src/adxrs610/adxrs610.h +++ b/src/adxrs610/adxrs610.h @@ -27,6 +27,15 @@ #include #include +// volts per degree / second (typ) +#define m_degreeCoeff 0.006 + +// volts per degree C (typ) +#define m_temperatureCoeff 0.009 + +// nominal temperature at m_centerVolts +#define m_temperatureNom 25.0 + namespace upm { /** * @brief DFRobot ADXRS610 Gyro Beakout board @@ -159,14 +168,6 @@ namespace upm { // aref / 2 float m_centerVolts; - - // volts per degree / second (typ) - static const float m_degreeCoeff = 0.006; - - // volts per degree C (typ) - static const float m_temperatureCoeff = 0.009; - // nominal temperature at m_centerVolts - static const float m_temperatureNom = 25.0; }; } diff --git a/src/sx1276/sx1276.h b/src/sx1276/sx1276.h index 9a282c39..e23a3953 100644 --- a/src/sx1276/sx1276.h +++ b/src/sx1276/sx1276.h @@ -42,6 +42,13 @@ #include #include +// Our crystal oscillator frequency (32Mhz) +#define FXOSC_FREQ 32000000.0 + +// Our freq stepping resolution (in Hz) if FXOSC_FREQ is 32Mhz +// (FXOSC_FREQ / 2^19) = +#define FXOSC_STEP 61.03515625 + namespace upm { /** @@ -86,12 +93,6 @@ namespace upm { // The default chip revision static const uint8_t chipRevision = 0x12; - // Our crystal oscillator frequency (32Mhz) - static const double FXOSC_FREQ = 32000000.0; - - // Our freq stepping resolution (in Hz) if FXOSC_FREQ is 32Mhz - // (FXOSC_FREQ / 2^19) = - static const double FXOSC_STEP = 61.03515625; // total FIFO size static const int FIFO_SIZE = 256;