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

More oled ui control #99

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

More oled ui control #99

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
97b46a4
Extended and documented OLED output capabilities through GCodes > 10000.
ErikDeBruijn Mar 2, 2016
6a0f32f
Experimental support for pushing out a "dialog" question.
ErikDeBruijn Mar 2, 2016
82cc829
Remove vline and hline to save memory, rectangle functions are an acc…
ErikDeBruijn Mar 3, 2016
9fcd306
Added M10008 - Display string at X,Y based on hex encoded chars (S), …
ErikDeBruijn Mar 3, 2016
a86c6c6
FIX: Don't display checksum in text.
ErikDeBruijn Mar 3, 2016
3150c8b
More efficient calculation of progress bar length.
ErikDeBruijn Mar 3, 2016
3cd44a6
Remove the question dialog since it's not generic enough and can be b…
ErikDeBruijn Mar 3, 2016
89810ab
Null char fix and more efficient code in terms of byte size.
ErikDeBruijn Mar 3, 2016
8bb88df
Implemented Daid's suggestions (at least I hope so ;) )
ErikDeBruijn Mar 3, 2016
5a15d42
A bit of safety against buffer overflows?
ErikDeBruijn Mar 3, 2016
5ec7bbd
Updated hex2bin and added tests length of hex_data
robinmdh Apr 6, 2016
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
127 changes: 106 additions & 21 deletions Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
#include "language.h"
#include "pins_arduino.h"

#ifdef ENABLE_ULTILCD2
#include "UltiLCD2_hi_lib.h"
#endif

#if NUM_SERVOS > 0
#include "Servo.h"
#endif
Expand Down Expand Up @@ -149,6 +153,15 @@
// M923 - Select file and start printing directly (can be used from other SD file)
// M928 - Start SD logging (M928 filename.g) - ended by M29
// M999 - Restart after being stopped by error
// M10001 - Draw text on LCD, M10002 X0 Y0 SText (when X is left out, it will draw centered)
// M10002 - Draw inverted text on LCD, M10002 X0 Y0 SText (when X is left out, it will draw centered)
// M10003 - Draw rectangle on LCD, M10003 X1 Y1 W10 H10
// M10004 - Draw filled rectangle on LCD, M10004 X1 Y1 W10 H10
// M10005 - Draw shaded rectangle on LCD, M10005 X1 Y1 W10 H10
// M10008 - Display string at X,Y based on hex encoded chars (S), use I instead of S for inverted text,
// e.g. M10008 X10 Y10 S48656c6c6f2c20776f726c6421 displays "Hello, world!"
// M10009 - Draw progress bar, e.g. 90% is M10009 P90
// M10010 - Request LCD screen button info (R:[rotation difference compared to previous request] B:[button down])

//Stepper Movement Variables

Expand Down Expand Up @@ -288,6 +301,15 @@ void serial_echopair_P(const char *s_P, double v)
void serial_echopair_P(const char *s_P, unsigned long v)
{ serialprintPGM(s_P); SERIAL_ECHO(v); }

/**
* @brief Fills binary array from hex string.
* @param[out] bin pointer to buffer to write resulting binary data to.
* @param[in] hex pointer to string to be converted.
* @param[in] buf_size Maximum number of bytes the bin array is going to have.
* @returns Nr of bytes converted, resulting binary array is half as large.
*/
int hex2bin(uint8_t* bin, const char* hex, const int buf_size);

extern "C"{
extern unsigned int __bss_end;
extern unsigned int __heap_start;
Expand Down Expand Up @@ -2324,53 +2346,44 @@ void process_commands()
case 10000://M10000 - Clear the whole LCD
lcd_lib_clear();
break;
case 10001://M10001 - Draw text on LCD, M10002 X0 Y0 SText (when X is left out, it will draw centered)
{
uint8_t x = 0, y = 0;
if (code_seen('X')) {
x = code_value_long();
if (code_seen('Y')) y = code_value_long();
if (code_seen('S')) lcd_lib_draw_string(x, y, &cmdbuffer[bufindr][strchr_pointer - cmdbuffer[bufindr] + 1]);
} else {
if (code_seen('Y')) y = code_value_long();
if (code_seen('S')) lcd_lib_draw_string_center(y,&cmdbuffer[bufindr][strchr_pointer - cmdbuffer[bufindr] + 1]);
}
}
break;
case 10002://M10002 - Draw inverted text on LCD, M10002 X0 Y0 SText (when X is left out, it will draw centered)
case 10001://M10001 - Display string S[text] or inverted string I[text] on LCD, M10002 X0 Y0 SText (when X is left out, it will draw centered)
{
char* ptr = strrchr(cmdbuffer[bufindr], '*');
if (ptr) *ptr = '\0';
uint8_t x = 0, y = 0;
if (code_seen('X')) {
x = code_value_long();
if (code_seen('Y')) y = code_value_long();
if (code_seen('S')) lcd_lib_clear_string(x, y, &cmdbuffer[bufindr][strchr_pointer - cmdbuffer[bufindr] + 1]);
if (code_seen('S')) lcd_lib_draw_string(x, y, strchr_pointer + 1);
if (code_seen('I')) lcd_lib_clear_string(x, y, strchr_pointer + 1);
} else {
if (code_seen('Y')) y = code_value_long();
if (code_seen('S')) lcd_lib_clear_string_center(y, &cmdbuffer[bufindr][strchr_pointer - cmdbuffer[bufindr] + 1]);
if (code_seen('S')) lcd_lib_draw_string_center(y,strchr_pointer + 1);
if (code_seen('I')) lcd_lib_clear_string_center(y,strchr_pointer + 1);
}
}
break;
case 10003://M10003 - Draw square on LCD, M10003 X1 Y1 W10 H10
case 10003://M10003 - Draw rectangle on LCD, M10003 X1 Y1 W10 H10
{
uint8_t x = 0, y = 0, w = 1, h = 1;
if (code_seen('X')) x = code_value_long();
if (code_seen('Y')) y = code_value_long();
if (code_seen('W')) w = code_value_long();
if (code_seen('H')) h = code_value_long();
lcd_lib_set(x, y, x + w, y + h);
lcd_lib_draw_box(x, y, x + w, y + h);
}
break;
case 10004://M10004 - Draw shaded square on LCD, M10004 X1 Y1 W10 H10
case 10004://M10004 - Draw filled rectangle on LCD, M10004 X1 Y1 W10 H10
{
uint8_t x = 0, y = 0, w = 1, h = 1;
if (code_seen('X')) x = code_value_long();
if (code_seen('Y')) y = code_value_long();
if (code_seen('W')) w = code_value_long();
if (code_seen('H')) h = code_value_long();
lcd_lib_draw_shade(x, y, x + w, y + h);
lcd_lib_set(x, y, x + w, y + h);
}
break;
case 10005://M10005 - Draw shaded square on LCD, M10004 X1 Y1 W10 H10
case 10005://M10005 - Draw shaded rectangle on LCD, M10005 X1 Y1 W10 H10
{
uint8_t x = 0, y = 0, w = 1, h = 1;
if (code_seen('X')) x = code_value_long();
Expand All @@ -2380,6 +2393,39 @@ void process_commands()
lcd_lib_draw_shade(x, y, x + w, y + h);
}
break;
case 10008://M10008 - Display string at X,Y based on hex encoded chars (S), use I instead of S for inverted text,
// e.g. M10008 X10 Y10 S48656c6c6f2c20776f726c6421 displays "Hello, world!"
{
uint8_t x = 0, y = 0;
Copy link
Contributor

Choose a reason for hiding this comment

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

This code should also clear out the '*' character, to prevent the hex2bin function trying to convert that.

char* hex_data = NULL;
char bin_string[22];//21 chars plus null char
char* ptr = strrchr(cmdbuffer[bufindr], '*');
if (ptr) *ptr = '\0';
if (code_seen('X')) x = code_value_long();
if (code_seen('Y')) y = code_value_long();
if (code_seen('S')) hex_data = strchr_pointer + 1;
if (code_seen('I')) hex_data = strchr_pointer + 1;
uint8_t len = strlen(hex_data);
if (len > 44 || len % 2 != 0)
{
SERIAL_PROTOCOLLNPGM("Error: Hex string too long or length not even");
break;
}
int end = hex2bin(bin_string, hex_data, len / 2);
if (end) {
bin_string[len / 2] = '\0';
if (code_seen('S')) lcd_lib_draw_string(x, y, bin_string);
else lcd_lib_clear_string(x, y, bin_string);
}
}
break;
case 10009://M10009 - Draw progress bar, e.g. 90% is M10009 P90
{
uint16_t progress = 0;
if (code_seen('P')) progress = code_value_long();
lcd_progressbar(progress * 125 / 100);
}
break;
case 10010://M10010 - Request LCD screen button info (R:[rotation difference compared to previous request] B:[button down])
{
SERIAL_PROTOCOLPGM("ok R:");
Expand Down Expand Up @@ -2887,3 +2933,42 @@ bool setTargetedHotend(int code){
return false;
}

int8_t hexNibble2Bin(const char nibble)
{
if (nibble >= 'a' && nibble <= 'f')
return nibble - ('a' - 10);
if (nibble >= 'A' && nibble <= 'F')
return nibble - ('A' - 10);
if (nibble >= '0' && nibble <= '9')
return nibble - '0';
return 0;
}

int hex2bin(uint8_t* bin, const char* hex, const int buf_size)
{
int count;
for (count = 0; count < buf_size * 2; count++)
{
int bin_nibble = hexNibble2Bin(*hex++);
if (bin_nibble >= 0)
{
// If first nibble.
if (count % 2 == 0)
{
*bin = bin_nibble << 4;
}
else // Second nibble.
{
*bin += bin_nibble;
bin++;
}
}
else
{
// End of hex string reached.
break;
}
}

return count;
}