Merge branch 'airflow' into i2c_detect
This commit is contained in:
commit
8f5d9d1767
2 changed files with 8 additions and 8 deletions
|
|
@ -482,7 +482,7 @@ export default function ComponentForm(props: Props) {
|
|||
|
||||
const updateCalibrationTypes = (event: any, index: number) => {
|
||||
let f = cloneDeep(form);
|
||||
f.component.settings.calibrations[index].type = event.target.value as quack.MeasurementType;
|
||||
f.component.settings.calibrations[index].measurementType = event.target.value as quack.MeasurementType;
|
||||
setForm(f);
|
||||
};
|
||||
|
||||
|
|
@ -508,7 +508,7 @@ export default function ComponentForm(props: Props) {
|
|||
if (dimensions !== undefined && dimensions !== null) {
|
||||
dimensions.lengthCm = value;
|
||||
} else {
|
||||
dimensions = pond.Dimensions.create({
|
||||
dimensions = quack.Dimensions.create({
|
||||
heightCm: 0,
|
||||
lengthCm: value,
|
||||
widthCm: 0
|
||||
|
|
@ -537,7 +537,7 @@ export default function ComponentForm(props: Props) {
|
|||
if (dimensions !== undefined && dimensions !== null) {
|
||||
dimensions.heightCm = value;
|
||||
} else {
|
||||
dimensions = pond.Dimensions.create({
|
||||
dimensions = quack.Dimensions.create({
|
||||
heightCm: value,
|
||||
lengthCm: 0,
|
||||
widthCm: 0
|
||||
|
|
@ -566,7 +566,7 @@ export default function ComponentForm(props: Props) {
|
|||
if (dimensions !== undefined && dimensions !== null) {
|
||||
dimensions.widthCm = value;
|
||||
} else {
|
||||
dimensions = pond.Dimensions.create({
|
||||
dimensions = quack.Dimensions.create({
|
||||
heightCm: 0,
|
||||
lengthCm: 0,
|
||||
widthCm: value
|
||||
|
|
@ -788,7 +788,7 @@ export default function ComponentForm(props: Props) {
|
|||
// !isMeasurementTypeValid(interaction.settings.conditions[index].measurementType)
|
||||
// }
|
||||
disabled={!component.settings.calibrate}
|
||||
value={calibration.type ?? quack.MeasurementType.MEASUREMENT_TYPE_INVALID}
|
||||
value={calibration.measurementType ?? quack.MeasurementType.MEASUREMENT_TYPE_INVALID}
|
||||
onChange={event => updateCalibrationTypes(event, i)}
|
||||
autoFocus={false}
|
||||
margin="normal"
|
||||
|
|
@ -814,8 +814,8 @@ export default function ComponentForm(props: Props) {
|
|||
f.coefficients.push("0");
|
||||
f.offsets.push("0");
|
||||
f.component.settings.calibrations.push(
|
||||
pond.Calibration.create({
|
||||
type: quack.MeasurementType.MEASUREMENT_TYPE_INVALID,
|
||||
quack.Calibration.create({
|
||||
measurementType: quack.MeasurementType.MEASUREMENT_TYPE_INVALID,
|
||||
calibrationOffset: 0,
|
||||
calibrationCoefficient: 0
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue