Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
akkoyun committed Jan 24, 2024
1 parent c890d49 commit 7473fd0
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 10 deletions.
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Console",
"version": "1.6.11",
"version": "1.6.12",
"keywords": "Console, Serial, VT100, UART, Color, Terminal",
"description": "Virtual terminal sequences are control character sequences that can control cursor movement, color/font mode, and other operations when written to the output stream. Sequences may also be received on the input stream in response to an output stream query information sequence or as an encoding of user input when the appropriate mode is set. Arduino based VT100 comparable serial console library.",
"authors":
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Console
version=1.6.11
version=1.6.12
author=Gunce Akkoyun <[email protected]>
maintainer=Gunce Akkoyun <[email protected]>
sentence=Arduino based VT100 comparable serial console library.
Expand Down
86 changes: 78 additions & 8 deletions src/Console.h
Original file line number Diff line number Diff line change
Expand Up @@ -578,8 +578,8 @@
Console::Box(_X1, _Y1, _X2, _Y2, "GSM Detail", 4, false, false);

// Print Text
Console::Text(_X1 + 1, _Y1 + 2, _Console_WHITE_, F("Manufacturer")); Console::Dot(_X1 + 1, _Y1 + 14, (_Y2 - 4) - (_Y1 + 14)); Console::Bracket(_X1 + 1, _Y2 - 4, 2);
Console::Text(_X1 + 2, _Y1 + 2, _Console_WHITE_, F("Model")); Console::Dot(_X1 + 2, _Y1 + 7, (_Y2 - 4) - (_Y1 + 7)); Console::Bracket(_X1 + 2, _Y2 - 4, 2);
Console::Text(_X1 + 1, _Y1 + 2, _Console_WHITE_, F("Manufacturer")); Console::Dot(_X1 + 1, _Y1 + 14, (_Y2 - 5) - (_Y1 + 14)); Console::Bracket(_X1 + 1, _Y2 - 5, 3);
Console::Text(_X1 + 2, _Y1 + 2, _Console_WHITE_, F("Model")); Console::Dot(_X1 + 2, _Y1 + 7, (_Y2 - 5) - (_Y1 + 7)); Console::Bracket(_X1 + 2, _Y2 - 5, 3);
Console::Text(_X1 + 3, _Y1 + 2, _Console_WHITE_, F("Firmware")); Console::Dot(_X1 + 3, _Y1 + 10, (_Y2 - 12) - (_Y1 + 10)); Console::Bracket(_X1 + 3, _Y2 - 12, 10);
Console::Text(_X1 + 4, _Y1 + 2, _Console_WHITE_, F("IMEI")); Console::Dot(_X1 + 4, _Y1 + 6, (_Y2 - 18) - (_Y1 + 6)); Console::Bracket(_X1 + 4, _Y2 - 18, 16);
Console::Text(_X1 + 5, _Y1 + 2, _Console_WHITE_, F("Serial ID")); Console::Dot(_X1 + 5, _Y1 + 11, (_Y2 - 13) - (_Y1 + 11)); Console::Bracket(_X1 + 5, _Y2 - 13, 11);
Expand All @@ -599,12 +599,12 @@
Console::Box(_X1, _Y1, _X2, _Y2, "GSM Connection", 5, false, false);

// Print Text
Console::Text(_X1 + 1, _Y1 + 2, _Console_WHITE_, F("GSM Connection Time")); Console::Dot(_X1 + 1, _Y1 + 21, (_Y2 - 7) - (_Y1 + 21)); Console::Bracket(_X1 + 1, _Y2 - 7, 5);
Console::Text(_X1 + 2, _Y1 + 2, _Console_WHITE_, F("Signal Level")); Console::Dot(_X1 + 2, _Y1 + 14, (_Y2 - 8) - (_Y1 + 14)); Console::Bracket(_X1 + 2, _Y2 - 8, 6);
Console::Text(_X1 + 3, _Y1 + 2, _Console_WHITE_, F("GSM Operator")); Console::Dot(_X1 + 3, _Y1 + 14, (_Y2 - 8) - (_Y1 + 14)); Console::Bracket(_X1 + 3, _Y2 - 8, 6);
Console::Text(_X1 + 4, _Y1 + 2, _Console_WHITE_, F("IP Address")); Console::Dot(_X1 + 4, _Y1 + 12, (_Y2 - 18) - (_Y1 + 12)); Console::Bracket(_X1 + 4, _Y2 - 18, 16);
Console::Text(_X1 + 5, _Y1 + 2, _Console_WHITE_, F("LAC")); Console::Dot(_X1 + 5, _Y1 + 5, (_Y2 - 7) - (_Y1 + 5)); Console::Bracket(_X1 + 5, _Y2 - 7, 5);
Console::Text(_X1 + 6, _Y1 + 2, _Console_WHITE_, F("CELL ID")); Console::Dot(_X1 + 6, _Y1 + 9, (_Y2 - 7) - (_Y1 + 9)); Console::Bracket(_X1 + 6, _Y2 - 7, 5);
Console::Text(_X1 + 1, _Y1 + 2, _Console_WHITE_, F("Connection Time")); Console::Dot(_X1 + 1, _Y1 + 17, (_Y2 - 8) - (_Y1 + 17)); Console::Bracket(_X1 + 1, _Y2 - 8, 6);
Console::Text(_X1 + 2, _Y1 + 2, _Console_WHITE_, F("Signal Level")); Console::Dot(_X1 + 2, _Y1 + 14, (_Y2 - 8) - (_Y1 + 14)); Console::Bracket(_X1 + 2, _Y2 - 8, 6);
Console::Text(_X1 + 3, _Y1 + 2, _Console_WHITE_, F("GSM Operator")); Console::Dot(_X1 + 3, _Y1 + 14, (_Y2 - 8) - (_Y1 + 14)); Console::Bracket(_X1 + 3, _Y2 - 8, 6);
Console::Text(_X1 + 4, _Y1 + 2, _Console_WHITE_, F("IP Address")); Console::Dot(_X1 + 4, _Y1 + 12, (_Y2 - 18) - (_Y1 + 12)); Console::Bracket(_X1 + 4, _Y2 - 18, 16);
Console::Text(_X1 + 5, _Y1 + 2, _Console_WHITE_, F("Connection Type")); Console::Dot(_X1 + 5, _Y1 + 17, (_Y2 - 12) - (_Y1 + 17)); Console::Bracket(_X1 + 5, _Y2 - 12, 10);
Console::Text(_X1 + 6, _Y1 + 2, _Console_WHITE_, F("Socket")); Console::Dot(_X1 + 6, _Y1 + 8, (_Y2 - 20) - (_Y1 + 8)); Console::Bracket(_X1 + 6, _Y2 - 20, 18);

#endif

Expand Down Expand Up @@ -898,6 +898,76 @@

}

// Connection Type Function
void Show_Connection_Type(const uint8_t _X = 1, const uint8_t _Y = 1, const uint8_t _Type = 0) {

// Print RED WDS Type
Console::Text(_X, _Y, _Console_RED_, F("2G"));
Console::Text(_X, (_Y + 3), _Console_RED_, F("3G"));
Console::Text(_X, (_Y + 6), _Console_RED_, F("LTE"));

// Print WDS Type
if (_Type == 12) {

// Print 2G WDS Type
Console::Text(_X, _Y, _Console_GREEN_, F("2G"));

} else if (_Type == 22) {

// Print 3G WDS Type
Console::Text(_X, (_Y + 3), _Console_GREEN_, F("3G"));

} else if (_Type == 25) {

// Print 2G WDS Type
Console::Text(_X, _Y, _Console_GREEN_, F("2G"));

// Print 3G WDS Type
Console::Text(_X, (_Y + 3), _Console_GREEN_, F("3G"));

// Print LTE WDS Type
Console::Text(_X, (_Y + 6), _Console_GREEN_, F("LTE"));

} else if (_Type == 28) {

// Print LTE WDS Type
Console::Text(_X, (_Y + 6), _Console_GREEN_, F("LTE"));

} else if (_Type == 29) {

// Print 2G WDS Type
Console::Text(_X, _Y, _Console_GREEN_, F("2G"));

// Print 3G WDS Type
Console::Text(_X, (_Y + 3), _Console_GREEN_, F("3G"));

} else if (_Type == 30) {

// Print 2G WDS Type
Console::Text(_X, _Y, _Console_GREEN_, F("2G"));

// Print LTE WDS Type
Console::Text(_X, (_Y + 6), _Console_GREEN_, F("LTE"));

} else if (_Type == 31) {

// Print 3G WDS Type
Console::Text(_X, (_Y + 3), _Console_GREEN_, F("3G"));

// Print LTE WDS Type
Console::Text(_X, (_Y + 6), _Console_GREEN_, F("LTE"));

} else {

// Print RED WDS Type
Console::Text(_X, _Y, _Console_RED_, F("2G"));
Console::Text(_X, (_Y + 3), _Console_RED_, F("3G"));
Console::Text(_X, (_Y + 6), _Console_RED_, F("LTE"));

}

}

};

// Console Class
Expand Down

0 comments on commit 7473fd0

Please sign in to comment.