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

Basic funkbus support #1102

Merged
merged 26 commits into from
May 31, 2022
Merged

Basic funkbus support #1102

merged 26 commits into from
May 31, 2022

Conversation

sidey79
Copy link
Contributor

@sidey79 sidey79 commented May 18, 2022

  • Please check if the PR fulfills these requirements
  • Tests for the changes have been added / modified (needed for for bug fixes / features)
    Funkbus testdata SIGNALduino_TOOL#69
  • commandref has been added / updated (needed for bug fixes / features)
  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
  • Bugfix (please link issue)
  • Feature enhancement
  • Documentation update
  • Unittest enhancement
  • other
  • What is the current behavior?

Funkbus protocol can't be demodulated

  • What is the new behavior (if this is a feature change)?

Funkbus protocol shoud be demodulated
Generic sub for demodulation manchester to differential manchester added

  • Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

  • Other information:

Data is from forked firmware, and may not be correct.

@codecov
Copy link

codecov bot commented May 18, 2022

Codecov Report

Merging #1102 (0abe448) into master (ad11014) will increase coverage by 0.85%.
The diff coverage is 85.57%.

@@            Coverage Diff             @@
##           master    #1102      +/-   ##
==========================================
+ Coverage   63.93%   64.79%   +0.85%     
==========================================
  Files         130      133       +3     
  Lines        9528     9637     +109     
  Branches     1515     1528      +13     
==========================================
+ Hits         6092     6244     +152     
+ Misses       2260     2204      -56     
- Partials     1176     1189      +13     
Flag Coverage Δ
fhem 56.68% <71.15%> (+0.83%) ⬆️
modules 64.79% <85.57%> (+0.85%) ⬆️
perl 90.17% <85.57%> (-0.12%) ⬇️
unittests 64.79% <85.57%> (+0.85%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
FHEM/lib/SD_ProtocolData.pm 100.00% <ø> (ø)
t/FHEM/00_SIGNALduino/08_DeviceData_rmsg.t 81.48% <ø> (ø)
FHEM/lib/SD_Protocols.pm 79.00% <71.15%> (-0.45%) ⬇️
t/SD_Protocols/02_mc2dmc.t 100.00% <100.00%> (ø)
t/SD_Protocols/02_mcBit2Funkbus.t 100.00% <100.00%> (ø)
FHEM/10_SD_Rojaflex.pm 68.69% <0.00%> (-2.85%) ⬇️
t/FHEM/14_SD_WS07/09_parseDatat.t
t/FHEM/10_SD_GT/00_load.t 100.00% <0.00%> (ø)
t/FHEM/14_FLAMINGO/09_parseDatat.t 80.00% <0.00%> (ø)
FHEM/00_SIGNALduino.pm 65.27% <0.00%> (+1.53%) ⬆️
... and 1 more

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@sidey79 sidey79 marked this pull request as ready for review May 24, 2022 20:09
sidey79 and others added 5 commits May 27, 2022 14:34
FHEM/lib/SD_ProtocolData.pm Outdated Show resolved Hide resolved
FHEM/lib/SD_ProtocolData.pm Outdated Show resolved Hide resolved
@elektron-bbs
Copy link
Contributor

Muss das Modul nicht auch noch in der 00_SIGNALduino.pm in $clientsSIGNALduino und %matchListSIGNALduino eingetragen werden?
Nachdem ich das getan habe und das Modul von Ralf9 aus dem Forum installiert habe, tut sich dann auch etwas:

2022.05.27 17:19:57 4: sduino_dummy IFB_Parse: typ=43 id=FAE8 fbState=C_1100 data=0000000000001000 channel=1 group=A act=D long=0
2022.05.27 17:19:57 2: sduino_dummy: IFB_Parse UNDEFINED sensor IFB43 detected, code IFB43_FAE8_A_1

Gibt es das Modul eigentlich auch irgendwo offiziell?

@sidey79
Copy link
Contributor Author

sidey79 commented May 27, 2022

Hi @elektron-bbs

Ich habe das Modul nicht hinterlegt, da ich zunächst nur die Demodulation übernehmen wollte

Senden ist wohl auch noch interessant aber da war ich noch nicht.

@sidey79
Copy link
Contributor Author

sidey79 commented May 30, 2022

@elektron-bbs

so, habe Angepasst.
Sollen wir mal mergen und anschließend nach Testkandidaten ausschau halten? Die Signaldaten sind ja von einer fork firmware und daher nicht unbedingt exakt repräsentativ.

@elektron-bbs elektron-bbs requested review from elektron-bbs and removed request for elektron-bbs May 31, 2022 14:41
@sidey79 sidey79 merged commit 6bb37f9 into master May 31, 2022
@sidey79 sidey79 deleted the funkbus branch May 31, 2022 15:12
HomeAutoUser added a commit that referenced this pull request Jun 8, 2022
commit 4806d2e
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Jun 7 22:21:10 2022 +0200

    Bump fhem/fhem-controls-actions from 2.0.3 to 2.1.0 (#1105)

    Bumps [fhem/fhem-controls-actions](https://github.com/fhem/fhem-controls-actions) from 2.0.3 to 2.1.0.
    - [Release notes](https://github.com/fhem/fhem-controls-actions/releases)
    - [Commits](fhem/fhem-controls-actions@v2.0.3...v2.1.0)

    ---
    updated-dependencies:
    - dependency-name: fhem/fhem-controls-actions
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 6bb37f9
Author: sidey79 <7968127+sidey79@users.noreply.github.com>
Date:   Tue May 31 17:12:21 2022 +0200

    Basic funkbus support (#1102)

    * SD_ProtocolData.pm

    added funkbus protocol 119 from forum
    https://forum.fhem.de/index.php/topic,19065.msg1217972.html#msg1217972

    * SD_Protocols.pm
    - sub mcBit2Funkbus added
    - sub mc2dmc added
    - Tests added
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants