Update CGDK2_json.h

[delboy711]

Correct 'name' for PVVX firmware

Description:

Alternative PVVX firmware for CDGK2 assigns a name for the device in the format CGD_XXXXXX as in this example message.
{"servicedatauuid": "181a", "servicedata": "fab582342d583e080c14840b5dc00e", "name": "CGD_82B5FA", "id": "58:2D:34:82:B5:FA", "rssi": -38}

The file CGDK2_json.h is searching for a name containing the text "CDGK" so decoding fails.
Searching for a shorter string of "CDG" fixes the issue.
I have tested this patch with PVVX firmware rev48.

Checklist:

• The pull request is done against the latest development branch
• Only one feature/fix was added per PR and the code change compiles without warnings
• I accept the DCO.

[DigiH]

Thanks @delboy711

This seems to be either a new PVVX firmware version or the firmware denoting a different hardware revision of the CGDK2, as previous/different version had/have the CGDK2_DDEEFF naming.

Could you add an additional test case with your above undecoded data, so that this is ducumented for future regression testing, possibly below the current existing one

Test case
https://github.com/theengs/decoder/blob/development/tests/BLE/test_ble.cpp#L1012

Decoder ID
https://github.com/theengs/decoder/blob/development/tests/BLE/test_ble.cpp#L1106

Expected result
https://github.com/theengs/decoder/blob/development/tests/BLE/test_ble.cpp#L260

[delboy711]

Patch for test_ble.cpp is at delboy711@1ae3f3a

Hope its OK.

[DigiH]

Hope its OK.

Thanks, the Decoder ID needs to be the same as the one above, i.e.

TheengsDecoder::BLE_ID_NUM::CGDK2_PVVX,

as this is how the whole decoder has its ID defined, regardless of the model condition change.

And also the model_id will remain

… \"model_id\":\"CGDK2_PVVX\" …

in the expected result.

With these changes merged into this PR the checks should all run fine.

[DigiH]

@delboy711

Don't you want to merge your above linked patch with the test case with my suggested changes into this PR? Then we could merge it.

[delboy711]

Sorry for the delay. I had to learn how PRs work in Gitgub. Hopefully all OK now.

[DigiH]

Looking all fine.

Thanks again.