Skip to content

Commit 6d97927

Browse files
JHSawatzkiJHSawatzki
committed
Further code formating
1 parent 76f88a0 commit 6d97927

File tree

2 files changed

+132
-132
lines changed

2 files changed

+132
-132
lines changed

‎src/utility/RTD/MAX31865.cpp

Lines changed: 112 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -6,186 +6,186 @@ MAX31865Class::MAX31865Class(PinName cs) : _spi(SPI), _cs(cs) {
66
static SPISettings _spiSettings(1000000, MSBFIRST, SPI_MODE1);
77

88
bool MAX31865Class::begin(int wires) {
9-
_spi.begin();
9+
_spi.begin();
1010

11-
pinMode(_cs, OUTPUT);
12-
digitalWrite(_cs, HIGH);
11+
pinMode(_cs, OUTPUT);
12+
digitalWrite(_cs, HIGH);
1313

14-
// sets 2 or 4 wire
15-
if (wires == THREE_WIRE) {
16-
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) | MAX31856_CONFIG_3_WIRE));
17-
} else {
18-
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_WIRE_MASK));
19-
}
14+
// sets 2 or 4 wire
15+
if (wires == THREE_WIRE) {
16+
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) | MAX31856_CONFIG_3_WIRE));
17+
} else {
18+
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_WIRE_MASK));
19+
}
2020

21-
// disable bias
22-
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_BIAS_MASK);
21+
// disable bias
22+
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_BIAS_MASK);
2323

24-
// disable auto convert mode
25-
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_CONV_MODE_MASK);
24+
// disable auto convert mode
25+
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_CONV_MODE_MASK);
2626

27-
// clear fault
28-
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_CLEAR_FAULT_CYCLE)| MAX31856_CONFIG_CLEAR_FAULT);
27+
// clear fault
28+
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_CLEAR_FAULT_CYCLE)| MAX31856_CONFIG_CLEAR_FAULT);
2929

30-
// set filter frequency
31-
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_60_50_HZ_FILTER_MASK);
30+
// set filter frequency
31+
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_60_50_HZ_FILTER_MASK);
3232

33-
return true;
33+
return true;
3434
}
3535

3636
void MAX31865Class::clearFault(void) {
37-
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_CLEAR_FAULT_CYCLE) | MAX31856_CONFIG_CLEAR_FAULT);
37+
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_CLEAR_FAULT_CYCLE) | MAX31856_CONFIG_CLEAR_FAULT);
3838
}
3939

4040
uint8_t MAX31865Class::readFault(void) {
41-
return readByte(MAX31856_FAULT_STATUS_REG);
41+
return readByte(MAX31856_FAULT_STATUS_REG);
4242
}
4343

4444
bool MAX31865Class::getHighThresholdFault(uint8_t fault) {
45-
if (fault & MAX31865_FAULT_HIGH_THRESH) {
46-
return true;
47-
}
48-
return false;
45+
if (fault & MAX31865_FAULT_HIGH_THRESH) {
46+
return true;
47+
}
48+
return false;
4949
}
5050

5151
bool MAX31865Class::getLowThresholdFault(uint8_t fault) {
52-
if (fault & MAX31865_FAULT_LOW_THRESH) {
53-
return true;
54-
}
55-
return false;
52+
if (fault & MAX31865_FAULT_LOW_THRESH) {
53+
return true;
54+
}
55+
return false;
5656
}
5757

5858
bool MAX31865Class::getLowREFINFault(uint8_t fault) {
59-
if (fault & MAX31865_FAULT_LOW_REFIN) {
60-
return true;
61-
}
62-
return false;
59+
if (fault & MAX31865_FAULT_LOW_REFIN) {
60+
return true;
61+
}
62+
return false;
6363
}
6464

6565
bool MAX31865Class::getHighREFINFault(uint8_t fault) {
66-
if (fault & MAX31865_FAULT_HIGH_REFIN) {
67-
return true;
68-
}
69-
return false;
66+
if (fault & MAX31865_FAULT_HIGH_REFIN) {
67+
return true;
68+
}
69+
return false;
7070
}
7171

7272
bool MAX31865Class::getLowRTDINFault(uint8_t fault) {
73-
if (fault & MAX31865_FAULT_LOW_RTDIN) {
74-
return true;
75-
}
76-
return false;
73+
if (fault & MAX31865_FAULT_LOW_RTDIN) {
74+
return true;
75+
}
76+
return false;
7777
}
7878

7979
bool MAX31865Class::getVoltageFault(uint8_t fault) {
80-
if (fault & MAX31865_FAULT_OVER_UNDER_VOLTAGE) {
81-
return true;
82-
}
83-
return false;
80+
if (fault & MAX31865_FAULT_OVER_UNDER_VOLTAGE) {
81+
return true;
82+
}
83+
return false;
8484
}
8585

8686
float MAX31865Class::readTemperature(float RTDnominal, float refResistor) {
87-
float Z1, Z2, Z3, Z4, Rt, temp;
87+
float Z1, Z2, Z3, Z4, Rt, temp;
8888

89-
Rt = readRTD();
90-
Rt /= 32768;
91-
Rt *= refResistor;
89+
Rt = readRTD();
90+
Rt /= 32768;
91+
Rt *= refResistor;
9292

93-
Z1 = -RTD_A;
94-
Z2 = RTD_A * RTD_A - (4 * RTD_B);
95-
Z3 = (4 * RTD_B) / RTDnominal;
96-
Z4 = 2 * RTD_B;
93+
Z1 = -RTD_A;
94+
Z2 = RTD_A * RTD_A - (4 * RTD_B);
95+
Z3 = (4 * RTD_B) / RTDnominal;
96+
Z4 = 2 * RTD_B;
9797

98-
temp = Z2 + (Z3 * Rt);
99-
temp = (sqrt(temp) + Z1) / Z4;
98+
temp = Z2 + (Z3 * Rt);
99+
temp = (sqrt(temp) + Z1) / Z4;
100100

101-
if (temp >= 0)
102-
return temp;
101+
if (temp >= 0)
102+
return temp;
103103

104-
// ugh.
105-
Rt /= RTDnominal;
106-
Rt *= 100; // normalize to 100 ohm
104+
// ugh.
105+
Rt /= RTDnominal;
106+
Rt *= 100; // normalize to 100 ohm
107107

108-
float rpoly = Rt;
108+
float rpoly = Rt;
109109

110-
temp = -242.02;
111-
temp += 2.2228 * rpoly;
112-
rpoly *= Rt; // square
113-
temp += 2.5859e-3 * rpoly;
114-
rpoly *= Rt; // ^3
115-
temp -= 4.8260e-6 * rpoly;
116-
rpoly *= Rt; // ^4
117-
temp -= 2.8183e-8 * rpoly;
118-
rpoly *= Rt; // ^5
119-
temp += 1.5243e-10 * rpoly;
110+
temp = -242.02;
111+
temp += 2.2228 * rpoly;
112+
rpoly *= Rt; // square
113+
temp += 2.5859e-3 * rpoly;
114+
rpoly *= Rt; // ^3
115+
temp -= 4.8260e-6 * rpoly;
116+
rpoly *= Rt; // ^4
117+
temp -= 2.8183e-8 * rpoly;
118+
rpoly *= Rt; // ^5
119+
temp += 1.5243e-10 * rpoly;
120120

121-
return temp;
121+
return temp;
122122
}
123123

124124
uint32_t MAX31865Class::readRTD() {
125-
// clear fault
126-
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_CLEAR_FAULT_CYCLE) | MAX31856_CONFIG_CLEAR_FAULT);
125+
// clear fault
126+
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) & MAX31856_CONFIG_CLEAR_FAULT_CYCLE) | MAX31856_CONFIG_CLEAR_FAULT);
127127

128-
// enable bias
129-
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) | MAX31856_CONFIG_BIAS_ON));
130-
delay(10);
128+
// enable bias
129+
writeByte(MAX31856_CONFIG_REG, (readByte(MAX31856_CONFIG_REG) | MAX31856_CONFIG_BIAS_ON));
130+
delay(10);
131131

132-
// ONE shot cOnfIg and make readings change with readByte
133-
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) | MAX31856_CONFIG_ONE_SHOT);
134-
delay(65);
132+
// ONE shot cOnfIg and make readings change with readByte
133+
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) | MAX31856_CONFIG_ONE_SHOT);
134+
delay(65);
135135

136-
//readings bytes
137-
uint16_t read = (readBytes(MAX31856_RTD_MSB_REG));
138-
read = read >>1;
136+
//readings bytes
137+
uint16_t read = (readBytes(MAX31856_RTD_MSB_REG));
138+
read = read >>1;
139139

140-
// disable bias
141-
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) & (MAX31856_CONFIG_BIAS_MASK));
140+
// disable bias
141+
writeByte(MAX31856_CONFIG_REG, readByte(MAX31856_CONFIG_REG) & (MAX31856_CONFIG_BIAS_MASK));
142142

143-
return read;
143+
return read;
144144
}
145145

146146
uint8_t MAX31865Class::readByte(uint8_t addr) {
147-
addr &= 0x7F;
148-
uint8_t read = 0;
147+
addr &= 0x7F;
148+
uint8_t read = 0;
149149

150-
digitalWrite(_cs, LOW);
150+
digitalWrite(_cs, LOW);
151151

152-
_spi.beginTransaction(_spiSettings);
153-
_spi.transfer(addr);
154-
_spi.transfer(&read,1);
155-
_spi.endTransaction();
152+
_spi.beginTransaction(_spiSettings);
153+
_spi.transfer(addr);
154+
_spi.transfer(&read,1);
155+
_spi.endTransaction();
156156

157-
digitalWrite(_cs, HIGH);
157+
digitalWrite(_cs, HIGH);
158158

159-
return read;
159+
return read;
160160
}
161161

162162
uint16_t MAX31865Class::readBytes(uint8_t addr) {
163-
uint16_t read = 0x00;
163+
uint16_t read = 0x00;
164164

165-
digitalWrite(_cs, LOW);
165+
digitalWrite(_cs, LOW);
166166

167-
_spi.beginTransaction(_spiSettings);
168-
_spi.transfer(addr);
169-
for (int i = 0; i < 2; i++) {
170-
read = read << 8;
171-
read |= _spi.transfer(0);
172-
}
173-
_spi.endTransaction();
167+
_spi.beginTransaction(_spiSettings);
168+
_spi.transfer(addr);
169+
for (int i = 0; i < 2; i++) {
170+
read = read << 8;
171+
read |= _spi.transfer(0);
172+
}
173+
_spi.endTransaction();
174174

175-
digitalWrite(_cs, HIGH);
175+
digitalWrite(_cs, HIGH);
176176

177-
return read;
177+
return read;
178178
}
179179

180180
void MAX31865Class::writeByte(uint8_t addr, uint8_t data) {
181-
addr |= 0x80; // make sure top bit is set
182-
uint8_t buffer[2] = {addr, data};
181+
addr |= 0x80; // make sure top bit is set
182+
uint8_t buffer[2] = {addr, data};
183183

184-
digitalWrite(_cs, LOW);
184+
digitalWrite(_cs, LOW);
185185

186-
_spi.beginTransaction(_spiSettings);
187-
_spi.transfer(buffer,2);
188-
_spi.endTransaction();
186+
_spi.beginTransaction(_spiSettings);
187+
_spi.transfer(buffer,2);
188+
_spi.endTransaction();
189189

190-
digitalWrite(_cs, HIGH);
190+
digitalWrite(_cs, HIGH);
191191
}

‎src/utility/RTD/MAX31865.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,29 +52,29 @@
5252

5353
class MAX31865Class {
5454
public:
55-
MAX31865Class(PinName cs = PA_6);
56-
57-
bool begin(int wires);
58-
void end();
59-
60-
float readTemperature(float RTDnominal, float refResistor);
61-
uint8_t readFault(void);
62-
void clearFault(void);
63-
uint32_t readRTD();
64-
bool getHighThresholdFault(uint8_t fault);
65-
bool getLowThresholdFault(uint8_t fault);
66-
bool getLowREFINFault(uint8_t fault);
67-
bool getHighREFINFault(uint8_t fault);
68-
bool getLowRTDINFault(uint8_t fault);
69-
bool getVoltageFault(uint8_t fault);
55+
MAX31865Class(PinName cs = PA_6);
56+
57+
bool begin(int wires);
58+
void end();
59+
60+
float readTemperature(float RTDnominal, float refResistor);
61+
uint8_t readFault(void);
62+
void clearFault(void);
63+
uint32_t readRTD();
64+
bool getHighThresholdFault(uint8_t fault);
65+
bool getLowThresholdFault(uint8_t fault);
66+
bool getLowREFINFault(uint8_t fault);
67+
bool getHighREFINFault(uint8_t fault);
68+
bool getLowRTDINFault(uint8_t fault);
69+
bool getVoltageFault(uint8_t fault);
7070

7171
private:
72-
uint8_t readByte(uint8_t addr);
73-
uint16_t readBytes(uint8_t addr);
74-
void writeByte(uint8_t addr, uint8_t data);
72+
uint8_t readByte(uint8_t addr);
73+
uint16_t readBytes(uint8_t addr);
74+
void writeByte(uint8_t addr, uint8_t data);
7575

76-
PinName _cs;
77-
SPIClass& _spi;
76+
PinName _cs;
77+
SPIClass& _spi;
7878
};
7979

8080
#endif

0 commit comments

Comments
 (0)