Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for DeltaDore X3D #1911

Merged
merged 53 commits into from
Dec 12, 2024
Merged

Add support for DeltaDore X3D #1911

merged 53 commits into from
Dec 12, 2024

Conversation

mr-sven
Copy link
Contributor

@mr-sven mr-sven commented Dec 22, 2021

The Payload is not fully clear due the fact I have only thermostat's and switch actors.

@zuckschwerdt
Copy link
Collaborator

Looks really good at a quick glance, thanks! (and I did laugh at the length thing and "data from previous larger messages")

@zuckschwerdt zuckschwerdt force-pushed the master branch 2 times, most recently from 8e31ece to e42ad33 Compare December 26, 2021 11:10
@mr-sven
Copy link
Contributor Author

mr-sven commented Jan 19, 2022

At the moment I've no more additional info, I'm working on decoding the messages. I'll continue on this if I have more valid infos.

@mr-sven
Copy link
Contributor Author

mr-sven commented Jan 8, 2024

I now added most of the known protocol, for my point of view it's done and can be merged

@mr-sven
Copy link
Contributor Author

mr-sven commented Dec 11, 2024

Waiting for merge

@zuckschwerdt
Copy link
Collaborator

It seems some output keys are missing from output_fields, e.g. temperature_type, can you check that?
And the doc-comment should start (line 11) with /** @fn int deltadore_x3d_decode(r_device *decoder, bitbuffer_t *bitbuffer) to properly attach to the decoder function.
Otherwise good for merge.

@zuckschwerdt
Copy link
Collaborator

Thanks! I just noticed the // NOLINT (why?): there is a recent addition to the data output, you should be able to just use something like
data = data_hex(data, "raw_msg", "Raw Message", NULL, &frame[bytes_read], len - bytes_read - 2, raw_str);
(rename raw_data to raw_str and raw to raw_msg)

@mr-sven
Copy link
Contributor Author

mr-sven commented Dec 12, 2024

I don't know where that NOLINT came from, maybe c&p.

@zuckschwerdt zuckschwerdt merged commit 6a44e40 into merbanan:master Dec 12, 2024
9 checks passed
@zuckschwerdt zuckschwerdt removed the wip Work In Progress (for PRs only) label Dec 15, 2024
@zuckschwerdt
Copy link
Collaborator

I've refactored the CCITT data whitening to bit_util.c with 11d2c7a. Can you check it still works, and do we have any test samples?

@mr-sven
Copy link
Contributor Author

mr-sven commented Dec 15, 2024

Is working, added a valid sample: #3116

@zuckschwerdt
Copy link
Collaborator

Great, thanks!
I should have said: "sample files", i.e. a .cu8 capture for regression tests. But a code sample is useful too.
Using rtl_433 -y aaaaaaaa8169967ede78db58b8f7f836575bd3940e71ed2636425a2bb7b05cf1e79aeb45fd2d53 I get a CRC error though?

@mr-sven
Copy link
Contributor Author

mr-sven commented Dec 16, 2024

ah, yes, I removed CRC from that data because I also modified the device id, so this data was only for ccitt tests.
I've a capture file, ahm should I upload it here or put it in any folder?

@mr-sven
Copy link
Contributor Author

mr-sven commented Dec 16, 2024

Ah, I've seen the tests repo, I will make an pull request

@zuckschwerdt
Copy link
Collaborator

If you are concerned about real device ids leaking then hold off, it's a valid concern.

@mr-sven
Copy link
Contributor Author

mr-sven commented Dec 16, 2024

Here merbanan/rtl_433_tests#472 .

@zuckschwerdt
Copy link
Collaborator

Thanks! Is that a manual recording (e.g. -w filename.cu8) or an automatic sample capture (e.g.-S all)? It seems like an automatic capture but I've never seen an automatic sample that long, nearly a whole second and full 15 sample buffers long. Interesting!

@mr-sven
Copy link
Contributor Author

mr-sven commented Dec 17, 2024

I used rtl_433 -f 868.95M -R 269 -S known and triggered an register read. The protocol is very complex and there is still some guessed data left. If you are interested in you can take a look in my X3D controller repo https://github.com/mr-sven/x3d-rfm-esp32/blob/main/X3D-Protocol.md

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants