Skip to content

Commit 5cee559

Browse files
Bump submodules (#200)
Fix incompatible build errors
1 parent 9f20749 commit 5cee559

5 files changed

Lines changed: 7 additions & 8 deletions

File tree

amp-embedded-infra-lib

amp-hal-st

Submodule amp-hal-st updated 69 files

postmaster/programmer/FirmwareReceptorResetTarget.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "hal/interfaces/Gpio.hpp"
22
#include "infra/timer/Timer.hpp"
33
#include "infra/util/AutoResetFunction.hpp"
4-
#include "infra/util/Optional.hpp"
54
#include "infra/util/ProxyCreator.hpp"
65
#include "postmaster/programmer/FirmwareReceptor.hpp"
76

@@ -13,9 +12,9 @@ namespace application
1312
public:
1413
FirmwareReceptorResetTarget(hal::GpioPin& reset, hal::GpioPin& boot0, infra::CreatorBase<FirmwareReceptor, void()>& delegateCreator);
1514

16-
virtual void ReceptionStarted() override;
17-
virtual void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) override;
18-
virtual void ReceptionStopped(const infra::Function<void()>& onDone) override;
15+
void ReceptionStarted() override;
16+
void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) override;
17+
void ReceptionStopped(const infra::Function<void()>& onDone) override;
1918

2019
private:
2120
hal::GpioPin& reset;

postmaster/programmer/TargetUartConnection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace application
1111
{
1212
serial.ReceiveData([this](infra::ConstByteRange data)
1313
{
14-
data.shrink_from_back_to(queue.EmptySize() - queue.Size());
14+
data.shrink_from_back_to(queue.Capacity() - queue.Size());
1515
queue.AddFromInterrupt(data);
1616
});
1717
}

0 commit comments

Comments
 (0)