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

Implemented configurable delay for feedback messages (Downloading and Installing) #49

Merged
merged 3 commits into from
Oct 25, 2023
Merged

Implemented configurable delay for feedback messages (Downloading and Installing) #49

merged 3 commits into from
Oct 25, 2023

Conversation

OleksandrChaika
Copy link
Contributor

… Installing)

@OleksandrChaika OleksandrChaika changed the title Implemented configurable delay for feedback messages (Downloading and… Implemented configurable delay for feedback messages (Downloading and Installing) Oct 23, 2023
OlavHerbst
OlavHerbst suggested changes Oct 23, 2023
View reviewed changes
Copy link
Contributor

@OlavHerbst OlavHerbst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

naming variables

src/Context.h Outdated
@@ -62,6 +62,7 @@ namespace sua {
std::string caFilepath = SUA_DEFAULT_CA_FILEPATH;
bool downloadMode = true;
bool fallbackMode = false;
int messageDelay = SUA_DEFAULT_MESSAGE_DELAY;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should add the unit as comment - [s] (also in Defaults.cpp)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The name "delay" is misleading. It means that something will happen later. But here it's more a suppression/rejection interval/duration/period.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should add the unit as comment - [s] (also in Defaults.cpp)

Fixed, both

src/FSM/States/Downloading.h Outdated
@@ -32,6 +32,9 @@ namespace sua {
void onEnter(Context& ctx) override;

FotaEvent body(Context& ctx) override;

private:
long long _last_update = 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better rename: _time_last_update; // [s]
or CamelCase?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

src/FSM/States/Installing.h Outdated
@@ -32,6 +32,9 @@ namespace sua {
void onEnter(Context& ctx) override;

FotaEvent body(Context& ctx) override;

private:
long long _last_update = 0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

name: ref. in Downloading

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

src/FSM/States/Downloading.cpp
if(now_in_seconds - _last_update > ctx.messageDelay) {
send(ctx, IMqttProcessor::TOPIC_FEEDBACK, MqttMessage::Downloading);
_last_update = now_in_seconds;
}
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it ok, that the final event could not always result to a message? Perhaps downloadProgressPercentage==100 is an important value that triggers something on server side so that at least the last event should always be sent.
Same mind for installation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

src/FSM/States/Downloading.cpp
@@ -22,6 +22,8 @@
#include "FotaEvent.h"
#include "Logger.h"

#include <chrono>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also to be included in Installing.cpp?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

OlavHerbst
OlavHerbst reviewed Oct 23, 2023
View reviewed changes
src/FSM/States/Downloading.cpp Outdated
Logger::info("Download progress: {}%", ctx.desiredState.downloadProgressPercentage);
send(ctx, IMqttProcessor::TOPIC_FEEDBACK, MqttMessage::Downloading);

if(now_in_seconds - _last_update > ctx.messageDelay) {
Copy link
Contributor

@OlavHerbst OlavHerbst Oct 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shoud be operation >=:
now - last >= 5,
e.g. n s + 5 s = (n+5) s ==> send msg
(n+5) - n >= 5
same in Installating

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

OlavHerbst
OlavHerbst approved these changes Oct 25, 2023
View reviewed changes
Copy link
Contributor

@OlavHerbst OlavHerbst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all findings fixed - ok

@OleksandrChaika OleksandrChaika merged commit 70df8c1 into eclipse-leda:main Oct 25, 2023
8 checks passed
@OleksandrChaika OleksandrChaika deleted the feature/interval_for_feedback branch October 25, 2023 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@OlavHerbst OlavHerbst OlavHerbst approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@OleksandrChaika @OlavHerbst