Skip to content

Commit 9860a5f

Browse files
committed
Invert tube direction
1 parent dce453e commit 9860a5f

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

ASCET-DEVELOPER/BalanceTube/hardware/HandDistanceSensor.bd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ blockdiagramSpecification Main {
9090
inPin
9191
}
9292
}
93-
literal Numeric "1.0" at (171, 203) size (49, 0) {
93+
literal Numeric "0.0" at (171, 203) size (49, 0) {
9494
label at (0, 4)
9595
outPin {
9696
connection_2
9797
}
9898
}
99-
literal Numeric "0.0" at (171, 223) size (49, 0) {
99+
literal Numeric "1.0" at (171, 223) size (49, 0) {
100100
label at (0, 4)
101101
outPin {
102102
connection_1
@@ -118,4 +118,4 @@ blockdiagramSpecification Main {
118118
inPin connection_10
119119
}
120120
}
121-
}
121+
}

ASCET-DEVELOPER/BalanceTube/hardware/HandDistanceSensor.esdl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ writes Signals.handPosition {
1313
characteristic real adcMax = 2000.0;
1414

1515
@thread
16-
@generated("blockdiagram", "931aadb8")
16+
@generated("blockdiagram", "54d31754")
1717
public void read() {
18-
Signals.handPosition = min(max(m.map(Signals.adcHandPosition, adcMin, adcMax, 1.0, 0.0), 0.0), 1.0); // Main/read 1
18+
Signals.handPosition = min(max(m.map(Signals.adcHandPosition, adcMin, adcMax, 0.0, 1.0), 0.0), 1.0); // Main/read 1
1919
}
20-
}
20+
}

ASCET-DEVELOPER/BalanceTube/tests/BalanceTubeTest.esdl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ reads Signals.handPosition {
1515
public void handPositionNormalization() {
1616
Signals.adcHandPosition = sensor.adcMin;
1717
sensor.read();
18-
assert.assertDoubleEqual(Signals.handPosition, 1.0);
18+
assert.assertDoubleEqual(Signals.handPosition, 0.0);
1919

2020
Signals.adcHandPosition = (sensor.adcMax + sensor.adcMin) / 2;
2121
sensor.read();
2222
assert.assertDoubleEqual(Signals.handPosition, 0.5);
2323

2424
Signals.adcHandPosition = sensor.adcMax;
2525
sensor.read();
26-
assert.assertDoubleEqual(Signals.handPosition, 0.0);
26+
assert.assertDoubleEqual(Signals.handPosition, 1.0);
2727
}
2828
}

STM32CubeIDE/GithubActions_ST/src-gen/src/hardware_HandDistanceSensor_Automatic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void hardware_HandDistanceSensor_Automatic_read (void)
111111
float32 _t1real32;
112112

113113
_t1real32
114-
= hardware_MappingUtil_Automatic_map(model_Signals_adcHandPosition__hardware_HandDistanceSensor_Automatic_read, adcMin_VAL, adcMax_VAL, 1.0F, 0.0F);
114+
= hardware_MappingUtil_Automatic_map(model_Signals_adcHandPosition__hardware_HandDistanceSensor_Automatic_read, adcMin_VAL, adcMax_VAL, 0.0F, 1.0F);
115115
model_Signals_handPosition__hardware_HandDistanceSensor_Automatic_read
116116
= ((_t1real32 >= 0.0F) ? (((_t1real32 <= 1.0F) ? _t1real32 : 1.0F)) : 0.0F);
117117
}

0 commit comments

Comments
 (0)