Skip to content

Commit 27c77f4

Browse files
committed
0.8.147
fix compilation
1 parent b7e0566 commit 27c77f4

File tree

1 file changed

+57
-57
lines changed

1 file changed

+57
-57
lines changed

src/hm/CommQueue.h

+57-57
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,63 @@ class CommQueue {
1818
static constexpr uint8_t MoreAttemptsAlarmData = 3;
1919
static constexpr uint8_t MoreAttemptsGridProfile = 0;
2020

21+
protected:
22+
struct QueueElement {
23+
Inverter<> *iv;
24+
uint8_t cmd;
25+
uint8_t attempts;
26+
uint8_t attemptsMax;
27+
uint32_t ts;
28+
bool isDevControl;
29+
30+
QueueElement()
31+
: iv {nullptr}
32+
, cmd {0}
33+
, attempts {0}
34+
, attemptsMax {0}
35+
, ts {0}
36+
, isDevControl {false}
37+
{}
38+
39+
QueueElement(Inverter<> *iv, uint8_t cmd, bool devCtrl)
40+
: iv {iv}
41+
, cmd {cmd}
42+
, attempts {DefaultAttempts}
43+
, attemptsMax {DefaultAttempts}
44+
, ts {0}
45+
, isDevControl {devCtrl}
46+
{}
47+
48+
QueueElement(const QueueElement &other) // copy constructor
49+
: iv {other.iv}
50+
, cmd {other.cmd}
51+
, attempts {other.attempts}
52+
, attemptsMax {other.attemptsMax}
53+
, ts {other.ts}
54+
, isDevControl {other.isDevControl}
55+
{}
56+
57+
void changeCmd(uint8_t cmd) {
58+
this->cmd = cmd;
59+
this->isDevControl = false;
60+
}
61+
62+
void setTs(const uint32_t ts) {
63+
this->ts = ts;
64+
}
65+
66+
void setAttempt() {
67+
if(this->attempts)
68+
this->attempts--;
69+
}
70+
71+
void incrAttempt(uint8_t attempts = 1) {
72+
this->attempts += attempts;
73+
if (this->attempts > this->attemptsMax)
74+
this->attemptsMax = this->attempts;
75+
}
76+
};
77+
2178
public:
2279
CommQueue()
2380
: wrPtr {0}
@@ -123,63 +180,6 @@ class CommQueue {
123180
return false;
124181
}
125182

126-
protected:
127-
struct QueueElement {
128-
Inverter<> *iv;
129-
uint8_t cmd;
130-
uint8_t attempts;
131-
uint8_t attemptsMax;
132-
uint32_t ts;
133-
bool isDevControl;
134-
135-
QueueElement()
136-
: iv {nullptr}
137-
, cmd {0}
138-
, attempts {0}
139-
, attemptsMax {0}
140-
, ts {0}
141-
, isDevControl {false}
142-
{}
143-
144-
QueueElement(Inverter<> *iv, uint8_t cmd, bool devCtrl)
145-
: iv {iv}
146-
, cmd {cmd}
147-
, attempts {DefaultAttempts}
148-
, attemptsMax {DefaultAttempts}
149-
, ts {0}
150-
, isDevControl {devCtrl}
151-
{}
152-
153-
QueueElement(const QueueElement &other) // copy constructor
154-
: iv {other.iv}
155-
, cmd {other.cmd}
156-
, attempts {other.attempts}
157-
, attemptsMax {other.attemptsMax}
158-
, ts {other.ts}
159-
, isDevControl {other.isDevControl}
160-
{}
161-
162-
void changeCmd(uint8_t cmd) {
163-
this->cmd = cmd;
164-
this->isDevControl = false;
165-
}
166-
167-
void setTs(const uint32_t ts) {
168-
this->ts = ts;
169-
}
170-
171-
void setAttempt() {
172-
if(this->attempts)
173-
this->attempts--;
174-
}
175-
176-
void incrAttempt(uint8_t attempts = 1) {
177-
this->attempts += attempts;
178-
if (this->attempts > this->attemptsMax)
179-
this->attemptsMax = this->attempts;
180-
}
181-
};
182-
183183
protected:
184184
std::array<QueueElement, N> mQueue;
185185

0 commit comments

Comments
 (0)