Skip to content

Commit e46c4c6

Browse files
committed
fix tof min/max methods
1 parent 32eef84 commit e46c4c6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

examples/firmware_01/firmware_01.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void loop(){
231231
break;
232232
case 3:
233233
if (tof.update_rois()){
234-
msg_size = packeter.packetC7I('f', tof.getLeft(), tof.getCenterLeft(), tof.getCenter(), tof.getCenterRight(), tof.getRight(), tof.get_min_range_top_mm(), tof.get_max_range_bottom_mm());
234+
msg_size = packeter.packetC7I('f', tof.getLeft(), tof.getCenterLeft(), tof.getCenter(), tof.getCenterRight(), tof.getRight(), tof.getTop(), tof.getBottom());
235235
alvik.serial->write(packeter.msg,msg_size);
236236
}
237237
break;

src/sensor_tof_matrix.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class SensorTofMatrix{
133133
bool update_rois() {
134134
bool out = update();
135135
top = get_avg_range_top_mm();
136-
bottom = get_max_range_bottom_mm();
136+
bottom = get_avg_range_bottom_mm();
137137
left = get_avg_range_left_mm();
138138
right = get_avg_range_right_mm();
139139
center_left = get_avg_range_center_left_mm();
@@ -168,7 +168,7 @@ class SensorTofMatrix{
168168

169169
int get_max_range_bottom_mm() {
170170

171-
int16_t bottom_max = results.distance_mm[0];
171+
int16_t bottom_max = results.distance_mm[4?12:48];
172172

173173
for (int i=(_size==4?12:48); i < (_size==4?15:63) ;i++) {
174174
bottom_max = max(bottom_max, results.distance_mm[i]);
@@ -206,7 +206,7 @@ class SensorTofMatrix{
206206

207207
int get_min_range_right_mm() {
208208

209-
int16_t _min = results.distance_mm[0];
209+
int16_t _min = results.distance_mm[4?3:6];
210210

211211
for (int i=(_size==4?3:6); i < (_size==4?16:64) ;i+=_size) {
212212
_min = min(_min, results.distance_mm[i]);
@@ -220,7 +220,7 @@ class SensorTofMatrix{
220220

221221
int get_min_range_center_left_mm() {
222222

223-
int16_t _min = results.distance_mm[0];
223+
int16_t _min = results.distance_mm[4?5:18];
224224

225225
for (int i=(_size==4?5:18); i < (_size==4?13:50) ;i+=_size) {
226226
_min = min(_min, results.distance_mm[i]);
@@ -234,7 +234,7 @@ class SensorTofMatrix{
234234

235235
int get_min_range_center_right_mm() {
236236

237-
int16_t _min = results.distance_mm[0];
237+
int16_t _min = results.distance_mm[4?6:20];
238238

239239
for (int i=(_size==4?6:20); i < (_size==4?14:52) ;i+=_size) {
240240
_min = min(_min, results.distance_mm[i]);
@@ -248,7 +248,7 @@ class SensorTofMatrix{
248248

249249
int get_min_range_center_mm() {
250250

251-
int16_t _min = results.distance_mm[0];
251+
int16_t _min = results.distance_mm[5?6:19];
252252

253253
for (int i=(_size==5?6:19); i < (_size==4?13:51) ;i+=_size) {
254254
_min = min(_min, results.distance_mm[i]);

0 commit comments

Comments
 (0)