Skip to content

Commit c576493

Browse files
aolgeirsonaolgeirson
committed
fixed p3t bitshift
1 parent f521b40 commit c576493

1 file changed

Lines changed: 137 additions & 162 deletions

File tree

‎general/src/p3t1755.c‎

Lines changed: 137 additions & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -7,222 +7,197 @@
77
#include "c_utils.h"
88

99
void p3t1755_init(p3t1755_t *p3t, WritePtr write, ReadPtr read,
10-
uint16_t dev_addr)
11-
{
12-
p3t->write = write;
13-
p3t->read = read;
14-
p3t->dev_addr = dev_addr;
10+
uint16_t dev_addr) {
11+
p3t->write = write;
12+
p3t->read = read;
13+
p3t->dev_addr = dev_addr << 1;
1514
}
1615

1716
int p3t1755_write_reg(p3t1755_t *p3t, uint16_t reg, uint8_t *data,
18-
uint8_t length)
19-
{
20-
return p3t->write(p3t->dev_addr, reg, data, length);
17+
uint8_t length) {
18+
return p3t->write(p3t->dev_addr, reg, data, length);
2119
}
2220

2321
int p3t1755_read_reg(p3t1755_t *p3t, uint16_t reg, uint8_t *data,
24-
uint8_t length)
25-
{
26-
return p3t->read(p3t->dev_addr, reg, data, length);
22+
uint8_t length) {
23+
return p3t->read(p3t->dev_addr, reg, data, length);
2724
}
2825

29-
int p3t1755_read_temperature(p3t1755_t *p3t, float *temp_c)
30-
{
31-
uint8_t temp_reg[2];
26+
int p3t1755_read_temperature(p3t1755_t *p3t, float *temp_c) {
27+
uint8_t temp_reg[2];
3228

33-
int status = p3t1755_read_reg(p3t, p3t1755_TEMPERATURE, temp_reg,
34-
sizeof(temp_reg));
35-
if (status != 0) {
36-
return status;
37-
}
29+
int status =
30+
p3t1755_read_reg(p3t, p3t1755_TEMPERATURE, temp_reg, sizeof(temp_reg));
31+
if (status != 0) {
32+
return status;
33+
}
3834

39-
*temp_c = p3t1755_RAW_TO_CELSIUS(
40-
uint8_to_uint16(temp_reg[0], temp_reg[1]));
41-
return status;
35+
*temp_c = p3t1755_RAW_TO_CELSIUS(uint8_to_uint16(temp_reg[0], temp_reg[1]));
36+
return status;
4237
}
4338

4439
int p3t1755_configure(p3t1755_t *p3t, uint8_t shutdown, uint8_t thermostat,
45-
uint8_t polarity, uint8_t fault_queue,
46-
uint8_t conversion_time)
47-
{
48-
uint8_t config = 0;
49-
50-
if (shutdown) {
51-
config |= p3t1755_SHUTDOWN_MODE_MASK;
52-
}
53-
if (thermostat) {
54-
config |= p3t1755_THERMOSTAT_MODE_MASK;
55-
}
56-
if (polarity) {
57-
config |= p3t1755_POLARITY_MASK;
58-
}
59-
config |= (fault_queue & p3t1755_FAULT_QUEUE_MASK);
60-
config |= (conversion_time & p3t1755_CONVERSION_TIME_MASK);
61-
62-
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config,
63-
sizeof(config));
40+
uint8_t polarity, uint8_t fault_queue,
41+
uint8_t conversion_time) {
42+
uint8_t config = 0;
43+
44+
if (shutdown) {
45+
config |= p3t1755_SHUTDOWN_MODE_MASK;
46+
}
47+
if (thermostat) {
48+
config |= p3t1755_THERMOSTAT_MODE_MASK;
49+
}
50+
if (polarity) {
51+
config |= p3t1755_POLARITY_MASK;
52+
}
53+
config |= (fault_queue & p3t1755_FAULT_QUEUE_MASK);
54+
config |= (conversion_time & p3t1755_CONVERSION_TIME_MASK);
55+
56+
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
6457
}
6558

66-
int p3t1755_set_shutdown_mode(p3t1755_t *p3t, uint8_t enable)
67-
{
68-
uint8_t config;
59+
int p3t1755_set_shutdown_mode(p3t1755_t *p3t, uint8_t enable) {
60+
uint8_t config;
6961

70-
int status = p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config,
71-
sizeof(config));
72-
if (status != 0) {
73-
return status;
74-
}
62+
int status =
63+
p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
64+
if (status != 0) {
65+
return status;
66+
}
7567

76-
if (enable != 0) {
77-
config |= p3t1755_SHUTDOWN_MODE_MASK;
78-
} else {
79-
config &= ~p3t1755_SHUTDOWN_MODE_MASK;
80-
}
68+
if (enable != 0) {
69+
config |= p3t1755_SHUTDOWN_MODE_MASK;
70+
} else {
71+
config &= ~p3t1755_SHUTDOWN_MODE_MASK;
72+
}
8173

82-
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config,
83-
sizeof(config));
74+
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
8475
}
8576

86-
int p3t1755_set_thermostat_mode(p3t1755_t *p3t, uint8_t enable)
87-
{
88-
uint8_t config;
77+
int p3t1755_set_thermostat_mode(p3t1755_t *p3t, uint8_t enable) {
78+
uint8_t config;
8979

90-
int status = p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config,
91-
sizeof(config));
92-
if (status != 0) {
93-
return status;
94-
}
80+
int status =
81+
p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
82+
if (status != 0) {
83+
return status;
84+
}
9585

96-
if (enable != 0) {
97-
config |= p3t1755_THERMOSTAT_MODE_MASK;
98-
} else {
99-
config &= ~p3t1755_THERMOSTAT_MODE_MASK;
100-
}
86+
if (enable != 0) {
87+
config |= p3t1755_THERMOSTAT_MODE_MASK;
88+
} else {
89+
config &= ~p3t1755_THERMOSTAT_MODE_MASK;
90+
}
10191

102-
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config,
103-
sizeof(config));
92+
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
10493
}
10594

106-
int p3t1755_set_one_shot_mode(p3t1755_t *p3t, uint8_t enable)
107-
{
108-
uint8_t config;
95+
int p3t1755_set_one_shot_mode(p3t1755_t *p3t, uint8_t enable) {
96+
uint8_t config;
10997

110-
int status = p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config,
111-
sizeof(config));
112-
if (status != 0) {
113-
return status;
114-
}
98+
int status =
99+
p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
100+
if (status != 0) {
101+
return status;
102+
}
115103

116-
if (enable != 0) {
117-
config |= p3t1755_ONE_SHOT_MASK;
118-
} else {
119-
config &= ~p3t1755_ONE_SHOT_MASK;
120-
}
104+
if (enable != 0) {
105+
config |= p3t1755_ONE_SHOT_MASK;
106+
} else {
107+
config &= ~p3t1755_ONE_SHOT_MASK;
108+
}
121109

122-
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config,
123-
sizeof(config));
110+
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
124111
}
125112

126-
int p3t1755_set_polarity(p3t1755_t *p3t, uint8_t setting)
127-
{
128-
uint8_t config;
113+
int p3t1755_set_polarity(p3t1755_t *p3t, uint8_t setting) {
114+
uint8_t config;
129115

130-
int status = p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config,
131-
sizeof(config));
132-
if (status != 0) {
133-
return status;
134-
}
116+
int status =
117+
p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
118+
if (status != 0) {
119+
return status;
120+
}
135121

136-
if (setting != 0) {
137-
config |= p3t1755_POLARITY_MASK;
138-
} else {
139-
config &= ~p3t1755_POLARITY_MASK;
140-
}
122+
if (setting != 0) {
123+
config |= p3t1755_POLARITY_MASK;
124+
} else {
125+
config &= ~p3t1755_POLARITY_MASK;
126+
}
141127

142-
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config,
143-
sizeof(config));
128+
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
144129
}
145130

146-
int p3t1755_set_fault_queue(p3t1755_t *p3t, uint8_t data)
147-
{
148-
uint8_t config;
131+
int p3t1755_set_fault_queue(p3t1755_t *p3t, uint8_t data) {
132+
uint8_t config;
149133

150-
int status = p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config,
151-
sizeof(config));
152-
if (status != 0) {
153-
return status;
154-
}
134+
int status =
135+
p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
136+
if (status != 0) {
137+
return status;
138+
}
155139

156-
config &= ~p3t1755_FAULT_QUEUE_MASK;
157-
config |= (data & p3t1755_FAULT_QUEUE_MASK);
140+
config &= ~p3t1755_FAULT_QUEUE_MASK;
141+
config |= (data & p3t1755_FAULT_QUEUE_MASK);
158142

159-
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config,
160-
sizeof(config));
143+
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
161144
}
162145

163-
int p3t1755_set_conversion_time(p3t1755_t *p3t, uint8_t data)
164-
{
165-
uint8_t config;
146+
int p3t1755_set_conversion_time(p3t1755_t *p3t, uint8_t data) {
147+
uint8_t config;
166148

167-
int status = p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config,
168-
sizeof(config));
169-
if (status != 0) {
170-
return status;
171-
}
149+
int status =
150+
p3t1755_read_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
151+
if (status != 0) {
152+
return status;
153+
}
172154

173-
config &= ~p3t1755_CONVERSION_TIME_MASK;
174-
config |= (data & p3t1755_CONVERSION_TIME_MASK);
155+
config &= ~p3t1755_CONVERSION_TIME_MASK;
156+
config |= (data & p3t1755_CONVERSION_TIME_MASK);
175157

176-
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config,
177-
sizeof(config));
158+
return p3t1755_write_reg(p3t, p3t1755_CONFIGURATION, &config, sizeof(config));
178159
}
179160

180-
int p3t1755_read_high_temp(p3t1755_t *p3t, float *temp_c)
181-
{
182-
uint8_t high_temp_reg[2];
161+
int p3t1755_read_high_temp(p3t1755_t *p3t, float *temp_c) {
162+
uint8_t high_temp_reg[2];
183163

184-
int status = p3t1755_read_reg(p3t, p3t1755_T_HIGH, high_temp_reg,
185-
sizeof(high_temp_reg));
186-
if (status != 0) {
187-
return status;
188-
}
164+
int status = p3t1755_read_reg(p3t, p3t1755_T_HIGH, high_temp_reg,
165+
sizeof(high_temp_reg));
166+
if (status != 0) {
167+
return status;
168+
}
189169

190-
*temp_c = p3t1755_RAW_TO_CELSIUS(
191-
uint8_to_uint16(high_temp_reg[0], high_temp_reg[1]));
192-
return status;
170+
*temp_c = p3t1755_RAW_TO_CELSIUS(
171+
uint8_to_uint16(high_temp_reg[0], high_temp_reg[1]));
172+
return status;
193173
}
194174

195-
int p3t1755_read_low_temp(p3t1755_t *p3t, float *temp_c)
196-
{
197-
uint8_t low_temp_reg[2];
175+
int p3t1755_read_low_temp(p3t1755_t *p3t, float *temp_c) {
176+
uint8_t low_temp_reg[2];
198177

199-
int status = p3t1755_read_reg(p3t, p3t1755_T_LOW, low_temp_reg,
200-
sizeof(low_temp_reg));
201-
if (status != 0) {
202-
return status;
203-
}
178+
int status =
179+
p3t1755_read_reg(p3t, p3t1755_T_LOW, low_temp_reg, sizeof(low_temp_reg));
180+
if (status != 0) {
181+
return status;
182+
}
204183

205-
*temp_c = p3t1755_RAW_TO_CELSIUS(
206-
uint8_to_uint16(low_temp_reg[0], low_temp_reg[1]));
207-
return status;
184+
*temp_c =
185+
p3t1755_RAW_TO_CELSIUS(uint8_to_uint16(low_temp_reg[0], low_temp_reg[1]));
186+
return status;
208187
}
209188

210-
int p3t1755_set_high_temp(p3t1755_t *p3t, float temp_c)
211-
{
212-
uint16_t raw_temp = p3t1755_CELSIUS_TO_RAW(temp_c);
213-
uint8_t temp_data[2];
214-
uint16_to_uint8(raw_temp, temp_data);
189+
int p3t1755_set_high_temp(p3t1755_t *p3t, float temp_c) {
190+
uint16_t raw_temp = p3t1755_CELSIUS_TO_RAW(temp_c);
191+
uint8_t temp_data[2];
192+
uint16_to_uint8(raw_temp, temp_data);
215193

216-
return p3t1755_write_reg(p3t, p3t1755_T_HIGH, temp_data,
217-
sizeof(temp_data));
194+
return p3t1755_write_reg(p3t, p3t1755_T_HIGH, temp_data, sizeof(temp_data));
218195
}
219196

220-
int p3t1755_set_low_temp(p3t1755_t *p3t, float temp_c)
221-
{
222-
uint16_t raw_temp = p3t1755_CELSIUS_TO_RAW(temp_c);
223-
uint8_t temp_data[2];
224-
uint16_to_uint8(raw_temp, temp_data);
197+
int p3t1755_set_low_temp(p3t1755_t *p3t, float temp_c) {
198+
uint16_t raw_temp = p3t1755_CELSIUS_TO_RAW(temp_c);
199+
uint8_t temp_data[2];
200+
uint16_to_uint8(raw_temp, temp_data);
225201

226-
return p3t1755_write_reg(p3t, p3t1755_T_LOW, temp_data,
227-
sizeof(temp_data));
228-
}
202+
return p3t1755_write_reg(p3t, p3t1755_T_LOW, temp_data, sizeof(temp_data));
203+
}

0 commit comments

Comments
 (0)