Skip to content

Commit 291a456

Browse files
TomSawTomSaw
committed
update /src and /examples, primary: x -> x(), y -> y(), z -> z()
1 parent 95b6a25 commit 291a456

32 files changed

+251
-260
lines changed

Diff for: ‎examples/avr/display/dogm128/benchmark/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ introScreen()
129129
void
130130
drawSpinner(Point center, uint8_t pos)
131131
{
132-
const uint8_t x = center.getX();
133-
const uint8_t y = center.getY();
132+
const uint8_t x = center.x();
133+
const uint8_t y = center.y();
134134

135135
switch(pos % 8)
136136
{

Diff for: ‎examples/nucleo_f042k6/lis3mdl/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ main()
5858
if(success)
5959
{
6060
MODM_LOG_INFO << "Magnetic Vector:" << modm::endl;
61-
MODM_LOG_INFO << "X: "<< magVector.x << " gauss" << modm::endl;
62-
MODM_LOG_INFO << "Y: "<< magVector.y << " gauss" << modm::endl;
63-
MODM_LOG_INFO << "Z: "<< magVector.z << " gauss" << modm::endl;
61+
MODM_LOG_INFO << "X: "<< magVector.x() << " gauss" << modm::endl;
62+
MODM_LOG_INFO << "Y: "<< magVector.y() << " gauss" << modm::endl;
63+
MODM_LOG_INFO << "Z: "<< magVector.z() << " gauss" << modm::endl;
6464
MODM_LOG_INFO << modm::endl;
6565
}
6666
else

Diff for: ‎examples/nucleo_f042k6/lsm6ds33/main.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ main()
5454
if(accSuccess && gyroSuccess)
5555
{
5656
MODM_LOG_INFO << "Acceleration Vector:" << modm::endl;
57-
MODM_LOG_INFO << "X: "<< accVector.x << " g" << modm::endl;
58-
MODM_LOG_INFO << "Y: "<< accVector.y << " g" << modm::endl;
59-
MODM_LOG_INFO << "Z: "<< accVector.z << " g" << modm::endl;
57+
MODM_LOG_INFO << "X: "<< accVector.x() << " g" << modm::endl;
58+
MODM_LOG_INFO << "Y: "<< accVector.y() << " g" << modm::endl;
59+
MODM_LOG_INFO << "Z: "<< accVector.z() << " g" << modm::endl;
6060
MODM_LOG_INFO << modm::endl;
6161

6262
MODM_LOG_INFO << "Spin Rates Vector:" << modm::endl;
63-
MODM_LOG_INFO << "X: "<< gyroVector.x << " deg/s" << modm::endl;
64-
MODM_LOG_INFO << "Y: "<< gyroVector.y << " deg/s" << modm::endl;
65-
MODM_LOG_INFO << "Z: "<< gyroVector.z << " deg/s" << modm::endl;
63+
MODM_LOG_INFO << "X: "<< gyroVector.x() << " deg/s" << modm::endl;
64+
MODM_LOG_INFO << "Y: "<< gyroVector.y() << " deg/s" << modm::endl;
65+
MODM_LOG_INFO << "Z: "<< gyroVector.z() << " deg/s" << modm::endl;
6666
MODM_LOG_INFO << modm::endl;
6767

6868
}

Diff for: ‎examples/nucleo_f429zi/pat9125el/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Thread : public modm::pt::Protothread
5757
position += sensor.getData();
5858

5959
Board::Leds::write(0b111);
60-
MODM_LOG_INFO << "Position: " << position.x << ", " << position.y << modm::endl;
60+
MODM_LOG_INFO << "Position: " << position << modm::endl;
6161
sensor.resetMoved();
6262
} else {
6363
Board::Leds::write(0b000);

Diff for: ‎examples/stm32_f4ve/gui/main.cpp

+28-28
Original file line numberDiff line numberDiff line change
@@ -169,23 +169,23 @@ static void
169169
drawCross(modm::ColorGraphicDisplay& display, modm::glcd::Point center)
170170
{
171171
display.setColor(html::Red);
172-
display.drawLine(center.x - 15, center.y, center.x - 2, center.y);
173-
display.drawLine(center.x + 2, center.y, center.x + 15, center.y);
174-
display.drawLine(center.x, center.y - 15, center.x, center.y - 2);
175-
display.drawLine(center.x, center.y + 2, center.x, center.y + 15);
172+
display.drawLine(center.x() - 15, center.y(), center.x() - 2, center.y());
173+
display.drawLine(center.x() + 2, center.y(), center.x() + 15, center.y());
174+
display.drawLine(center.x(), center.y() - 15, center.x(), center.y() - 2);
175+
display.drawLine(center.x(), center.y() + 2, center.x(), center.y() + 15);
176176

177177
display.setColor(html::White);
178-
display.drawLine(center.x - 15, center.y + 15, center.x - 7, center.y + 15);
179-
display.drawLine(center.x - 15, center.y + 7, center.x - 15, center.y + 15);
178+
display.drawLine(center.x() - 15, center.y() + 15, center.x() - 7, center.y() + 15);
179+
display.drawLine(center.x() - 15, center.y() + 7, center.x() - 15, center.y() + 15);
180180

181-
display.drawLine(center.x - 15, center.y - 15, center.x - 7, center.y - 15);
182-
display.drawLine(center.x - 15, center.y - 7, center.x - 15, center.y - 15);
181+
display.drawLine(center.x() - 15, center.y() - 15, center.x() - 7, center.y() - 15);
182+
display.drawLine(center.x() - 15, center.y() - 7, center.x() - 15, center.y() - 15);
183183

184-
display.drawLine(center.x + 7, center.y + 15, center.x + 15, center.y + 15);
185-
display.drawLine(center.x + 15, center.y + 7, center.x + 15, center.y + 15);
184+
display.drawLine(center.x() + 7, center.y() + 15, center.x() + 15, center.y() + 15);
185+
display.drawLine(center.x() + 15, center.y() + 7, center.x() + 15, center.y() + 15);
186186

187-
display.drawLine(center.x + 7, center.y - 15, center.x + 15, center.y - 15);
188-
display.drawLine(center.x + 15, center.y - 15, center.x + 15, center.y - 7);
187+
display.drawLine(center.x() + 7, center.y() - 15, center.x() + 15, center.y() - 15);
188+
display.drawLine(center.x() + 15, center.y() - 15, center.x() + 15, center.y() - 7);
189189
}
190190

191191
static void
@@ -211,7 +211,7 @@ calibrateTouchscreen(modm::ColorGraphicDisplay& display, modm::glcd::Point *fixe
211211
// wait until a valid sample can be taken
212212
}
213213

214-
MODM_LOG_DEBUG << "calibration point: (" << sample[i].x << " | " << sample[i].y << ")" << modm::endl;
214+
MODM_LOG_DEBUG << "calibration point: (" << sample[i].x() << " | " << sample[i].y() << ")" << modm::endl;
215215
}
216216

217217
touchscreen.calibrate(calibrationPoint, sample);
@@ -227,14 +227,14 @@ void
227227
drawPoint(modm::GraphicDisplay& display, modm::glcd::Point point)
228228
{
229229
MODM_LOG_DEBUG << __PRETTY_FUNCTION__ << modm::endl;
230-
if (point.x < 0 || point.y < 0) {
230+
if (point.x() < 0 || point.y() < 0) {
231231
return;
232232
}
233233

234-
display.setPixel(point.x, point.y);
235-
display.setPixel(point.x + 1, point.y);
236-
display.setPixel(point.x, point.y + 1);
237-
display.setPixel(point.x + 1, point.y + 1);
234+
display.setPixel(point.x(), point.y());
235+
display.setPixel(point.x() + 1, point.y());
236+
display.setPixel(point.x(), point.y() + 1);
237+
display.setPixel(point.x() + 1, point.y() + 1);
238238
}
239239

240240
// ----------------------------------------------------------------------------
@@ -286,8 +286,8 @@ debounceTouch(modm::glcd::Point *out, modm::glcd::Point *old)
286286
// translate point according to calibration
287287
touchscreen.translate(&raw, &point);
288288

289-
if(abs(point.x - old->x) < TP_TOLERANCE &&
290-
abs(point.y - old->y) < TP_TOLERANCE
289+
if(abs(point.x() - old->x()) < TP_TOLERANCE &&
290+
abs(point.y() - old->y()) < TP_TOLERANCE
291291
)
292292
{
293293
// point is within area of last touch
@@ -321,8 +321,8 @@ touchUp(void* data)
321321
modm::gui::InputEvent* ev = static_cast<modm::gui::InputEvent*>(data);
322322

323323
MODM_LOG_DEBUG << "asynchronous UP-event:" << modm::endl;
324-
MODM_LOG_DEBUG << "x: " << ev->coord.x << modm::endl;
325-
MODM_LOG_DEBUG << "y: " << ev->coord.y << modm::endl;
324+
MODM_LOG_DEBUG << "x: " << ev->coord.x() << modm::endl;
325+
MODM_LOG_DEBUG << "y: " << ev->coord.y() << modm::endl;
326326

327327
// queue UP-event as new input event
328328
input_queue.push(ev);
@@ -351,8 +351,8 @@ gatherInput()
351351
auto async_ev = new modm::gui::AsyncEvent(500, &touchUp, (void*)(ev_up));
352352
async_events.append(async_ev);
353353

354-
MODM_LOG_DEBUG << "touch down x: " << point.x << modm::endl;
355-
MODM_LOG_DEBUG << "touch down y: " << point.y << modm::endl;
354+
MODM_LOG_DEBUG << "touch down x: " << point.x() << modm::endl;
355+
MODM_LOG_DEBUG << "touch down y: " << point.y() << modm::endl;
356356

357357
}
358358
}
@@ -492,11 +492,11 @@ main()
492492
/*
493493
* display an arbitrary image
494494
*/
495-
// if(pixPos.x < 0 || (pixPos.x + pix[0]) > tft.getWidth()){
496-
// pixDeltaPos.x *= -1;
495+
// if(pixPos.x() < 0 || (pixPos.x() + pix[0]) > tft.getWidth()){
496+
// pixDeltaPos.x() *= -1;
497497
// }
498-
// if(pixPos.y < 0 || (pixPos.y + pix[1]) > tft.getHeight()){
499-
// pixDeltaPos.y *= -1;
498+
// if(pixPos.y() < 0 || (pixPos.y() + pix[1]) > tft.getHeight()){
499+
// pixDeltaPos.y() *= -1;
500500
// }
501501
// pixPos += pixDeltaPos;
502502
// tft.drawImage(pixPos, pix);

Diff for: ‎examples/stm32_f4ve/gui/touchscreen_calibrator.hpp

+22-22
Original file line numberDiff line numberDiff line change
@@ -56,34 +56,34 @@ modm::TouchscreenCalibrator::calibrate(
5656
modm::glcd::Point * display, modm::glcd::Point * sample)
5757
{
5858
// K��(X0��X2) (Y1��Y2)��(X1��X2) (Y0��Y2)
59-
scale = ((sample[0].x - sample[2].x) * (sample[1].y - sample[2].y)) -
60-
((sample[1].x - sample[2].x) * (sample[0].y - sample[2].y));
59+
scale = ((sample[0].x() - sample[2].x()) * (sample[1].y() - sample[2].y())) -
60+
((sample[1].x() - sample[2].x()) * (sample[0].y() - sample[2].y()));
6161

6262
if (scale == 0) {
6363
return false;
6464
}
6565

6666
// A��((XD0��XD2) (Y1��Y2)��(XD1��XD2) (Y0��Y2))��K
67-
An = ((display[0].x - display[2].x) * (sample[1].y - sample[2].y)) -
68-
((display[1].x - display[2].x) * (sample[0].y - sample[2].y));
67+
An = ((display[0].x() - display[2].x()) * (sample[1].y() - sample[2].y())) -
68+
((display[1].x() - display[2].x()) * (sample[0].y() - sample[2].y()));
6969
// B��((X0��X2) (XD1��XD2)��(XD0��XD2) (X1��X2))��K */
70-
Bn = ((sample[0].x - sample[2].x) * (display[1].x - display[2].x)) -
71-
((display[0].x - display[2].x) * (sample[1].x - sample[2].x));
70+
Bn = ((sample[0].x() - sample[2].x()) * (display[1].x() - display[2].x())) -
71+
((display[0].x() - display[2].x()) * (sample[1].x() - sample[2].x()));
7272
// C��(Y0(X2XD1��X1XD2)+Y1(X0XD2��X2XD0)+Y2(X1XD0��X0XD1))��K */
73-
Cn = (sample[2].x * display[1].x - sample[1].x * display[2].x) * sample[0].y +
74-
(sample[0].x * display[2].x - sample[2].x * display[0].x) * sample[1].y +
75-
(sample[1].x * display[0].x - sample[0].x * display[1].x) * sample[2].y;
73+
Cn = (sample[2].x() * display[1].x() - sample[1].x() * display[2].x()) * sample[0].y() +
74+
(sample[0].x() * display[2].x() - sample[2].x() * display[0].x()) * sample[1].y() +
75+
(sample[1].x() * display[0].x() - sample[0].x() * display[1].x()) * sample[2].y();
7676

7777
// D��((YD0��YD2) (Y1��Y2)��(YD1��YD2) (Y0��Y2))��K */
78-
Dn = ((display[0].y - display[2].y) * (sample[1].y - sample[2].y)) -
79-
((display[1].y - display[2].y) * (sample[0].y - sample[2].y));
78+
Dn = ((display[0].y() - display[2].y()) * (sample[1].y() - sample[2].y())) -
79+
((display[1].y() - display[2].y()) * (sample[0].y() - sample[2].y()));
8080
// E��((X0��X2) (YD1��YD2)��(YD0��YD2) (X1��X2))��K */
81-
En = ((sample[0].x - sample[2].x) * (display[1].y - display[2].y)) -
82-
((display[0].y - display[2].y) * (sample[1].x - sample[2].x));
81+
En = ((sample[0].x() - sample[2].x()) * (display[1].y() - display[2].y())) -
82+
((display[0].y() - display[2].y()) * (sample[1].x() - sample[2].x()));
8383
// F��(Y0(X2YD1��X1YD2)+Y1(X0YD2��X2YD0)+Y2(X1YD0��X0YD1))��K */
84-
Fn = (sample[2].x * display[1].y - sample[1].x * display[2].y) * sample[0].y +
85-
(sample[0].x * display[2].y - sample[2].x * display[0].y) * sample[1].y +
86-
(sample[1].x * display[0].y - sample[0].x * display[1].y) * sample[2].y;
84+
Fn = (sample[2].x() * display[1].y() - sample[1].x() * display[2].y()) * sample[0].y() +
85+
(sample[0].x() * display[2].y() - sample[2].x() * display[0].y()) * sample[1].y() +
86+
(sample[1].x() * display[0].y() - sample[0].x() * display[1].y()) * sample[2].y();
8787

8888
return true;
8989
}
@@ -94,12 +94,12 @@ modm::TouchscreenCalibrator::translate(modm::glcd::Point * raw, modm::glcd::Poin
9494
if (scale != 0)
9595
{
9696
/* XD = AX+BY+C */
97-
translated->x =
98-
((An * raw->x) +
99-
(Bn * raw->y) + Cn) / scale;
97+
translated->x() =
98+
((An * raw->x()) +
99+
(Bn * raw->y()) + Cn) / scale;
100100
/* YD = DX+EY+F */
101-
translated->y =
102-
((Dn * raw->x) +
103-
(En * raw->y) + Fn) / scale;
101+
translated->y() =
102+
((Dn * raw->x()) +
103+
(En * raw->y()) + Fn) / scale;
104104
}
105105
}

Diff for: ‎examples/stm32f4_discovery/open407v-d/gui/main.cpp

+24-24
Original file line numberDiff line numberDiff line change
@@ -178,23 +178,23 @@ static void
178178
drawCross(modm::ColorGraphicDisplay& display, modm::glcd::Point center)
179179
{
180180
display.setColor(Red);
181-
display.drawLine(center.x - 15, center.y, center.x - 2, center.y);
182-
display.drawLine(center.x + 2, center.y, center.x + 15, center.y);
183-
display.drawLine(center.x, center.y - 15, center.x, center.y - 2);
184-
display.drawLine(center.x, center.y + 2, center.x, center.y + 15);
181+
display.drawLine(center.x() - 15, center.y(), center.x() - 2, center.y());
182+
display.drawLine(center.x() + 2, center.y(), center.x() + 15, center.y());
183+
display.drawLine(center.x(), center.y() - 15, center.x(), center.y() - 2);
184+
display.drawLine(center.x(), center.y() + 2, center.x(), center.y() + 15);
185185

186186
display.setColor(White);
187-
display.drawLine(center.x - 15, center.y + 15, center.x - 7, center.y + 15);
188-
display.drawLine(center.x - 15, center.y + 7, center.x - 15, center.y + 15);
187+
display.drawLine(center.x() - 15, center.y() + 15, center.x() - 7, center.y() + 15);
188+
display.drawLine(center.x() - 15, center.y() + 7, center.x() - 15, center.y() + 15);
189189

190-
display.drawLine(center.x - 15, center.y - 15, center.x - 7, center.y - 15);
191-
display.drawLine(center.x - 15, center.y - 7, center.x - 15, center.y - 15);
190+
display.drawLine(center.x() - 15, center.y() - 15, center.x() - 7, center.y() - 15);
191+
display.drawLine(center.x() - 15, center.y() - 7, center.x() - 15, center.y() - 15);
192192

193-
display.drawLine(center.x + 7, center.y + 15, center.x + 15, center.y + 15);
194-
display.drawLine(center.x + 15, center.y + 7, center.x + 15, center.y + 15);
193+
display.drawLine(center.x() + 7, center.y() + 15, center.x() + 15, center.y() + 15);
194+
display.drawLine(center.x() + 15, center.y() + 7, center.x() + 15, center.y() + 15);
195195

196-
display.drawLine(center.x + 7, center.y - 15, center.x + 15, center.y - 15);
197-
display.drawLine(center.x + 15, center.y - 15, center.x + 15, center.y - 7);
196+
display.drawLine(center.x() + 7, center.y() - 15, center.x() + 15, center.y() - 15);
197+
display.drawLine(center.x() + 15, center.y() - 15, center.x() + 15, center.y() - 7);
198198
}
199199

200200
static void
@@ -219,7 +219,7 @@ calibrateTouchscreen(modm::ColorGraphicDisplay& display, modm::glcd::Point *fixe
219219
// wait until a valid sample can be taken
220220
}
221221

222-
MODM_LOG_DEBUG << "calibration point: (" << sample[i].x << " | " << sample[i].y << ")" << modm::endl;
222+
MODM_LOG_DEBUG << "calibration point: (" << sample[i].x() << " | " << sample[i].y() << ")" << modm::endl;
223223
}
224224

225225
touchscreen.calibrate(calibrationPoint, sample);
@@ -234,14 +234,14 @@ calibrateTouchscreen(modm::ColorGraphicDisplay& display, modm::glcd::Point *fixe
234234
void
235235
drawPoint(modm::GraphicDisplay& display, modm::glcd::Point point)
236236
{
237-
if (point.x < 0 || point.y < 0) {
237+
if (point.x() < 0 || point.y() < 0) {
238238
return;
239239
}
240240

241-
display.setPixel(point.x, point.y);
242-
display.setPixel(point.x + 1, point.y);
243-
display.setPixel(point.x, point.y + 1);
244-
display.setPixel(point.x + 1, point.y + 1);
241+
display.setPixel(point.x(), point.y());
242+
display.setPixel(point.x() + 1, point.y());
243+
display.setPixel(point.x(), point.y() + 1);
244+
display.setPixel(point.x() + 1, point.y() + 1);
245245
}
246246

247247
// ----------------------------------------------------------------------------
@@ -293,8 +293,8 @@ debounceTouch(modm::glcd::Point *out, modm::glcd::Point *old)
293293
// translate point according to calibration
294294
touchscreen.translate(&raw, &point);
295295

296-
if(abs(point.x - old->x) < TP_TOLERANCE &&
297-
abs(point.y - old->y) < TP_TOLERANCE
296+
if(abs(point.x() - old->x()) < TP_TOLERANCE &&
297+
abs(point.y() - old->y()) < TP_TOLERANCE
298298
)
299299
{
300300
// point is within area of last touch
@@ -327,8 +327,8 @@ touchUp(void* data)
327327
modm::gui::InputEvent* ev = static_cast<modm::gui::InputEvent*>(data);
328328

329329
MODM_LOG_DEBUG << "asynchronous UP-event:" << modm::endl;
330-
MODM_LOG_DEBUG << "x: " << ev->coord.x << modm::endl;
331-
MODM_LOG_DEBUG << "y: " << ev->coord.y << modm::endl;
330+
MODM_LOG_DEBUG << "x: " << ev->coord.x() << modm::endl;
331+
MODM_LOG_DEBUG << "y: " << ev->coord.y() << modm::endl;
332332

333333
// queue UP-event as new input event
334334
input_queue.push(ev);
@@ -358,8 +358,8 @@ gatherInput()
358358
auto async_ev = new modm::gui::AsyncEvent(500, &touchUp, (void*)(ev_up));
359359
async_events.append(async_ev);
360360

361-
MODM_LOG_DEBUG << "touch down x: " << point.x << modm::endl;
362-
MODM_LOG_DEBUG << "touch down y: " << point.y << modm::endl;
361+
MODM_LOG_DEBUG << "touch down x: " << point.x() << modm::endl;
362+
MODM_LOG_DEBUG << "touch down y: " << point.y() << modm::endl;
363363

364364
}
365365
}

0 commit comments

Comments
 (0)