From 5e53ac475beaa2096ac65983c888844e06dca7a0 Mon Sep 17 00:00:00 2001 From: Geoff Shannon Date: Mon, 21 Jan 2019 22:23:26 -0800 Subject: [PATCH 1/4] Remove duplicate error placeholder for error 86 --- g2core/error.h | 1 - 1 file changed, 1 deletion(-) diff --git a/g2core/error.h b/g2core/error.h index 3b54c9fff..84e77afd3 100644 --- a/g2core/error.h +++ b/g2core/error.h @@ -160,7 +160,6 @@ char *get_status_message(stat_t status); #define STAT_ERROR_83 83 #define STAT_ERROR_84 84 #define STAT_ERROR_85 85 -#define STAT_ERROR_86 86 // Assertion failures - build down from 99 until they meet the system internal errors From 9e636d3daaa30d020d4b5495e0972ea7eecec8bb Mon Sep 17 00:00:00 2001 From: Geoff Shannon Date: Mon, 21 Jan 2019 22:23:49 -0800 Subject: [PATCH 2/4] Remove old error message for placeholder error 37 --- g2core/error.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g2core/error.h b/g2core/error.h index 84e77afd3..154143ee3 100644 --- a/g2core/error.h +++ b/g2core/error.h @@ -415,7 +415,7 @@ static const char stat_34[] = "Persistence error"; static const char stat_35[] = "Bad status report setting"; static const char stat_36[] = "Failed to get planner buffer"; -static const char stat_37[] = "Backplan hit running buffer"; +static const char stat_37[] = "37"; static const char stat_38[] = "38"; static const char stat_39[] = "39"; From 040b83cb4b88e7e0344786cf92cfd0291b59da3b Mon Sep 17 00:00:00 2001 From: Geoff Shannon Date: Mon, 21 Jan 2019 22:24:19 -0800 Subject: [PATCH 3/4] Add missing message for status code NO_DISPLAY --- g2core/error.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g2core/error.h b/g2core/error.h index 154143ee3..b458ba921 100644 --- a/g2core/error.h +++ b/g2core/error.h @@ -394,7 +394,7 @@ static const char stat_15[] = "Initializing"; static const char stat_16[] = "Entering boot loader"; static const char stat_17[] = "Function is stubbed"; static const char stat_18[] = "System alarm"; -static const char stat_19[] = "19"; +static const char stat_19[] = "No Display"; static const char stat_20[] = "Internal error"; static const char stat_21[] = "Internal range error"; From c7f5b96e9e4942a5e8562e7273fd1b9622fe2b33 Mon Sep 17 00:00:00 2001 From: Geoff Shannon Date: Mon, 21 Jan 2019 22:24:46 -0800 Subject: [PATCH 4/4] Add missing message for status code MISSING_LINE_NUMBER_WITH_CHECKSUM --- g2core/error.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/g2core/error.h b/g2core/error.h index b458ba921..49b6fa1fc 100644 --- a/g2core/error.h +++ b/g2core/error.h @@ -502,8 +502,8 @@ static const char stat_116[] = "JSON value does not agree with variable type"; static const char stat_117[] = "Input from a muted channel was ignored"; static const char stat_118[] = "The provided checksum didn't match"; static const char stat_119[] = "The provided line number was out of sequence"; +static const char stat_120[] = "Missing line number when given checksum"; -static const char stat_120[] = "120"; static const char stat_121[] = "121"; static const char stat_122[] = "122"; static const char stat_123[] = "123";