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.

Sign up for GitHub

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

Adjusted packetDefinitions.json to support new accel packet type #88

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adjusted packetDefinitions.json to support new accel packet type #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8394d0
Adjusted packetDefinitions.json to support new accel packet type. Mer…
ryan1248 Aug 24, 2017
ac64ff8
BA - Updated full accel page with new accel data packet params
Aug 26, 2017
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
42 changes: 33 additions & 9 deletions config/packetDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3727,25 +3727,49 @@
"type": "uint8",
"units": "",
"size": 1,
"Name": "Thresholding Active"
"Name": "Accel Thresholding Active"
},
{
"type": "uint32",
"units": "",
"size": 4,
"Name": "Thresholding Time"
"type": "uint16",
"units": "x10ms",
"size": 2,
"Name": "Accel Threshold Time"
},
{
"type": "int32",
"units": "",
"units": "mm ss",
"size": 4,
"Name": "Thresholding Accel"
"Name": "Accel Threshold"
},
{
"type": "uint32",
"type": "uint16",
"units": "x10ms",
"size": 2,
"Name": "Accel Threshold Counter"
},
{
"type": "uint8",
"units": "",
"size": 1,
"Name": "Decel Thresholding Active"
},
{
"type": "uint16",
"units": "x10ms",
"size": 2,
"Name": "Decel Threshold Time"
},
{
"type": "int32",
"units": "mm ss",
"size": 4,
"Name": "Thresholding Counter"
"Name": "Decel Threshold"
},
{
"type": "uint16",
"units": "x10ms",
"size": 2,
"Name": "Decel Threshold Counter"
}
]
},
Expand Down
119 changes: 90 additions & 29 deletions src/components/FlightControl_FullAccel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,7 @@ class FlightControl_FullAccel extends Component {
</form>

<legend>Full Accelerometer Data</legend>

<LineChart
id="AccelerometerChart"
StreamingPageManager={this.state.streamManager}
parameters={['Accel 1 X Gs', 'Accel 1 Y Gs', 'Accel 1 Z Gs']}
hideUnits='true'
title="Accelerometer time-series"
yRange={[-20, 20]}
yAxisLabel="Gs"
xAxisLabel="Time"
totalPoints={120}
/>

<div className="row margin-bottom-20px">
<div className="col-xs-6">
<form className="form-inline col-xs-4">
<div className="form-group">
<label htmlFor="a0_x">A1:X-Axis</label>
Expand All @@ -99,9 +86,7 @@ class FlightControl_FullAccel extends Component {
</div>
</div>
</form>
</div>

<div className="row">
<form className="form-inline col-xs-4">
<div className="form-group">

Expand All @@ -120,12 +105,6 @@ class FlightControl_FullAccel extends Component {
</div>
</div>
</form>

</div>

<br /><br />

<div className="row">
<form className="form-inline col-xs-4">
<div className="form-group">
<label htmlFor="a1_x">A2:X-Axis</label>
Expand All @@ -152,11 +131,6 @@ class FlightControl_FullAccel extends Component {
</div>
</div>
</form>
</div>

<br />

<div className="row">
<form className="form-inline col-xs-4">
<div className="form-group">

Expand All @@ -176,9 +150,96 @@ class FlightControl_FullAccel extends Component {
</div>
</form>
</div>
<div className="col-xs-6">
<LineChart
id="AccelerometerChart"
StreamingPageManager={this.state.streamManager}
parameters={['Accel 1 X Gs', 'Accel 1 Y Gs', 'Accel 1 Z Gs']}
hideUnits='true'
title="Accelerometer time-series"
yRange={[-20, 20]}
yAxisLabel="Gs"
xAxisLabel="Time"
totalPoints={120}
/>
</div>
<br />

<br></br>
<br></br>
<legend>Threshold</legend>
<div className="row">
<form className="form-inline col-xs-4">
<div className="form-group">

<label htmlFor="a0_flags">Accel thresholding active</label>
<div>
<GenericParameterInput StreamingPageManager={this.state.streamManager} parameter='Accel Thresholding Active' hideUnits='true' readOnly='true'/>
</div>
</div>
</form>
<form className="form-inline col-xs-4">
<div className="form-group">

<label htmlFor="a0_flags">Accel threshold time</label>
<div>
<GenericParameterInput StreamingPageManager={this.state.streamManager} parameter='Accel Threshold Time' hideUnits='true' readOnly='true'/>
</div>
</div>
</form>
<form className="form-inline col-xs-4">
<div className="form-group">

<label htmlFor="a0_flags">Accel threshold</label>
<div>
<GenericParameterInput StreamingPageManager={this.state.streamManager} parameter='Accel Threshold' hideUnits='true' readOnly='true'/>
</div>
</div>
</form>
<form className="form-inline col-xs-4">
<div className="form-group">

<label htmlFor="a0_flags">Accel threshold count</label>
<div>
<GenericParameterInput StreamingPageManager={this.state.streamManager} parameter='Accel Threshold Counter' hideUnits='true' readOnly='true'/>
</div>
</div>
</form>
<form className="form-inline col-xs-4">
<div className="form-group">

<label htmlFor="a0_flags">Decel thresholding active</label>
<div>
<GenericParameterInput StreamingPageManager={this.state.streamManager} parameter='Decel Thresholding Active' hideUnits='true' readOnly='true'/>
</div>
</div>
</form>
<form className="form-inline col-xs-4">
<div className="form-group">

<label htmlFor="a0_flags">Decel threshold time</label>
<div>
<GenericParameterInput StreamingPageManager={this.state.streamManager} parameter='Decel Threshold Time' hideUnits='true' readOnly='true'/>
</div>
</div>
</form>
<form className="form-inline col-xs-4">
<div className="form-group">

<label htmlFor="a0_flags">Decel threshold</label>
<div>
<GenericParameterInput StreamingPageManager={this.state.streamManager} parameter='Decel Threshold' hideUnits='true' readOnly='true'/>
</div>
</div>
</form>
<form className="form-inline col-xs-4">
<div className="form-group">

<label htmlFor="a0_flags">Decel threshold counter</label>
<div>
<GenericParameterInput StreamingPageManager={this.state.streamManager} parameter='Decel Threshold Counter' hideUnits='true' readOnly='true'/>
</div>
</div>
</form>
</div>

<legend>Device Status</legend>
<div className="row">
Expand Down