AllSpiceMirrors/ThunderScope
7
Fork 0
mirror of https://github.com/EEVengers/ThunderScope.git synced 2025-04-08 06:25:30 +00:00
Files Issues Releases Activity

moved initial states to their own files

Browse Source
This commit is contained in:
Jason Bonnell 2021-03-20 16:18:54 -04:00
parent 657c20bc93
commit 5f4fea33e6
8 changed files with 208 additions and 167 deletions

24
Software/waveview/src/redux/initialStates/horizontalWidgetInitialState.tsx Normal file
View File

@ -0,0 +1,24 @@
import DefaultValues from '../../configuration/defaultValues';
import TimeUnit from '../../configuration/enums/timeUnit';
import ControlMode from '../../configuration/enums/controlMode';
const HorizontalWidgetInitialState = {
horizontalTimeBase: {
mode: ControlMode.Course,
index: 15,
course: {
value: DefaultValues.horizontalTimeBases_New[15].value,
unit: DefaultValues.horizontalTimeBases_New[15].unit
},
fine: {
value: 0,
unit: TimeUnit.MicroSecond
}
},
horizontalOffset: {
value: 0,
unit: TimeUnit.MicroSecond
}
};
export default HorizontalWidgetInitialState;

20
Software/waveview/src/redux/initialStates/measurementsWidgetInitialState.tsx Normal file
View File

@ -0,0 +1,20 @@
import MathType from '../../configuration/enums/mathType';
import TimeUnit from '../../configuration/enums/timeUnit';
import VoltageUnit from '../../configuration/enums/voltageUnit';
const MeasurementsWidgetInitialState = {
measurement: [
{
mathType: MathType.Max,
value: 500,
unit: TimeUnit.NanoSecond
},
{
mathType: MathType.Min,
value: 300,
unit: VoltageUnit.MilliVolt
}
]
};
export default MeasurementsWidgetInitialState;

39
Software/waveview/src/redux/initialStates/triggerWidgetInitialState.tsx Normal file
View File

@ -0,0 +1,39 @@
import TriggerType from '../../configuration/enums/triggerType';
import DefaultChannelColor from '../../configuration/enums/defaultChannelColor';
import VoltageUnit from '../../configuration/enums/voltageUnit';
const TriggerWidgetInitialState = {
triggerChannel: 1,
channelColorsList: [
DefaultChannelColor.Channel1,
DefaultChannelColor.Channel2,
DefaultChannelColor.Channel3,
DefaultChannelColor.Channel4
],
triggerType: [
TriggerType.RisingEdge,
TriggerType.RisingEdge,
TriggerType.RisingEdge,
TriggerType.RisingEdge
],
triggerLevel: [
{
value: 0.0,
unit: VoltageUnit.MilliVolt
},
{
value: 0.0,
unit: VoltageUnit.MilliVolt
},
{
value: 0.0,
unit: VoltageUnit.MilliVolt
},
{
value: 0.0,
unit: VoltageUnit.MilliVolt
}
]
};
export default TriggerWidgetInitialState;

117
Software/waveview/src/redux/initialStates/verticalWidgetInitialState.tsx Normal file
View File

@ -0,0 +1,117 @@
import DefaultChannelColor from '../../configuration/enums/defaultChannelColor';
import MeasurementType from '../../configuration/enums/measurementType';
import VoltageUnit from '../../configuration/enums/voltageUnit';
import ControlMode from '../../configuration/enums/controlMode';
import ProbeMode from '../../configuration/enums/probeMode';
import DefaultValues from '../../configuration/defaultValues';
const VerticalWidgetInitialState = {
activeChannel: 1,
totalChannelsUsed: 4,
channelColorsList: [
DefaultChannelColor.Channel1,
DefaultChannelColor.Channel2,
DefaultChannelColor.Channel3,
DefaultChannelColor.Channel4
],
timePerDivision: [
{
course: {
value: DefaultValues.x1ProbeValues_New[6].value,
unit: DefaultValues.x1ProbeValues_New[6].unit
},
fine: {
value: 0,
x10value: 0,
unit: VoltageUnit.MilliVolt
},
index: 6
},
{
course: {
value: DefaultValues.x1ProbeValues_New[6].value,
unit: DefaultValues.x1ProbeValues_New[6].unit
},
fine: {
value: 0,
x10value: 0,
unit: VoltageUnit.MilliVolt
},
index: 6
},
{
course: {
value: DefaultValues.x1ProbeValues_New[6].value,
unit: DefaultValues.x1ProbeValues_New[6].unit
},
fine: {
value: 0,
x10value: 0,
unit: VoltageUnit.MilliVolt
},
index: 6
},
{
course: {
value: DefaultValues.x1ProbeValues_New[6].value,
unit: DefaultValues.x1ProbeValues_New[6].unit
},
fine: {
value: 0,
x10value: 0,
unit: VoltageUnit.MilliVolt
},
index: 6
}
],
settings: [
{
controlMode: ControlMode.Course,
probeMode: ProbeMode.x1,
coupling: MeasurementType.DC,
bandwidth: 100,
status: 1
},
{
controlMode: ControlMode.Course,
probeMode: ProbeMode.x1,
coupling: MeasurementType.DC,
bandwidth: 100,
status: 1
},
{
controlMode: ControlMode.Course,
probeMode: ProbeMode.x1,
coupling: MeasurementType.DC,
bandwidth: 100,
status: 1
},
{
controlMode: ControlMode.Course,
probeMode: ProbeMode.x1,
coupling: MeasurementType.DC,
bandwidth: 100,
status: 1
}
],
verticalOffset: [
{
value: 0,
unit: VoltageUnit.MilliVolt
},
{
value: 0,
unit: VoltageUnit.MilliVolt
},
{
value: 0,
unit: VoltageUnit.MilliVolt
},
{
value: 0,
unit: VoltageUnit.MilliVolt
}
]
};
export default VerticalWidgetInitialState;

23
Software/waveview/src/redux/reducers/widgets/horizontalWidgetReducer.tsx
View File

@ -1,27 +1,8 @@
import DefaultValues from '../../../configuration/defaultValues';
import TimeUnit from '../../../configuration/enums/timeUnit';
import ControlMode from '../../../configuration/enums/controlMode';
import HorizontalWidgetInitialState from '../../initialStates/horizontalWidgetInitialState';
const initialState = {
horizontalTimeBase: {
mode: ControlMode.Course,
index: 15,
course: {
value: DefaultValues.horizontalTimeBases_New[15].value,
unit: DefaultValues.horizontalTimeBases_New[15].unit
},
fine: {
value: 0,
unit: TimeUnit.MicroSecond
}
},
horizontalOffset: {
value: 0,
unit: TimeUnit.MicroSecond
}
};
export default function(state = initialState, action: {type: any, payload: any}) {
export default function(state = HorizontalWidgetInitialState, action: {type: any, payload: any}) {
switch(action.type) {
case "horizontal/changeTimeBaseMode":
return {

21
Software/waveview/src/redux/reducers/widgets/measurementsWidgetReducer.tsx
View File

@ -1,23 +1,6 @@
import MathType from '../../../configuration/enums/mathType';
import TimeUnit from '../../../configuration/enums/timeUnit';
import VoltageUnit from '../../../configuration/enums/voltageUnit';
import MeasurementsWidgetInitialState from '../../initialStates/measurementsWidgetInitialState';
const initialState = {
measurement: [
{
mathType: MathType.Max,
value: 500,
unit: TimeUnit.NanoSecond
},
{
mathType: MathType.Min,
value: 300,
unit: VoltageUnit.MilliVolt
}
]
};
export default function(state = initialState, action: {type: any, payload: any}) {
export default function(state = MeasurementsWidgetInitialState, action: {type: any, payload: any}) {
switch(action.type) {
default:
return state;

28
Software/waveview/src/redux/reducers/widgets/triggerWidgetReducer.tsx
View File

@ -1,30 +1,6 @@
import TriggerType from '../../../configuration/enums/triggerType';
import DefaultChannelColor from '../../../configuration/enums/defaultChannelColor';
import VoltageUnit from '../../../configuration/enums/voltageUnit';
import TriggerWidgetInitialState from '../../initialStates/triggerWidgetInitialState';
const initialState = {
triggerChannel: 1,
channelColorsList: [
DefaultChannelColor.Channel1,
DefaultChannelColor.Channel2,
DefaultChannelColor.Channel3,
DefaultChannelColor.Channel4
],
triggerType: [
TriggerType.RisingEdge,
TriggerType.RisingEdge,
TriggerType.RisingEdge,
TriggerType.RisingEdge
],
triggerLevel: [
{value: 0.0, unit: VoltageUnit.MilliVolt},
{value: 0.0, unit: VoltageUnit.MilliVolt},
{value: 0.0, unit: VoltageUnit.MilliVolt},
{value: 0.0, unit: VoltageUnit.MilliVolt}
]
};
export default function(state = initialState, action: {type: any, payload: any}) {
export default function(state = TriggerWidgetInitialState, action: {type: any, payload: any}) {
var channelIndex = state.triggerChannel - 1;
var tmp;

103
Software/waveview/src/redux/reducers/widgets/verticalWidgetReducer.tsx
View File

@ -1,108 +1,9 @@
import DefaultChannelColor from '../../../configuration/enums/defaultChannelColor';
import MeasurementType from '../../../configuration/enums/measurementType';
import VoltageUnit from '../../../configuration/enums/voltageUnit';
import ControlMode from '../../../configuration/enums/controlMode';
import ProbeMode from '../../../configuration/enums/probeMode';
import DefaultValues from '../../../configuration/defaultValues';
import VerticalWidgetInitialState from '../../initialStates/verticalWidgetInitialState';
const initialState = {
activeChannel: 1,
totalChannelsUsed: 1,
channelColorsList: [
DefaultChannelColor.Channel1,
DefaultChannelColor.Channel2,
DefaultChannelColor.Channel3,
DefaultChannelColor.Channel4
],
timePerDivision: [
{
course: {
value: DefaultValues.x1ProbeValues_New[6].value,
unit: DefaultValues.x1ProbeValues_New[6].unit
},
fine: {
value: 0,
x10value: 0,
unit: VoltageUnit.MilliVolt
},
index: 6
},
{
course: {
value: DefaultValues.x1ProbeValues_New[6].value,
unit: DefaultValues.x1ProbeValues_New[6].unit
},
fine: {
value: 0,
x10value: 0,
unit: VoltageUnit.MilliVolt
},
index: 6
},
{
course: {
value: DefaultValues.x1ProbeValues_New[6].value,
unit: DefaultValues.x1ProbeValues_New[6].unit
},
fine: {
value: 0,
x10value: 0,
unit: VoltageUnit.MilliVolt
},
index: 6
},
{
course: {
value: DefaultValues.x1ProbeValues_New[6].value,
unit: DefaultValues.x1ProbeValues_New[6].unit
},
fine: {
value: 0,
x10value: 0,
unit: VoltageUnit.MilliVolt
},
index: 6
}
],
settings: [
{
controlMode: ControlMode.Course,
probeMode: ProbeMode.x1,
coupling: MeasurementType.DC,
bandwidth: 100,
status: 1
},
{
controlMode: ControlMode.Course,
probeMode: ProbeMode.x1,
coupling: MeasurementType.DC,
bandwidth: 100,
status: 0
},
{
controlMode: ControlMode.Course,
probeMode: ProbeMode.x1,
coupling: MeasurementType.DC,
bandwidth: 100,
status: 0
},
{
controlMode: ControlMode.Course,
probeMode: ProbeMode.x1,
coupling: MeasurementType.DC,
bandwidth: 100,
status: 0
}
],
verticalOffset: [
{value: 0, unit: VoltageUnit.MilliVolt},
{value: 0, unit: VoltageUnit.MilliVolt},
{value: 0, unit: VoltageUnit.MilliVolt},
{value: 0, unit: VoltageUnit.MilliVolt}
]
};
export default function(state = initialState, action: {type: any, payload: any}) {
export default function(state = VerticalWidgetInitialState, action: {type: any, payload: any}) {
var channelIndex = state.activeChannel - 1;
var tmp;
var tmp2;