Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update embedded-infra #111

Merged
merged 9 commits into from
Jan 23, 2024
Merged

chore: update embedded-infra #111

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
142b70c
changes on touch screen class in order to be aligned with the new int…
gabrielsantosphilips Jan 15, 2024
85b6d5e
Merge branch 'main' into feature/update_embedded_infra
gabrielsantosphilips Jan 15, 2024
12010d6
embedded-infra commit updated
gabrielsantosphilips Jan 15, 2024
c5bf6b7
unit tests fixed
gabrielsantosphilips Jan 15, 2024
b396a75
hal-st commit reference updated
gabrielsantosphilips Jan 15, 2024
23d11de
embedded-infra commit updated
gabrielsantosphilips Jan 16, 2024
acb9837
update emil and hal-st commit hashes
gabrielsantosphilips Jan 19, 2024
be910bc
amp-hal-st hash updated
gabrielsantosphilips Jan 23, 2024
3ab1e3b
Merge branch 'main' into feature/update_embedded_infra
gabrielsantosphilips Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions preview/touch/TouchScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
, yPlusAnalogPin(touchScreen.yPlusAnalogPin)
, startConversion(std::chrono::microseconds(100), [this]()
{
xPlusAnalogPin->Measure([this](PixelPosition pixelPosition)
xPlusAnalogPin->Measure(infra::MakeRangeFromSingleObject(this->pixelPosition), [this]()

Check failure on line 32 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (7-2018-q2, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::StateTouchMeasurement(services::TouchScreen&, bool)::<lambda()>::<lambda()>)’

Check failure on line 32 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::StateTouchMeasurement(services::TouchScreen&, bool)::<lambda()>::<lambda()>)’

Check failure on line 32 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (9-2020-q2, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::StateTouchMeasurement(services::TouchScreen&, bool)::<lambda()>::<lambda()>)’

Check failure on line 32 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (8-2019-q3, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::StateTouchMeasurement(services::TouchScreen&, bool)::<lambda()>::<lambda()>)’

Check failure on line 32 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f407) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::StateTouchMeasurement(services::TouchScreen&, bool)::<lambda()>::<lambda()>)’

Check failure on line 32 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f746) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::StateTouchMeasurement(services::TouchScreen&, bool)::<lambda()>::<lambda()>)’

Check failure on line 32 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Host Build & Test (ubuntu-latest) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::StateTouchMeasurement(services::TouchScreen&, bool)::<lambda()>::<lambda()>)’
{
OnMeasurementXDone(pixelPosition.Value());
});
Expand All @@ -40,7 +40,7 @@
void TouchScreen::StateTouchMeasurement::OnMeasurementXDone(uint32_t xTouchResult)
{
this->xTouchResult = xTouchResult;
yPlusAnalogPin->Measure([this](PixelPosition pixelPosition)
yPlusAnalogPin->Measure(infra::MakeRangeFromSingleObject(this->pixelPosition), [this]()

Check failure on line 43 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (7-2018-q2, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::OnMeasurementXDone(uint32_t)::<lambda()>)’

Check failure on line 43 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::OnMeasurementXDone(uint32_t)::<lambda()>)’

Check failure on line 43 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (9-2020-q2, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::OnMeasurementXDone(uint32_t)::<lambda()>)’

Check failure on line 43 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (8-2019-q3, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::OnMeasurementXDone(uint32_t)::<lambda()>)’

Check failure on line 43 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f407) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::OnMeasurementXDone(uint32_t)::<lambda()>)’

Check failure on line 43 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f746) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::OnMeasurementXDone(uint32_t)::<lambda()>)’

Check failure on line 43 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Host Build & Test (ubuntu-latest) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateTouchMeasurement::OnMeasurementXDone(uint32_t)::<lambda()>)’
{
OnMeasurementYDone(pixelPosition.Value());
});
Expand Down Expand Up @@ -69,7 +69,7 @@
, xPlusAnalogPin(touchScreen.xPlusAnalogPin)
, startConversion(std::chrono::microseconds(100), [this]()
{
xPlusAnalogPin->Measure([this](PixelPosition pixelPosition)
xPlusAnalogPin->Measure(infra::MakeRangeFromSingleObject(this->pixelPosition), [this]()

Check failure on line 72 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (7-2018-q2, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateXMeasurement::StateXMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 72 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateXMeasurement::StateXMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 72 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (9-2020-q2, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateXMeasurement::StateXMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 72 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (8-2019-q3, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateXMeasurement::StateXMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 72 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f407) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateXMeasurement::StateXMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 72 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f746) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateXMeasurement::StateXMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 72 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Host Build & Test (ubuntu-latest) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateXMeasurement::StateXMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’
{
OnMeasurementDone(pixelPosition.Value());
});
Expand All @@ -89,9 +89,9 @@
, yPlusAnalogPin(touchScreen.yPlusAnalogPin)
, startConversion(std::chrono::microseconds(100), [this]()
{
yPlusAnalogPin->Measure([this](PixelPosition pixelPosition)
yPlusAnalogPin->Measure(infra::MakeRangeFromSingleObject(this->pixelPosition), [this]()

Check failure on line 92 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (7-2018-q2, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateYMeasurement::StateYMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 92 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateYMeasurement::StateYMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 92 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (9-2020-q2, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateYMeasurement::StateYMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 92 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (8-2019-q3, RelWithDebInfo, stm32f767) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateYMeasurement::StateYMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 92 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f407) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateYMeasurement::StateYMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 92 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Embedded Build (RelWithDebInfo, 10.3-2021.10, stm32f746) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateYMeasurement::StateYMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’

Check failure on line 92 in preview/touch/TouchScreen.cpp

View workflow job for this annotation

GitHub Actions / Host Build & Test (ubuntu-latest) 

no matching function for call to ‘hal::AnalogToDigitalPin<infra::Identity, short unsigned int>::Measure(infra::MemoryRange<infra::Quantity<infra::Identity, short unsigned int> >, services::TouchScreen::StateYMeasurement::StateYMeasurement(services::TouchScreen&)::<lambda()>::<lambda()>)’
{
OnMeasurementDone(pixelPosition.Value());
OnMeasurementDone(this->pixelPosition.Value());
});
})
{}
Expand Down
3 changes: 3 additions & 0 deletions preview/touch/TouchScreen.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ namespace services
infra::TimerSingleShot startConversion;
bool finalMeasurement;
uint32_t xTouchResult;
PixelPosition pixelPosition;
};

class StateXMeasurement
Expand All @@ -72,6 +73,7 @@ namespace services
hal::OutputPin yMinus;
infra::ProxyCreator<AnalogToDigitalPin, void()> xPlusAnalogPin;
infra::TimerSingleShot startConversion;
PixelPosition pixelPosition;
};

class StateYMeasurement
Expand All @@ -89,6 +91,7 @@ namespace services
hal::OutputPin xMinus;
infra::ProxyCreator<AnalogToDigitalPin, void()> yPlusAnalogPin;
infra::TimerSingleShot startConversion;
PixelPosition pixelPosition;
};

private:
Expand Down
Loading