Skip to content

Commit 7cbdfad

Browse files
committed
Initial
0 parents  commit 7cbdfad

File tree

6 files changed

+228
-0
lines changed

6 files changed

+228
-0
lines changed

.gitignore

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
lib/
18+
lib64/
19+
parts/
20+
sdist/
21+
var/
22+
wheels/
23+
pip-wheel-metadata/
24+
share/python-wheels/
25+
*.egg-info/
26+
.installed.cfg
27+
*.egg
28+
MANIFEST
29+
30+
# PyInstaller
31+
# Usually these files are written by a python script from a template
32+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
33+
*.manifest
34+
*.spec
35+
36+
# Installer logs
37+
pip-log.txt
38+
pip-delete-this-directory.txt
39+
40+
# Unit test / coverage reports
41+
htmlcov/
42+
.tox/
43+
.nox/
44+
.coverage
45+
.coverage.*
46+
.cache
47+
nosetests.xml
48+
coverage.xml
49+
*.cover
50+
*.py,cover
51+
.hypothesis/
52+
.pytest_cache/
53+
54+
# Translations
55+
*.mo
56+
*.pot
57+
58+
# Django stuff:
59+
*.log
60+
local_settings.py
61+
db.sqlite3
62+
db.sqlite3-journal
63+
64+
# Flask stuff:
65+
instance/
66+
.webassets-cache
67+
68+
# Scrapy stuff:
69+
.scrapy
70+
71+
# Sphinx documentation
72+
docs/_build/
73+
74+
# PyBuilder
75+
target/
76+
77+
# Jupyter Notebook
78+
.ipynb_checkpoints
79+
80+
# IPython
81+
profile_default/
82+
ipython_config.py
83+
84+
# pyenv
85+
.python-version
86+
87+
# pipenv
88+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
89+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
90+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
91+
# install all needed dependencies.
92+
#Pipfile.lock
93+
94+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow
95+
__pypackages__/
96+
97+
# Celery stuff
98+
celerybeat-schedule
99+
celerybeat.pid
100+
101+
# SageMath parsed files
102+
*.sage.py
103+
104+
# Environments
105+
.env
106+
.venv
107+
env/
108+
venv/
109+
ENV/
110+
env.bak/
111+
venv.bak/
112+
113+
# Spyder project settings
114+
.spyderproject
115+
.spyproject
116+
117+
# Rope project settings
118+
.ropeproject
119+
120+
# mkdocs documentation
121+
/site
122+
123+
# mypy
124+
.mypy_cache/
125+
.dmypy.json
126+
dmypy.json
127+
128+
# Pyre type checker
129+
.pyre/

Current.py

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
from saleae.range_measurements import AnalogMeasurer
2+
import numpy as np
3+
from numpy import trapz
4+
5+
class Current(AnalogMeasurer):
6+
supported_measurements = ["area"]
7+
8+
"""
9+
Class initialisation
10+
"""
11+
def __init__(self, requested_measurements):
12+
super().__init__(requested_measurements)
13+
self.batches = []
14+
15+
"""
16+
Does not process data. Simply attaches
17+
samples to be processed later.
18+
"""
19+
def process_data(self, data):
20+
self.batches.append(data.samples)
21+
22+
"""
23+
Calculates Average Voltage and Divide by 5.6 Ohm Resistor.
24+
"""
25+
def measure(self):
26+
data = np.concatenate(self.batches)
27+
averageVoltage = np.mean(data)
28+
averageCurrent = averageVoltage / 16.5
29+
maxVoltage = np.amax(data)
30+
maxCurrent = maxVoltage / 16.5
31+
return {"Iavg" : round(averageCurrent,6),
32+
"Vavg": round(averageVoltage,6),
33+
"Vmax" : round(maxVoltage,6),
34+
"Imax" : round(maxCurrent,6)}
35+

Images/AUC.png

13.9 KB
Loading

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2022 Jenish Rudani
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# AreaUnderCurve
2+
An extension for Saleae Logic Analyser that determines the area under curve of an analog voltage measurement against 16.5 Ohm resistor to determine average current consumption
3+
![AUC](Images/AUC.png)
4+
5+
## Instructions
6+
1. Install this extension by clicking "Install"
7+
2. Add a measurement by clicking on the "Annotations panel" on the right, then the Measurements "+" icon.
8+
3. Drag the measurement selection window over your recorded data.

extension.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"name": "Current Consumption",
3+
"apiVersion": "1.0.0",
4+
"author": "Jenish Rudani",
5+
"version": "1.0.0",
6+
"description": "An extension for Saleae Logic Analyser that determines the area under curve of an analog voltage measurement against 16.5 Ohm resistor to determine average current consumption",
7+
"extensions": {
8+
"Average Current Consumption": {
9+
"type": "AnalogMeasurement",
10+
"entryPoint": "Current.Current",
11+
"metrics": {
12+
"Iavg": {
13+
"name": "Current",
14+
"notation": "I<sub>avg</sub>(V<sub>avg</sub>/16.5)",
15+
"units": "A"
16+
},
17+
"Vavg": {
18+
"name": "Voltage",
19+
"notation": "V<sub>avg</sub>",
20+
"units": "V"
21+
},
22+
"Imax": {
23+
"name": "Current",
24+
"notation": "I<sub>max</sub>(V<sub>max</sub>/16.5)",
25+
"units": "A"
26+
},
27+
"Vmax": {
28+
"name": "Voltage",
29+
"notation": "V<sub>max</sub>",
30+
"units": "V"
31+
}
32+
}
33+
}
34+
}
35+
}

0 commit comments

Comments
 (0)