Skip to content

Commit 7953343

Browse files
filnetf5soh
filnet
authored and
f5soh
committed
Merged in filnet/librepilot/LP-558_accept_case_insensitive_uav_enum_values (pull request #476)
LP-558 accept case insensitive uav enum values Approved-by: Lalanne Laurent <f5soh@free.fr> Approved-by: Philippe Renon <philippe_renon@yahoo.fr> Approved-by: Paul Jewell <teulupaul@gmail.com> Approved-by: Alessio Morale <alessiomorale@gmail.com> Approved-by: Paul Jewell <paul@teulu.org>
2 parents 53bd0da + 5153764 commit 7953343

39 files changed

Lines changed: 541 additions & 532 deletions

File tree

‎ground/gcs/src/plugins/uavobjects/uavobjectfield.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,9 +1152,18 @@ void UAVObjectField::setValue(const QVariant & value, quint32 index)
11521152
case ENUM:
11531153
{
11541154
qint8 tmpenum = options.indexOf(value.toString());
1155+
// try case insensitive
1156+
if (tmpenum < 0) {
1157+
QRegExp regexp(value.toString(), Qt::CaseInsensitive);
1158+
tmpenum = options.indexOf(regexp);
1159+
if (tmpenum >= 0) {
1160+
qWarning() << "Enum value" << value.toString() << "should be" << options.at(tmpenum);
1161+
}
1162+
}
11551163
// Default to 0 on invalid values.
11561164
if (tmpenum < 0) {
11571165
tmpenum = 0;
1166+
qWarning() << "Enum value" << value.toString() << "not found";
11581167
}
11591168
memcpy(&data[offset + numBytesPerElement * index], &tmpenum, numBytesPerElement);
11601169
break;

‎ground/gcs/src/share/vehicletemplates/fixedwing/SoniModelMako-FixedWing-Elevon-7134e8ae5ce.optmpl‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
"values": [
237237
{
238238
"name": "0",
239-
"value": "FALSE"
239+
"value": "False"
240240
}
241241
]
242242
},
@@ -346,27 +346,27 @@
346346
"values": [
347347
{
348348
"name": "0",
349-
"value": "FALSE"
349+
"value": "False"
350350
},
351351
{
352352
"name": "1",
353-
"value": "FALSE"
353+
"value": "False"
354354
},
355355
{
356356
"name": "2",
357-
"value": "FALSE"
357+
"value": "False"
358358
},
359359
{
360360
"name": "3",
361-
"value": "FALSE"
361+
"value": "False"
362362
},
363363
{
364364
"name": "4",
365-
"value": "FALSE"
365+
"value": "False"
366366
},
367367
{
368368
"name": "5",
369-
"value": "FALSE"
369+
"value": "False"
370370
}
371371
]
372372
},
@@ -399,7 +399,7 @@
399399
"values": [
400400
{
401401
"name": "0",
402-
"value": "TRUE"
402+
"value": "True"
403403
}
404404
]
405405
},
@@ -711,7 +711,7 @@
711711
"values": [
712712
{
713713
"name": "0",
714-
"value": "TRUE"
714+
"value": "True"
715715
}
716716
]
717717
},
@@ -722,7 +722,7 @@
722722
"values": [
723723
{
724724
"name": "0",
725-
"value": "FALSE"
725+
"value": "False"
726726
}
727727
]
728728
},
@@ -1036,7 +1036,7 @@
10361036
"values": [
10371037
{
10381038
"name": "0",
1039-
"value": "TRUE"
1039+
"value": "True"
10401040
}
10411041
]
10421042
},
@@ -1047,7 +1047,7 @@
10471047
"values": [
10481048
{
10491049
"name": "0",
1050-
"value": "FALSE"
1050+
"value": "False"
10511051
}
10521052
]
10531053
},
@@ -1361,7 +1361,7 @@
13611361
"values": [
13621362
{
13631363
"name": "0",
1364-
"value": "TRUE"
1364+
"value": "True"
13651365
}
13661366
]
13671367
},
@@ -1372,7 +1372,7 @@
13721372
"values": [
13731373
{
13741374
"name": "0",
1375-
"value": "FALSE"
1375+
"value": "False"
13761376
}
13771377
]
13781378
},

‎ground/gcs/src/share/vehicletemplates/fixedwing/Toro900-VoilureFixe-Elevon-d4a58d2cd50.optmpl‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
"values": [
237237
{
238238
"name": "0",
239-
"value": "FALSE"
239+
"value": "False"
240240
}
241241
]
242242
},
@@ -346,27 +346,27 @@
346346
"values": [
347347
{
348348
"name": "0",
349-
"value": "FALSE"
349+
"value": "False"
350350
},
351351
{
352352
"name": "1",
353-
"value": "FALSE"
353+
"value": "False"
354354
},
355355
{
356356
"name": "2",
357-
"value": "FALSE"
357+
"value": "False"
358358
},
359359
{
360360
"name": "3",
361-
"value": "FALSE"
361+
"value": "False"
362362
},
363363
{
364364
"name": "4",
365-
"value": "FALSE"
365+
"value": "False"
366366
},
367367
{
368368
"name": "5",
369-
"value": "FALSE"
369+
"value": "False"
370370
}
371371
]
372372
},
@@ -399,7 +399,7 @@
399399
"values": [
400400
{
401401
"name": "0",
402-
"value": "TRUE"
402+
"value": "True"
403403
}
404404
]
405405
}
@@ -680,7 +680,7 @@
680680
"values": [
681681
{
682682
"name": "0",
683-
"value": "TRUE"
683+
"value": "True"
684684
}
685685
]
686686
},
@@ -691,7 +691,7 @@
691691
"values": [
692692
{
693693
"name": "0",
694-
"value": "FALSE"
694+
"value": "False"
695695
}
696696
]
697697
},
@@ -1005,7 +1005,7 @@
10051005
"values": [
10061006
{
10071007
"name": "0",
1008-
"value": "TRUE"
1008+
"value": "True"
10091009
}
10101010
]
10111011
},
@@ -1016,7 +1016,7 @@
10161016
"values": [
10171017
{
10181018
"name": "0",
1019-
"value": "FALSE"
1019+
"value": "False"
10201020
}
10211021
]
10221022
},
@@ -1330,7 +1330,7 @@
13301330
"values": [
13311331
{
13321332
"name": "0",
1333-
"value": "TRUE"
1333+
"value": "True"
13341334
}
13351335
]
13361336
},
@@ -1341,7 +1341,7 @@
13411341
"values": [
13421342
{
13431343
"name": "0",
1344-
"value": "FALSE"
1344+
"value": "False"
13451345
}
13461346
]
13471347
},

‎ground/gcs/src/share/vehicletemplates/multirotor/(RACE)FPV260HobbyKin-Multirotor-QuadrocopterX-0482b7a25f7.optmpl‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
"values": [
237237
{
238238
"name": "0",
239-
"value": "FALSE"
239+
"value": "False"
240240
}
241241
]
242242
},
@@ -346,27 +346,27 @@
346346
"values": [
347347
{
348348
"name": "0",
349-
"value": "FALSE"
349+
"value": "False"
350350
},
351351
{
352352
"name": "1",
353-
"value": "FALSE"
353+
"value": "False"
354354
},
355355
{
356356
"name": "2",
357-
"value": "FALSE"
357+
"value": "False"
358358
},
359359
{
360360
"name": "3",
361-
"value": "FALSE"
361+
"value": "False"
362362
},
363363
{
364364
"name": "4",
365-
"value": "FALSE"
365+
"value": "False"
366366
},
367367
{
368368
"name": "5",
369-
"value": "FALSE"
369+
"value": "False"
370370
}
371371
]
372372
},
@@ -399,7 +399,7 @@
399399
"values": [
400400
{
401401
"name": "0",
402-
"value": "TRUE"
402+
"value": "True"
403403
}
404404
]
405405
},
@@ -711,7 +711,7 @@
711711
"values": [
712712
{
713713
"name": "0",
714-
"value": "TRUE"
714+
"value": "True"
715715
}
716716
]
717717
},
@@ -722,7 +722,7 @@
722722
"values": [
723723
{
724724
"name": "0",
725-
"value": "TRUE"
725+
"value": "True"
726726
}
727727
]
728728
},
@@ -1036,7 +1036,7 @@
10361036
"values": [
10371037
{
10381038
"name": "0",
1039-
"value": "TRUE"
1039+
"value": "True"
10401040
}
10411041
]
10421042
},
@@ -1047,7 +1047,7 @@
10471047
"values": [
10481048
{
10491049
"name": "0",
1050-
"value": "TRUE"
1050+
"value": "True"
10511051
}
10521052
]
10531053
},
@@ -1361,7 +1361,7 @@
13611361
"values": [
13621362
{
13631363
"name": "0",
1364-
"value": "TRUE"
1364+
"value": "True"
13651365
}
13661366
]
13671367
},
@@ -1372,7 +1372,7 @@
13721372
"values": [
13731373
{
13741374
"name": "0",
1375-
"value": "TRUE"
1375+
"value": "True"
13761376
}
13771377
]
13781378
},

0 commit comments

Comments
 (0)