Compare commits
5 Commits
dev
...
add-networ
| Author | SHA1 | Date | |
|---|---|---|---|
| 26b955a1e8 | |||
| bb17ad6135 | |||
| 40c7d020d2 | |||
| 9b5adba3ed | |||
|
|
73740ffa39 |
@@ -93,3 +93,20 @@ sast:
|
||||
stage: test
|
||||
include:
|
||||
- template: Security/SAST.gitlab-ci.yml
|
||||
|
||||
sonarqube-check:
|
||||
image:
|
||||
name: sonarsource/sonar-scanner-cli:latest
|
||||
entrypoint: [""]
|
||||
variables:
|
||||
SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
|
||||
GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task
|
||||
cache:
|
||||
key: "${CI_JOB_NAME}"
|
||||
paths:
|
||||
- .sonar/cache
|
||||
script:
|
||||
- sonar-scanner
|
||||
allow_failure: true
|
||||
only:
|
||||
- master # or the name of your main branch
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
## [1.7.3](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.2...v1.7.3) (2021-04-12)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* Empty commit to get recent changes into build (last commit should've been labeled this) ([e513752](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/commit/e513752c46cc0b3beb93530f6549661d67196905))
|
||||
|
||||
## [1.7.2](https://gitlab.evanrichardsonphotography.com/erichardson/py-eagle-mqtt/compare/v1.7.1...v1.7.2) (2021-04-08)
|
||||
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ import json
|
||||
import bottle as B
|
||||
import tHome as T
|
||||
|
||||
|
||||
# ===========================================================================
|
||||
def meter(client, data, cfg):
|
||||
msg = {
|
||||
@@ -30,7 +31,8 @@ def meter( client, data, cfg ):
|
||||
"produced": data.Produced, # kWh
|
||||
}
|
||||
|
||||
return ( cfg.mqttEnergy, msg )
|
||||
return cfg.mqttEnergy, msg
|
||||
|
||||
|
||||
# ===========================================================================
|
||||
def instant(client, data, cfg):
|
||||
@@ -39,7 +41,8 @@ def instant( client, data, cfg ):
|
||||
"power": data.Power * 1000, # W
|
||||
}
|
||||
|
||||
return ( cfg.mqttPower, msg )
|
||||
return cfg.mqttPower, msg
|
||||
|
||||
|
||||
# ===========================================================================
|
||||
def price(client, data, cfg):
|
||||
@@ -48,7 +51,18 @@ def price( client, data, cfg ):
|
||||
"price": data.Price,
|
||||
"tier": data.Tier,
|
||||
}
|
||||
return ( cfg.mqttPrice, msg )
|
||||
return cfg.mqttPrice, msg
|
||||
|
||||
|
||||
# ===========================================================================
|
||||
def network(client, data, cfg):
|
||||
msg = {
|
||||
"status": data.Status,
|
||||
"description": data.Description,
|
||||
"linkstrength": data.LinkStrength
|
||||
}
|
||||
return cfg.mqttNetwork, msg
|
||||
|
||||
|
||||
# ===========================================================================
|
||||
handlers = {
|
||||
@@ -59,13 +73,14 @@ handlers = {
|
||||
"InstantaneousDemand": instant,
|
||||
# "MessageCluster" :
|
||||
# "MeterInfo" :
|
||||
#"NetworkInfo" :
|
||||
"NetworkInfo": network,
|
||||
"PriceCluster": price,
|
||||
# "Reading" :
|
||||
# "ScheduleInfo" :
|
||||
# "TimeCluster" :
|
||||
}
|
||||
|
||||
|
||||
# ===========================================================================
|
||||
|
||||
@B.post('/')
|
||||
@@ -90,6 +105,7 @@ def root_post():
|
||||
|
||||
return "ok"
|
||||
|
||||
|
||||
# ===========================================================================
|
||||
#
|
||||
# Main applications script
|
||||
|
||||
@@ -23,6 +23,9 @@ mqttPrice = 'power/elec/Home/price'
|
||||
#Current rate label (returns rate label from meter)
|
||||
mqttRateLabel = 'power/elec/Home/ratelabel'
|
||||
|
||||
#Network Info Topic (returns status, description and link strength from meter)
|
||||
mqttNetwork = 'power/elec/Home/network'
|
||||
|
||||
#===========================================================================
|
||||
#
|
||||
# Logging configuration. Env variables are allowed in the file name.
|
||||
|
||||
3
sonar-project.properties
Normal file
3
sonar-project.properties
Normal file
@@ -0,0 +1,3 @@
|
||||
sonar.projectKey=erichardson_py-eagle-mqtt_AXkgI9tRLcemhRz3NCjo
|
||||
sonar.qualitygate.wait=true
|
||||
sonar.projectBaseDir=Docker/src
|
||||
Reference in New Issue
Block a user