Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into master_backup
Browse files Browse the repository at this point in the history
  • Loading branch information
HomeAutoUser committed Oct 14, 2024
2 parents 7e1a2a8 + 8bdecbc commit 454348d
Show file tree
Hide file tree
Showing 16 changed files with 669 additions and 169 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/perlCritic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
- uses: shogo82148/actions-setup-perl@v1.29.0
- uses: shogo82148/actions-setup-perl@v1.31.3
with:
perl-version: 5.32
install-modules-with: cpanm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Perl ${{ matrix.perl }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: shogo82148/actions-setup-perl@v1.29.0
- uses: shogo82148/actions-setup-perl@v1.31.3
with:
perl-version: ${{ matrix.perl }}
install-modules-with: cpanm
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Create clover report for perl Modules
run: cover -report clover

- uses: codecov/codecov-action@v4.3.0
- uses: codecov/codecov-action@v4.6.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: clover.xml
Expand All @@ -57,7 +57,7 @@ jobs:
working-directory: /opt/fhem/
run: cover -report clover

- uses: codecov/codecov-action@v4.3.0
- uses: codecov/codecov-action@v4.6.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: clover.xml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- id: file_changes
uses: tj-actions/changed-files@v42
uses: tj-actions/changed-files@v45
with:
json: true
quotepath: false
Expand Down Expand Up @@ -110,13 +110,13 @@ jobs:
separator: ' '
- name: Update SDUINO_VERSION date
if: endsWith(matrix.file, '00_SIGNALduino.pm')
uses: jacobtomlinson/[email protected].2
uses: jacobtomlinson/[email protected].4
with:
find: \w+\s+=>\s\'\d.\d.\d\+\d+\'
replace: "SDUINO_VERSION => '${{ steps.versions.outputs._1 }}+${{ needs.metadata.outputs.date }}'"
include: "${{ matrix.files }}"
- name: Update Date in ID line
uses: jacobtomlinson/[email protected].2
uses: jacobtomlinson/[email protected].4
with:
find: \d\d\d\d-\d\d-\d\d\s\d\d:\d\d:\d\dZ\s[\w|-]+\s
replace: "${{ needs.metadata.outputs.datetime }}Z ${{ github.event.pull_request.user.login }} "
Expand Down
40 changes: 40 additions & 0 deletions CHANGED
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
2024-09-10 - Merge pull request #1266 from RFD-FHEM/sidey79/issue1264

Attribute Clients is used if it is set
2024-09-08 - SD_WS_48 TFA JOKER Temperature transmitter 30.3212 (#1271)

* SD_WS_48 TFA JOKER
Decoding realized.
* Update testData.json
add testdata for temperature transmitter TFA 30.3212
2024-09-08 - Bugfix remote control CREATE 6601L (new identity) (#1269)

* Bugfix CREATE_6601L
Ident does not consist of 4 nibbles, but 5.
* Update 14_SD_UT.pm

2024-08-04 - new remote control CREATE 6601L (#1263)

* new remote control CREATE 6601L
* Update 14_SD_UT.pm
* Update 00_SIGNALduino.pm
* Update README.md
* Update testData.json
add data for Remote control CREATE 6601L
* add test data for set command Remote control CREATE 6601L
* Update 03_set.t
* Update fhem.cfg

2024-07-25 - new remote control RCnoName20_09 (#1261)

* new RC RCnoName20_09
remote control RCnoName20_09 with 9 buttons for ceiling fan, see https://forum.fhem.de/index.php?topic=138538.0
* Update SD_ProtocolData.pm
* Update testData.json
add data for RCnoName20_09
* Update 14_SD_UT.pm

2024-06-20 - Bugfix Bresser lightning count (#1260)

* Bugfix Bresser lightning count
Lightning counter overflowed at 999, now at 1599.
2024-04-25 - WMBUS extension to dispatch messages (#1252)

* WMBUS proposal - extension to dispatch messages
Expand Down
12 changes: 8 additions & 4 deletions FHEM/00_SIGNALduino.pm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $Id: 00_SIGNALduino.pm 3.5.6 2024-04-24 06:21:19Z HomeAutoUser $
# $Id: 00_SIGNALduino.pm 3.5.6 2024-08-28 14:15:02Z sidey79 $
# v3.5.6 - https://github.com/RFD-FHEM/RFFHEM/tree/master
# The module is inspired by the FHEMduino project and modified in serval ways for processing the incoming messages
# see http://www.fhemwiki.de/wiki/SIGNALDuino
Expand Down Expand Up @@ -255,7 +255,7 @@ my %matchListSIGNALduino = (
'14:Dooya' => '^P16#[A-Fa-f0-9]+',
'15:SOMFY' => '^Ys[0-9A-F]+',
'16:SD_WS_Maverick' => '^P47#[A-Fa-f0-9]+',
'17:SD_UT' => '^P(?:14|20|24|26|29|30|34|46|56|68|69|76|78|81|83|86|90|91|91.1|92|93|95|97|99|104|105|114|118|121|127|128|130|132)#.*', # universal - more devices with different protocols
'17:SD_UT' => '^P(?:14|20|20.1|24|26|29|30|34|46|56|68|69|76|78|81|83|86|90|91|91.1|92|93|95|97|99|104|105|114|118|121|127|128|130|132)#.*', # universal - more devices with different protocols
'18:FLAMINGO' => '^P13\.?1?#[A-Fa-f0-9]+', # Flamingo Smoke
'19:CUL_WS' => '^K[A-Fa-f0-9]{5,}',
'20:Revolt' => '^r[A-Fa-f0-9]{22}',
Expand Down Expand Up @@ -3116,7 +3116,10 @@ sub SIGNALduino_Attr {
## Change Clients
if( $aName eq 'Clients' ) {
$hash->{Clients} = $aVal;
$hash->{Clients} = $clientsSIGNALduino if( !$hash->{Clients}) ; ## Set defaults
return if ($hash->{Clients});

## Set defaults
$hash->{Clients} = $clientsSIGNALduino;
return 'Setting defaults';
}
## Change MatchList
Expand Down Expand Up @@ -3407,7 +3410,8 @@ sub SIGNALduino_IdList {
#my $w = join ', ' => map "$_" => keys %BlacklistIDs;
#SIGNALduino_Log3 $name, 3, "$name IdList, Attr blacklist $w";
}
$hash->{Clients} = $clientsSIGNALduino; # Set Default in clientlist if whitelist is not active

$hash->{Clients} = AttrVal($name,'Clients', $clientsSIGNALduino); # use Attribute Clients or default if whitelist is not active
} else {
$hash->{Clients} = q[] # clear Clients if whitelist is active
}
Expand Down
Loading

0 comments on commit 454348d

Please sign in to comment.