diff --git a/Logical/mappLogbook/LogTypes.typ b/Logical/mappLogbook/LogTypes.typ
index 0bd8169..61407f9 100644
--- a/Logical/mappLogbook/LogTypes.typ
+++ b/Logical/mappLogbook/LogTypes.typ
@@ -11,6 +11,7 @@ TYPE
enumDetails3,
enumDetails4,
enumFilter,
+ enumPrep,
enumError
);
enumSeverity :
diff --git a/Logical/mappLogbook/Logbook/Main.st b/Logical/mappLogbook/Logbook/Main.st
index 820a670..3fb2b68 100644
--- a/Logical/mappLogbook/Logbook/Main.st
+++ b/Logical/mappLogbook/Logbook/Main.st
@@ -16,7 +16,9 @@ END_PROGRAM
PROGRAM _CYCLIC
// Abort current update run
IF EDGENEG(gLogbook.CMD.Refresh) THEN
- state := enumWait;
+ IF state <> enumError THEN
+ state := enumWait;
+ END_IF
END_IF
// Run task multiple times to speed up process
FOR executions:=1 TO LOGBOOK_EXECUTIONS DO
@@ -120,11 +122,18 @@ PROGRAM _CYCLIC
IF ArEventLogGetPreviousRecordID_0.Done AND ArEventLogGetPreviousRecordID_0.StatusID = ERR_OK THEN
Facility.RecordID[Facility.CntFacility] := ArEventLogGetPreviousRecordID_0.PrevRecordID;
state := enumDetails1;
- // Error
+ // Error
ELSIF ArEventLogGetPreviousRecordID_0.Error THEN
- gLogbook.ERR.State := state;
- gLogbook.Status := ArEventLogGetPreviousRecordID_0.StatusID;
- state := enumError;
+ // Last entry reached is no error
+ IF ArEventLogGetPreviousRecordID_0.StatusID = arEVENTLOG_ERR_RECORDID_INVALID THEN
+ Facility.RecordID[Facility.CntFacility] := 1;
+ state := enumPrep;
+ // Everything else is an error
+ ELSE
+ gLogbook.ERR.State := state;
+ gLogbook.Status := ArEventLogGetPreviousRecordID_0.StatusID;
+ state := enumError;
+ END_IF
END_IF
// --------------------------------------------------------------------------------------------------------------------
// Read event id and time stamp
@@ -331,7 +340,12 @@ PROGRAM _CYCLIC
ArEventLogReadErrorNumber_0(Execute := FALSE);
ArEventLogReadDescription_0(Execute := FALSE);
ArEventLogReadAddData_0(Execute := FALSE);
+ state := enumPrep;
+ // --------------------------------------------------------------------------------------------------------------------
+ // Perpare for next entry
+ // --------------------------------------------------------------------------------------------------------------------
+ enumPrep:
// Find next facility from here to the end
REPEAT
Facility.CntFacility := Facility.CntFacility + 1;
diff --git a/Logical/mappLogbook/changelog.txt b/Logical/mappLogbook/changelog.txt
index bd423fb..0106444 100644
--- a/Logical/mappLogbook/changelog.txt
+++ b/Logical/mappLogbook/changelog.txt
@@ -1,7 +1,10 @@
-Next Version
+Version 0.2
- Fixed special characters not showing up correct
+- Fixed filter checkboxes dont remember state
+- Fixed last entry is not always record ID 1
- Option to stop searching when entry limit is reached
- Option to abort current update run
+- Smaller bug fixes
Version 0.1
- First public release
\ No newline at end of file
diff --git a/Logical/mappView/Visualization/Pages/LogbookPage/Content.content b/Logical/mappView/Visualization/Pages/LogbookPage/Content.content
index 09a542b..b39d988 100644
--- a/Logical/mappView/Visualization/Pages/LogbookPage/Content.content
+++ b/Logical/mappView/Visualization/Pages/LogbookPage/Content.content
@@ -12,7 +12,7 @@
-
+
diff --git a/Physical/PC/X20CP1583/mappView/Logbook.binding b/Physical/PC/X20CP1583/mappView/Logbook.binding
index 813693f..d127e8c 100644
--- a/Physical/PC/X20CP1583/mappView/Logbook.binding
+++ b/Physical/PC/X20CP1583/mappView/Logbook.binding
@@ -137,81 +137,81 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+