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

Release Version 2.0 #13

Open
wants to merge 107 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
f243160
:pencil: Added branch definitions
SBajonczak Jul 29, 2021
1905f12
:construction: Added new compilerflag "GPIO_MAINTENANCE_PIN"
SBajonczak Jul 29, 2021
31b6aad
:pencil: Added readme
SBajonczak Jul 29, 2021
8437aee
:pencil: Removed obsolete init
SBajonczak Jul 29, 2021
eb49d0d
:sparkles: Added Maintenance Button Support
SBajonczak Jul 29, 2021
aed4cbb
:bulb: Added gerber file and updated the schema
SBajonczak Jul 29, 2021
4d98eb0
:mute: Removed verbose log
SBajonczak Jul 29, 2021
afcb259
:sparkles: Feature ready for #12
SBajonczak Jul 29, 2021
97f3213
:construction: Added first implemnentation for the autotare functiona…
SBajonczak Jul 30, 2021
891c6a3
:fire: Removed obsolete files
SBajonczak Jul 30, 2021
81521a8
:construction: added new frontend ui for the autotare method
SBajonczak Aug 1, 2021
932f143
Added wizard style methods
SBajonczak Aug 2, 2021
e4ea1cd
adjusting port description
SBajonczak Aug 2, 2021
eeff411
Added singleton and destructor
SBajonczak Aug 2, 2021
6bceb1b
modified bundler
SBajonczak Aug 2, 2021
ae2b1e6
ignoring generates html file
SBajonczak Aug 2, 2021
1aac984
included html directory
SBajonczak Aug 2, 2021
42462fe
Refactored Settings class
SBajonczak Aug 6, 2021
67eb295
Cleanup configuration class
SBajonczak Aug 6, 2021
eabd2ad
Added ardunino json reference
SBajonczak Aug 6, 2021
4bcab19
Added default config
SBajonczak Aug 6, 2021
a60f5e9
Movied html dor out of data dir
SBajonczak Aug 6, 2021
8e64759
Added some vscode configs
SBajonczak Aug 6, 2021
7f5428e
Modified config
SBajonczak Aug 6, 2021
d6fdb0d
Added new Webserver implementation
SBajonczak Aug 6, 2021
f5c1f79
Removed Webserver from DeviceManager
SBajonczak Aug 6, 2021
32e1011
Using singleton instance from conf manager
SBajonczak Aug 6, 2021
3d05e63
Reconfiguration of measuring speed
SBajonczak Aug 6, 2021
24363ce
:pencil: Updated readme
SBajonczak Aug 6, 2021
865e35e
Added Settings page
SBajonczak Aug 6, 2021
a695eb2
Onload now in the body onload applied
SBajonczak Aug 6, 2021
a14569d
:sparkles: Added new configuration webinterface
SBajonczak Aug 6, 2021
8f1dfae
FInalized preconfgi page
SBajonczak Aug 6, 2021
24ffed1
:pencil2: Fixed some object typos
SBajonczak Aug 6, 2021
97d04f6
Update the readme for the new webinterface
SBajonczak Aug 6, 2021
56efae4
:pencil: extending docs and setting static ip with custom ap name
SBajonczak Aug 6, 2021
2f1f4f2
Merge branch 'feature/autotare' of github.com:SBajonczak/hivemonitor …
SBajonczak Aug 6, 2021
e65c6fb
Added code of conduct
SBajonczak Aug 7, 2021
b174908
Merge pull request #16 from SBajonczak/add-code-of-conduct-1
SBajonczak Aug 7, 2021
99d3432
Merge branch 'add-code-of-conduct-1' into feature/autotare
SBajonczak Aug 9, 2021
500cbb9
Merge remote-tracking branch 'origin/SBajonczak-templates' into featu…
SBajonczak Aug 9, 2021
a014a22
:arrow_up: Added dependabot configuration
SBajonczak Aug 9, 2021
186c931
Merge branch 'master' into development
SBajonczak Aug 9, 2021
e0f5271
Merge branch 'development' of github.com:SBajonczak/hivemonitor into …
SBajonczak Aug 9, 2021
bb5041c
:construction: Added MqttWrapper for communicating with the Messagebus
SBajonczak Aug 9, 2021
749ad73
:pencil2: Fixed typo
SBajonczak Aug 9, 2021
600a5b3
:construction: Added mqttclient and Message class
SBajonczak Aug 12, 2021
3756a20
:construction: Removed Homie as dependency
SBajonczak Aug 13, 2021
753c280
Start in config mode Adding configuration mode
SBajonczak Aug 17, 2021
22e90d8
Added check if there any valid configuration exists
SBajonczak Aug 17, 2021
5b47e62
Added more logging
SBajonczak Aug 17, 2021
163c99e
Did some refactorings and added new scale methods
SBajonczak Aug 17, 2021
351dcc5
now using Strings for messages
SBajonczak Aug 17, 2021
a9f0aba
implemented the configuration bootup
SBajonczak Aug 17, 2021
563967f
:construction: Config mode now identify the weight offset.
SBajonczak Aug 18, 2021
5678899
:rewind: Reverted debug configmode
SBajonczak Aug 18, 2021
2df1d0c
:sparkles: Added new adjusting scale Wizard
SBajonczak Aug 23, 2021
dcb3862
:lipstick: Recognizing the attached device in config mode
SBajonczak Aug 24, 2021
eb40855
:lipstick: Fixed layout
SBajonczak Aug 24, 2021
ccbf8c0
:wrench: Added circle ci config
SBajonczak Aug 24, 2021
5884952
:construction_worker: Added minimal hello world config
SBajonczak Aug 24, 2021
9ac438a
:recycle: Added relative path
SBajonczak Aug 24, 2021
cc4394a
:recycle: Moved html.h into parent directory
SBajonczak Aug 24, 2021
911bb42
:bug: Fixed compilation error
SBajonczak Aug 24, 2021
f9382ca
:pencil2: try to modifiy circle ci
SBajonczak Aug 24, 2021
f2c2b8f
:pencil2: circle ci test
SBajonczak Aug 24, 2021
31ee5f5
:recycle: cleaned up
SBajonczak Aug 24, 2021
681bbe9
Removed mqtt Settings
Mar 3, 2022
87deffe
Work in Progress azure iot hub connection
Mar 3, 2022
3e23b18
Removed Homie.h because it's not required
Mar 3, 2022
7d40b2e
Removed homie.h
Mar 3, 2022
a7beff4
Removed Homie finally
Mar 3, 2022
e23abd5
Added new Azure Credential manager
Mar 7, 2022
5fc291b
Added dependencies for azure iot hub
Mar 7, 2022
f28d638
Removed obsolete header comment
Mar 7, 2022
b6a0442
Using pubsubclient for now
Mar 7, 2022
7a2177c
Added pseudo Config vars for now
Mar 7, 2022
a6471c0
Wiring all together to use the azure iot hub for now
Mar 7, 2022
abe60bf
Set new config values
Mar 7, 2022
b79d8e4
Added link to the device explorer tool
Mar 7, 2022
77fd97d
Refctored to get only the measurements
Mar 7, 2022
c91d109
Refactor to use only send command
Mar 7, 2022
02f8b66
Sending json document on demand
Mar 7, 2022
e73ee06
Using Deepsleep max
Mar 7, 2022
1a4cdaf
Removed sensitive data into ini file
Mar 7, 2022
dd5faf8
Added parameters
Mar 7, 2022
02008f5
Simplyfied code
Mar 7, 2022
2fd8c73
Added sleep value to payload
Mar 7, 2022
c93d86f
Added support for LittleFS
Mar 8, 2022
fc5c26b
Added .vscode to gitignore and removed obsolete files
Mar 8, 2022
00fa386
Documented compilerflags
Mar 8, 2022
4159c72
removed secret
Mar 8, 2022
f0c8ea2
Removed versioning tag
Mar 8, 2022
8fd6d3e
Removed warnings
Mar 8, 2022
4c8d5a0
Merge pull request #18 from SBajonczak/singlepayload
SBajonczak Mar 9, 2022
68c6d2d
removed uncommented code
Mar 9, 2022
b096181
Aded validation
Mar 10, 2022
627fa88
Added Azure Credential manager to mqttwrapper
Mar 10, 2022
97117ec
MOdified to use th config manager
Mar 10, 2022
fe77ce9
Added Wifi Fastconnect possiblity
Mar 10, 2022
b3c292d
Fixed problem when try to conntect to pubsubclient
Mar 10, 2022
3d422cf
Added new Hostname
Mar 10, 2022
c2cf3cb
using ENVS
Mar 10, 2022
d027e46
Added mac adress
Mar 11, 2022
c099a1e
Modified changes.rst
Mar 14, 2022
bca6023
removed dependencies
Mar 14, 2022
5424850
Merge pull request #19 from SBajonczak/wifimanager
SBajonczak Mar 15, 2022
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
20 changes: 20 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: 2.1
orbs:
python: circleci/[email protected]

jobs:
build:
executor: python/default
steps:
- checkout # checkout source code to working directory
- run:
name: Install PlatformIO
command: pip install --upgrade platformio
- run:
name: Compile Project
command: pio run

workflows:
main:
jobs:
- build
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "nuget" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/ipch

.idea
.venv*
.vscode


data/ui_out
# Created by https://www.gitignore.io/api/c++,visualstudio,visualstudiocode
# Edit at https://www.gitignore.io/?templates=c++,visualstudio,visualstudiocode

Expand Down
7 changes: 0 additions & 7 deletions .vscode/extensions.json

This file was deleted.

34 changes: 0 additions & 34 deletions .vscode/launch.json

This file was deleted.

9 changes: 0 additions & 9 deletions .vscode/settings.json

This file was deleted.

128 changes: 128 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[email protected] .
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series
of actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
the community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.
Binary file added Distribution/V1/Gerber_PCB_Hivemonitor_V1.zip
Binary file not shown.
Binary file added Distribution/V1/Schematic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading