piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Modify Lua function lcd.RGB(...)

Browse Source 
Now it can take *either* (r, g, b) as before *or* one single argument between 0 and 0xFFFFFF.
This commit is contained in:
jfrickmann
2021-09-09 16:51:03 -04:00
parent 30d9107d65
commit c0e25bfbff
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/api_colorlcd.cpp
+18 -8
View File
@@ -817,27 +817,37 @@ static int luaLcdGetColor(lua_State *L)
}
/*luadoc
@function lcd.RGB(r, g, b)
@function lcd.RGB(r, g, b | rgb)
Returns a drawing flag with RGB color code
@param r (integer) a number between 0 and 255 that expresses te amount of red in the color
@param r (integer) a number between 0 and 255 that expresses the amount of red in the color
@param g (integer) a number between 0 and 255 that expresses te amount of green in the color
@param g (integer) a number between 0 and 255 that expresses the amount of green in the color
@param b (integer) a number between 0 and 255 that expresses te amount of blue in the color
@param b (integer) a number between 0 and 255 that expresses the amount of blue in the color
@param rgb (integer) a number between 0 and 0xFFFFFF that expresses the RGB value (0xFF000=RED, 0x00FF00=GREEN, 0x0000FF=BLUE)
@retval flag with RGB565 color
@notice Only available on radios with color display
@notice Only available on radios with color display. Use *either* lcd.RGB(r,g,b) *or* lcd.RGB(rgb)
@status current Introduced in 2.2.0
*/
static int luaRGB(lua_State *L)
{
int r = luaL_checkinteger(L, 1);
int g = luaL_checkinteger(L, 2);
int b = luaL_checkinteger(L, 3);
int r, g, b;
if (lua_gettop(L) == 1) {
int color = luaL_checkinteger(L, 1);
r = (color >> 16) & 0xFF;
g = (color >> 8) & 0xFF;
b = color & 0xFF;
} else {
r = luaL_checkinteger(L, 1);
g = luaL_checkinteger(L, 2);
b = luaL_checkinteger(L, 3);
}
lua_pushinteger(L, COLOR2FLAGS(RGB(r, g, b)) | RGB_FLAG);
return 1;
}