From d5cf63bf4571ddb7ee6a729f5ceb44a223f031aa Mon Sep 17 00:00:00 2001
From: Felipe Martins Diel <41558831+felipediel@users.noreply.github.com>
Date: Mon, 23 May 2022 02:35:28 -0300
Subject: [PATCH 1/5] Merge new product ids into master (#686)

* Add support for Broadlink RM4 mini (0x5216) (#671)

* Add support for Broadlink RM4 pro 0x520B (#673)

* Add support for SP4L-UK 0xA569 (#677)

* Fixing typo in rm4pro device definitions (#682)

* Add support for Bestcon RM4C pro (0x5218) (#683)

* Add support for Broadlink RM4 TV mate (0x5212) (#684)

* Add support for Broadlink RM4 mini (0x520C) (#685)
---
 broadlink/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/broadlink/__init__.py b/broadlink/__init__.py
index 7711f662..2f66c427 100644
--- a/broadlink/__init__.py
+++ b/broadlink/__init__.py
@@ -61,6 +61,7 @@
         0x7583: ("SP mini 3", "Broadlink"),
         0x7587: ("SP4L-UK", "Broadlink"),
         0x7D11: ("SP mini 3", "Broadlink"),
+        0xA569: ("SP4L-UK", "Broadlink"),
         0xA56A: ("MCB1", "Broadlink"),
         0xA56B: ("SCB1E", "Broadlink"),
         0xA56C: ("SP4L-EU", "Broadlink"),
@@ -113,6 +114,9 @@
     rm4mini: {
         0x51DA: ("RM4 mini", "Broadlink"),
         0x5209: ("RM4 TV mate", "Broadlink"),
+        0x520C: ("RM4 mini", "Broadlink"),
+        0x5212: ("RM4 TV mate", "Broadlink"),
+        0x5216: ("RM4 mini", "Broadlink"),
         0x6070: ("RM4C mini", "Broadlink"),
         0x610E: ("RM4 mini", "Broadlink"),
         0x610F: ("RM4C mini", "Broadlink"),
@@ -124,7 +128,9 @@
         0x653A: ("RM4 mini", "Broadlink"),
     },
     rm4pro: {
+        0x520B: ("RM4 pro", "Broadlink"),
         0x5213: ("RM4 pro", "Broadlink"),
+        0x5218: ("RM4C pro", "Broadlink"),
         0x6026: ("RM4 pro", "Broadlink"),
         0x6184: ("RM4C pro", "Broadlink"),
         0x61A2: ("RM4 pro", "Broadlink"),

From a86e9cbb9ce44c25485226d46541a1cdcff940b7 Mon Sep 17 00:00:00 2001
From: Felipe Martins Diel <41558831+felipediel@users.noreply.github.com>
Date: Mon, 23 May 2022 02:38:55 -0300
Subject: [PATCH 2/5] Bump version to 0.18.2 (#687)

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ac01c085..4ca34c42 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 from setuptools import setup, find_packages
 
 
-version = '0.18.1'
+version = '0.18.2'
 
 setup(
     name="broadlink",

From 47b324505007f580805f96690160c64051716e77 Mon Sep 17 00:00:00 2001
From: Felipe Martins Diel <41558831+felipediel@users.noreply.github.com>
Date: Sun, 20 Nov 2022 15:37:31 -0300
Subject: [PATCH 3/5] Fix Github actions (#727)

* Bump checkout to v3 and setup-python to v4

* Remove unused branches

* Fix ubuntu at v20.04
---
 .github/workflows/flake8.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
index cb396611..aa09a19c 100644
--- a/.github/workflows/flake8.yaml
+++ b/.github/workflows/flake8.yaml
@@ -2,20 +2,20 @@ name: Python flake8
 
 on:
   push:
-    branches: [ main, master, dev, development ]
+    branches: [ master, dev ]
   pull_request:
-    branches: [ main, master, dev, development ]
+    branches: [ master, dev ]
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

From 9d5339ab8e0495ca63ac40822ec72882f97348f5 Mon Sep 17 00:00:00 2001
From: Felipe Martins Diel <41558831+felipediel@users.noreply.github.com>
Date: Sun, 20 Nov 2022 15:44:34 -0300
Subject: [PATCH 4/5] Merge new product ids into master (#726)

* Add support for RM4C mini (0x520D) (#694)

* Add support for SP4L-US (0x648C) (#707)

* Add support for RM4C mate (0x5211) (#709)

* Add support for RM4 mini (0x521C) (#710)

* Add support for LB1 (0x644B) (#717)
---
 broadlink/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/broadlink/__init__.py b/broadlink/__init__.py
index 2f66c427..9a9a44cb 100644
--- a/broadlink/__init__.py
+++ b/broadlink/__init__.py
@@ -76,6 +76,7 @@
         0x618B: ("SP4L-EU", "Broadlink"),
         0x6489: ("SP4L-AU", "Broadlink"),
         0x648B: ("SP4M-US", "Broadlink"),
+        0x648C: ("SP4L-US", "Broadlink"),
         0x6494: ("SCB2", "Broadlink"),
     },
     rmmini: {
@@ -115,8 +116,11 @@
         0x51DA: ("RM4 mini", "Broadlink"),
         0x5209: ("RM4 TV mate", "Broadlink"),
         0x520C: ("RM4 mini", "Broadlink"),
+        0x520D: ("RM4C mini", "Broadlink"),
+        0x5211: ("RM4C mate", "Broadlink"),
         0x5212: ("RM4 TV mate", "Broadlink"),
         0x5216: ("RM4 mini", "Broadlink"),
+        0x521C: ("RM4 mini", "Broadlink"),
         0x6070: ("RM4C mini", "Broadlink"),
         0x610E: ("RM4 mini", "Broadlink"),
         0x610F: ("RM4C mini", "Broadlink"),
@@ -153,6 +157,7 @@
         0x60C7: ("LB1", "Broadlink"),
         0x60C8: ("LB1", "Broadlink"),
         0x6112: ("LB1", "Broadlink"),
+        0x644B: ("LB1", "Broadlink"),
         0x644C: ("LB27 R1", "Broadlink"),        
         0x644E: ("LB26 R1", "Broadlink"),
     },

From 3c183eaaef6cbaf9c1154b232116bc130cd2113f Mon Sep 17 00:00:00 2001
From: Felipe Martins Diel <41558831+felipediel@users.noreply.github.com>
Date: Sun, 20 Nov 2022 15:48:08 -0300
Subject: [PATCH 5/5] Bump version to 0.18.3 (#728)

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 4ca34c42..3373f870 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 from setuptools import setup, find_packages
 
 
-version = '0.18.2'
+version = '0.18.3'
 
 setup(
     name="broadlink",