From d5d27eed77456119e2bbfa13f39f5f97e5fc465d Mon Sep 17 00:00:00 2001
From: Michael Szafranek <faule.aepfel@gmail.com>
Date: Wed, 5 Apr 2023 15:42:48 +0200
Subject: [PATCH 1/7] librrf: updated library

---
 lib/librrf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librrf b/lib/librrf
index 37d99241..e2bc756b 160000
--- a/lib/librrf
+++ b/lib/librrf
@@ -1 +1 @@
-Subproject commit 37d99241357148caf499a9371d3ccf0a22a5a874
+Subproject commit e2bc756bc3bd4af6337e84c50042b057a627c60a

From 6ced129eecfcd852b2de710585661d036bd572cd Mon Sep 17 00:00:00 2001
From: Michael Szafranek <faule.aepfel@gmail.com>
Date: Wed, 19 Apr 2023 00:29:53 +0200
Subject: [PATCH 2/7] Version: bumped version

---
 src/Version.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.hpp b/src/Version.hpp
index 061434fc..54a38ae2 100644
--- a/src/Version.hpp
+++ b/src/Version.hpp
@@ -8,7 +8,7 @@
 #ifndef SRC_VERSION_HPP_
 #define SRC_VERSION_HPP_
 
-#define VERSION_MAIN		"3.4.1"
+#define VERSION_MAIN		"3.5.0-rc1"
 
 #ifdef SUPPORT_ENCODER
 #define VERSION_ENCODER	"+enc"

From 411d4bef83721af562cd9fa1e186a360cf68104c Mon Sep 17 00:00:00 2001
From: Michael Szafranek <faule.aepfel@gmail.com>
Date: Fri, 21 Apr 2023 12:43:33 +0200
Subject: [PATCH 3/7] Popup: show close button only in m291 S1 mode

---
 src/UI/Popup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UI/Popup.cpp b/src/UI/Popup.cpp
index 825fb347..ac355f03 100644
--- a/src/UI/Popup.cpp
+++ b/src/UI/Popup.cpp
@@ -42,7 +42,7 @@ void AlertPopup::Set(const char *title, const char *text, int32_t mode, uint32_t
 	text += splitPoint;
 	alertText3.copy(text);
 
-	closeButton->Show(mode == Alert::Mode::InfoConfirm);
+	closeButton->Show(mode == Alert::Mode::InfoClose);
 
 	okButton->Show(mode == Alert::Mode::ConfirmCancel ||
 		       mode == Alert::Mode::NumberInt ||

From 797ea0302661044a7ab458aeca525c704073bafb Mon Sep 17 00:00:00 2001
From: Michael Szafranek <faule.aepfel@gmail.com>
Date: Fri, 21 Apr 2023 12:48:25 +0200
Subject: [PATCH 4/7] tests: added test macros

---
 tests/test-m291-s0.g | 1 +
 tests/test-m291-s1.g | 1 +
 tests/test-m291-s2.g | 1 +
 tests/test-m291-s3.g | 1 +
 tests/test-m291-s4.g | 1 +
 tests/test-m291-s5.g | 1 +
 tests/test-m291-s6.g | 1 +
 tests/test-m291-s7.g | 1 +
 tests/test-m291.g    | 4 ++++
 9 files changed, 12 insertions(+)
 create mode 100644 tests/test-m291-s0.g
 create mode 100644 tests/test-m291-s1.g
 create mode 100644 tests/test-m291-s2.g
 create mode 100644 tests/test-m291-s3.g
 create mode 100644 tests/test-m291-s4.g
 create mode 100644 tests/test-m291-s5.g
 create mode 100644 tests/test-m291-s6.g
 create mode 100644 tests/test-m291-s7.g
 create mode 100644 tests/test-m291.g

diff --git a/tests/test-m291-s0.g b/tests/test-m291-s0.g
new file mode 100644
index 00000000..e683bedd
--- /dev/null
+++ b/tests/test-m291-s0.g
@@ -0,0 +1 @@
+M291 P"test message mode 0" R"test title" S0
diff --git a/tests/test-m291-s1.g b/tests/test-m291-s1.g
new file mode 100644
index 00000000..dc426855
--- /dev/null
+++ b/tests/test-m291-s1.g
@@ -0,0 +1 @@
+M291 P"test message mode 1" R"test title" S1
diff --git a/tests/test-m291-s2.g b/tests/test-m291-s2.g
new file mode 100644
index 00000000..fe46dc10
--- /dev/null
+++ b/tests/test-m291-s2.g
@@ -0,0 +1 @@
+M291 P"test message mode 2" R"test title" S2
diff --git a/tests/test-m291-s3.g b/tests/test-m291-s3.g
new file mode 100644
index 00000000..589c58a6
--- /dev/null
+++ b/tests/test-m291-s3.g
@@ -0,0 +1 @@
+M291 P"test message mode 3" R"test title" S3
diff --git a/tests/test-m291-s4.g b/tests/test-m291-s4.g
new file mode 100644
index 00000000..920cccdb
--- /dev/null
+++ b/tests/test-m291-s4.g
@@ -0,0 +1 @@
+M291 P"select a choice" R"test mode 4" S4 K{"choice1", "choice2", "choice3", "choice4", "choice5", "choice6", "choice7", "choice8", "choice9", "choice10" }
diff --git a/tests/test-m291-s5.g b/tests/test-m291-s5.g
new file mode 100644
index 00000000..2a5a9f3e
--- /dev/null
+++ b/tests/test-m291-s5.g
@@ -0,0 +1 @@
+M291 P"enter an integer number" R"test mode 5" S5 L10 H100 F50
diff --git a/tests/test-m291-s6.g b/tests/test-m291-s6.g
new file mode 100644
index 00000000..e564aacf
--- /dev/null
+++ b/tests/test-m291-s6.g
@@ -0,0 +1 @@
+M291 P"enter a float number" R"test mode 6" S6 L0.1 H1.0 F0.5
diff --git a/tests/test-m291-s7.g b/tests/test-m291-s7.g
new file mode 100644
index 00000000..0686850c
--- /dev/null
+++ b/tests/test-m291-s7.g
@@ -0,0 +1 @@
+M291 P"enter a text" R"test mode 7" S7 L2 H20 F"abc"
diff --git a/tests/test-m291.g b/tests/test-m291.g
new file mode 100644
index 00000000..64d2384c
--- /dev/null
+++ b/tests/test-m291.g
@@ -0,0 +1,4 @@
+M291 P"test message mode 0" R"test title" S0
+M291 P"test message mode 1" R"test title" S1
+M291 P"test message mode 2" R"test title" S2
+M291 P"test message mode 3" R"test title" S3

From 2c77cbf8b183afaa173eb2eef8a64cc2fd616fc0 Mon Sep 17 00:00:00 2001
From: Michael Szafranek <faule.aepfel@gmail.com>
Date: Fri, 21 Apr 2023 13:13:57 +0200
Subject: [PATCH 5/7] tests: improved titles of m291 tests

---
 tests/test-m291-s0.g | 2 +-
 tests/test-m291-s1.g | 2 +-
 tests/test-m291-s2.g | 2 +-
 tests/test-m291-s3.g | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test-m291-s0.g b/tests/test-m291-s0.g
index e683bedd..b0347edb 100644
--- a/tests/test-m291-s0.g
+++ b/tests/test-m291-s0.g
@@ -1 +1 @@
-M291 P"test message mode 0" R"test title" S0
+M291 P"test message mode 0" R"test mode S0" S0
diff --git a/tests/test-m291-s1.g b/tests/test-m291-s1.g
index dc426855..cd07b6cc 100644
--- a/tests/test-m291-s1.g
+++ b/tests/test-m291-s1.g
@@ -1 +1 @@
-M291 P"test message mode 1" R"test title" S1
+M291 P"test message mode 1" R"test mode S1" S1
diff --git a/tests/test-m291-s2.g b/tests/test-m291-s2.g
index fe46dc10..79aa090c 100644
--- a/tests/test-m291-s2.g
+++ b/tests/test-m291-s2.g
@@ -1 +1 @@
-M291 P"test message mode 2" R"test title" S2
+M291 P"test message mode 2" R"test mode S2" S2
diff --git a/tests/test-m291-s3.g b/tests/test-m291-s3.g
index 589c58a6..477a08a3 100644
--- a/tests/test-m291-s3.g
+++ b/tests/test-m291-s3.g
@@ -1 +1 @@
-M291 P"test message mode 3" R"test title" S3
+M291 P"test message mode 3" R"test mode S3" S3

From 9e884d69fc3a68c0699ee8305d585eb773fc9c4a Mon Sep 17 00:00:00 2001
From: Michael Szafranek <faule.aepfel@gmail.com>
Date: Fri, 21 Apr 2023 16:21:29 +0200
Subject: [PATCH 6/7] PanelDue: fixed initial displaying of messages

---
 src/PanelDue.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/PanelDue.cpp b/src/PanelDue.cpp
index 21bca254..faf5af82 100755
--- a/src/PanelDue.cpp
+++ b/src/PanelDue.cpp
@@ -1050,6 +1050,17 @@ static void EndReceivedMessage()
 	}
 	FileManager::EndReceivedMessage();
 
+	// alert event handling
+	if (currentAlert.flags.IsBitSet(Alert::GotMode) && currentAlert.mode == Alert::Mode::None)
+	{
+		UI::ClearAlert();
+	}
+	else if (currentAlert.mode != Alert::Mode::None && currentAlert.seq != lastAlertSeq)
+	{
+		UI::ProcessAlert(currentAlert);
+		lastAlertSeq = currentAlert.seq;
+	}
+
 	if (thumbnailContext.parseErr != 0 || thumbnailContext.err != 0)
 	{
 		dbg("thumbnail parseErr %d err %d.\n",
@@ -2562,17 +2573,6 @@ int main(void)
 			}
 		}
 
-		// alert event handling
-		if (currentAlert.flags.IsBitSet(Alert::GotMode) && currentAlert.mode == Alert::Mode::None)
-		{
-			UI::ClearAlert();
-		}
-		else if (currentAlert.mode > Alert::Mode::None && currentAlert.seq != lastAlertSeq)
-		{
-			UI::ProcessAlert(currentAlert);
-			lastAlertSeq = currentAlert.seq;
-		}
-
 		// refresh the display
 		UpdateDebugInfo();
 		mgr.Refresh(false);

From 93cc7801c2b84374c41d1d55d9171bbc3c6c2d1e Mon Sep 17 00:00:00 2001
From: Michael Szafranek <faule.aepfel@gmail.com>
Date: Fri, 21 Apr 2023 16:36:06 +0200
Subject: [PATCH 7/7] Popup: fixed displaying of ok button for mode InfoConfirm

---
 src/UI/Popup.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/UI/Popup.cpp b/src/UI/Popup.cpp
index ac355f03..54db51bb 100644
--- a/src/UI/Popup.cpp
+++ b/src/UI/Popup.cpp
@@ -44,7 +44,8 @@ void AlertPopup::Set(const char *title, const char *text, int32_t mode, uint32_t
 
 	closeButton->Show(mode == Alert::Mode::InfoClose);
 
-	okButton->Show(mode == Alert::Mode::ConfirmCancel ||
+	okButton->Show(mode == Alert::Mode::InfoConfirm ||
+		       mode == Alert::Mode::ConfirmCancel ||
 		       mode == Alert::Mode::NumberInt ||
 		       mode == Alert::Mode::NumberFloat ||
 		       mode == Alert::Mode::Text);