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.

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

Feature/alarm #339

Merged
merged 25 commits into from
Feb 22, 2023
Merged

Conversation

xbohdan
Copy link
Contributor

@xbohdan xbohdan commented Jan 6, 2023

No description provided.

@xbohdan xbohdan marked this pull request as ready for review January 13, 2023 13:22
@simonmicro
Copy link
Member

simonmicro commented Jan 20, 2023

I've noted some similarities with the other PRs. Could you please leave a note in them, which PR is based upon which other one? This would save me some time by not reviewing your changes twice (and commenting them :P ).

Copy link
Member

@simonmicro simonmicro left a comment

Choose a reason for hiding this comment

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

...and when should this be merged? After or before #343 ?

@akmal-threepointsix
Copy link
Contributor

...and when should this be merged? After or before #343 ?

The order does not matter, since they are independent features.

And with any order there will be few merge conflicts 😃, but they are very easy to fix 😉.

Copy link
Member

@simonmicro simonmicro left a comment

Choose a reason for hiding this comment

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

Well, while the comment inside the unit test for the OswServiceTaskNotifier may not be true anymore, I'm not a fan of implementing it myself... @cutieskye @akmal-threepointsix ?

@simonmicro simonmicro added this pull request to the merge queue Feb 10, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Feb 10, 2023
@simonmicro simonmicro added this pull request to the merge queue Feb 10, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Feb 10, 2023
@simonmicro
Copy link
Member

A note regarding the "fixtures": A fixture is something which prepares / resets something for one specific unit-test. In the other tests those are used to start/prepare the emulator if e.g. interaction with the HAL is needed or used to reset/prepare the Preferences/NVS before every test run. Your unit-tests are therefore not really well placed inside the fixtures-folder. Furthermore, a fixture shall be independent of the test, so others could potentially reuse them as needed.

@akmal-threepointsix
Copy link
Contributor

akmal-threepointsix commented Feb 10, 2023

I resolved all conflicts.

Well, while the comment inside the unit test for the OswServiceTaskNotifier may not be true anymore, I'm not a fan of implementing it myself... @cutieskye @akmal-threepointsix ?

I removed outdated comment and added a new comment. Unfortunately, I don't have energy to write new unit tests 😢

Copy link
Member

@RuffaloLavoisier RuffaloLavoisier left a comment

Choose a reason for hiding this comment

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

LGTM - We don't have a trigger module at the moment, but the idea is great!

@akmal-threepointsix
Copy link
Contributor

Hmm, one check failed. But it looks like it is not our fault, it just could not download some package 🤔. Could someone restart all checks?

@simonmicro
Copy link
Member

Hmm, one check failed. But it looks like it is not our fault, it just could not download some package thinking. Could someone restart all checks?

Consider it done :)

@simonmicro simonmicro added this pull request to the merge queue Feb 18, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Feb 18, 2023
@simonmicro simonmicro added this pull request to the merge queue Feb 18, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Feb 18, 2023
@simonmicro simonmicro enabled auto-merge February 18, 2023 16:26
@simonmicro simonmicro added this pull request to the merge queue Feb 18, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Feb 18, 2023
@simonmicro
Copy link
Member

simonmicro commented Feb 18, 2023

I'm sorry, but your branch is somewhat out-of-sync with the develop, so I wasn't able to merge it. I've gone ahead and merged #350 before yours (because of your conflicts). Would it be possiblee that you rebase on top of the current develop branch? I'll try to merge yours ASAP 😓

@akmal-threepointsix
Copy link
Contributor

Erm sorry, I accidentally merged "develop" into this branch instead of rebasing. Is it ok?

@simonmicro simonmicro added this pull request to the merge queue Feb 21, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Feb 21, 2023
@simonmicro
Copy link
Member

Nope, the "Merge Queue" is still rejecting this branch... If you can't solve it I would swing my admin-mode and hammer it in :)

@RuffaloLavoisier RuffaloLavoisier added this pull request to the merge queue Feb 22, 2023
Merged via the queue into Open-Smartwatch:develop with commit 6db5146 Feb 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src/core src/osw-app This PR / issue impacts the current release of the OS src/osw-emulator ⭐ enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants