Skip to content
This repository was archived by the owner on Jan 9, 2026. It is now read-only.

Merge merged branch 'merge' into merged master branch#66

Merged
Conr86 merged 583 commits intomasterfrom
merge
Feb 28, 2020
Merged

Merge merged branch 'merge' into merged master branch#66
Conr86 merged 583 commits intomasterfrom
merge

Conversation

@Conr86
Copy link
Copy Markdown
Member

@Conr86 Conr86 commented Feb 28, 2020

Description

This merges the following repositories into a universal sights repo:

  • SIGHTSRobot (now called sights)
  • SIGHTSInterface (now in interface/)
  • supervisor_sights_config (now in 'src/supervisor_plugin')

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Re-write of an existing feature
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Testing

Needs a final test to ensure installer installs on a fresh installation and also updates a pre-merge install. Should be fine, the codes all there.

Final checklist:

  • Code follows the style guidelines of SIGHTS
  • I have performed a self-review of my own code
  • Comments have been added, particularly in hard-to-understand areas
  • Made corresponding changes to the documentation
  • The changes cause no new errors or warnings

Conr86 and others added 30 commits November 9, 2019 14:36
...And a stupid charging animation
Merge pull request #28 from SFXRescue/service-logs
Having it all in one place means we don't need to update 3+ copies every time something changes.
WilliamsJack and others added 26 commits February 10, 2020 10:13
* Use a FA icon that actually exists for line graphs
* Remove redundant "S.A.R.T." (S in SIGHTS stands for S.A.R.T.)
* Even more realistic demo RAM usage (tested on Ubuntu Server 18.04)
The interface's only responsibility should be to display the data sent
by the sensor wrappers. The sensor wrapper should scale the data as
necessary to return hue values between 0 and 360 specific to the data
returned by the thermal camera it handles.
@Conr86 Conr86 requested a review from WilliamsJack February 28, 2020 03:17
Copy link
Copy Markdown
Member

@WilliamsJack WilliamsJack left a comment

Choose a reason for hiding this comment

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

We shall become one.

Execute PR #66.

@Conr86 Conr86 merged commit 527cc83 into master Feb 28, 2020
@Conr86 Conr86 deleted the merge branch February 28, 2020 03:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants