Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix status messages #397

Open
wants to merge 4 commits into
base: edge
Choose a base branch
from
Open

Fix status messages #397

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e53ac4
Remove duplicate error placeholder for error 86
RadicalZephyr Jan 22, 2019
9e636d3
Remove old error message for placeholder error 37
RadicalZephyr Jan 22, 2019
040b83c
Add missing message for status code NO_DISPLAY
RadicalZephyr Jan 22, 2019
c7f5b96
Add missing message for status code MISSING_LINE_NUMBER_WITH_CHECKSUM
RadicalZephyr Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions g2core/error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -395,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";
Expand All @@ -416,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";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be removing a text string, replacing it with "37".

Doesn't seem correct?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the error message for code 37 since it appears to currently be marked as a placeholder.

TBH, I don't remember exactly why I believed it to be a placeholder, but I clearly thought about it at the time making it a separate commit and mentioning it in the PR message as well. If it's not correct however, then it shouldn't be included. Either way is fine with me.

static const char stat_38[] = "38";
static const char stat_39[] = "39";

Expand Down Expand Up @@ -503,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";
Expand Down