1
0
mirror of https://github.com/s00500/ESPUI.git synced 2025-06-19 11:30:39 +00:00

Adding Dark Color, correcting wrong numbering for colors

This commit is contained in:
2019-02-26 12:08:37 +01:00
parent b21c5d3b2c
commit 4f421c84d5
7 changed files with 749 additions and 682 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

@ -40,41 +40,36 @@ const C_SUNFLOWER = 4;
const C_CARROT = 5; const C_CARROT = 5;
const C_ALIZARIN = 6; const C_ALIZARIN = 6;
const C_NONE = 7; const C_NONE = 7;
const C_DARK = 8;
function colorClass(colorId) { function colorClass(colorId) {
colorId = Number(colorId); colorId = Number(colorId);
switch (colorId) { switch (colorId) {
case C_TURQUOISE: case C_TURQUOISE:
return "turquoise"; return "turquoise";
break;
case C_EMERALD: case C_EMERALD:
return "emerald"; return "emerald";
break;
case C_PETERRIVER: case C_PETERRIVER:
return "peterriver"; return "peterriver";
break;
case C_WETASPHALT: case C_WETASPHALT:
return "wetasphalt"; return "wetasphalt";
break;
case C_SUNFLOWER: case C_SUNFLOWER:
return "sunflower"; return "sunflower";
break;
case C_CARROT: case C_CARROT:
return "carrot"; return "carrot";
break;
case C_ALIZARIN: case C_ALIZARIN:
return "alizarin"; return "alizarin";
break;
case C_NONE: case C_NONE:
return ""; return "";
break; case C_DARK:
return "dark";
default: default:
return ""; return "";

@ -1,4 +1,4 @@
const UI_INITIAL_GUI=100;const UI_TITEL=0;const UI_LABEL=1;const UPDATE_LABEL=6;const UI_BUTTON=2;const UI_SWITCHER=3;const UPDATE_SWITCHER=7;const UI_PAD=4;const UI_CPAD=5;const UI_SLIDER=8;const UPDATE_SLIDER=9;const UI_NUMBER=10;const UPDATE_NUMBER=11;const UI_TEXT_INPUT=12;const UPDATE_TEXT_INPUT=13;const UI_GRAPH=14;const CLEAR_GRAPH=15;const ADD_GRAPH_POINT=16;const FOR=0;const BACK=1;const LEFT=2;const RIGHT=3;const CENTER=4;const C_TURQUOISE=0;const C_EMERALD=1;const C_PETERRIVER=2;const C_WETASPHALT=3;const C_SUNFLOWER=4;const C_CARROT=5;const C_ALIZARIN=6;const C_NONE=7;function colorClass(colorId){colorId=Number(colorId);switch(colorId){case C_TURQUOISE:return"turquoise";break;case C_EMERALD:return"emerald";break;case C_PETERRIVER:return"peterriver";break;case C_WETASPHALT:return"wetasphalt";break;case C_SUNFLOWER:return"sunflower";break;case C_CARROT:return"carrot";break;case C_ALIZARIN:return"alizarin";break;case C_NONE:return"";break;default:return"";}} const UI_INITIAL_GUI=100;const UI_TITEL=0;const UI_LABEL=1;const UPDATE_LABEL=6;const UI_BUTTON=2;const UI_SWITCHER=3;const UPDATE_SWITCHER=7;const UI_PAD=4;const UI_CPAD=5;const UI_SLIDER=8;const UPDATE_SLIDER=9;const UI_NUMBER=10;const UPDATE_NUMBER=11;const UI_TEXT_INPUT=12;const UPDATE_TEXT_INPUT=13;const UI_GRAPH=14;const CLEAR_GRAPH=15;const ADD_GRAPH_POINT=16;const FOR=0;const BACK=1;const LEFT=2;const RIGHT=3;const CENTER=4;const C_TURQUOISE=0;const C_EMERALD=1;const C_PETERRIVER=2;const C_WETASPHALT=3;const C_SUNFLOWER=4;const C_CARROT=5;const C_ALIZARIN=6;const C_NONE=7;const C_DARK=8;function colorClass(colorId){colorId=Number(colorId);switch(colorId){case C_TURQUOISE:return"turquoise";case C_EMERALD:return"emerald";case C_PETERRIVER:return"peterriver";case C_WETASPHALT:return"wetasphalt";case C_SUNFLOWER:return"sunflower";case C_CARROT:return"carrot";case C_ALIZARIN:return"alizarin";case C_NONE:return"";case C_DARK:return"dark";default:return"";}}
var websock;var websockConnected=false;function restart(){$(document).add("*").off();$("#row").html("");websock.close();start();} var websock;var websockConnected=false;function restart(){$(document).add("*").off();$("#row").html("");websock.close();start();}
function conStatusError(){websockConnected=false;$("#conStatus").removeClass("color-green");$("#conStatus").addClass("color-red");$("#conStatus").html("Error / No Connection ↻");$("#conStatus").off();$("#conStatus").on({click:restart});} function conStatusError(){websockConnected=false;$("#conStatus").removeClass("color-green");$("#conStatus").addClass("color-red");$("#conStatus").html("Error / No Connection ↻");$("#conStatus").off();$("#conStatus").on({click:restart});}
function handleVisibilityChange(){if(!websockConnected&&!document.hidden){restart();}} function handleVisibilityChange(){if(!websockConnected&&!document.hidden){restart();}}

@ -98,7 +98,8 @@ typedef struct Control {
#define COLOR_SUNFLOWER 4 #define COLOR_SUNFLOWER 4
#define COLOR_CARROT 5 #define COLOR_CARROT 5
#define COLOR_ALIZARIN 6 #define COLOR_ALIZARIN 6
#define COLOR_NONE 6 #define COLOR_NONE 7
#define COLOR_DARK 8
class ESPUIClass { class ESPUIClass {
public: public:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long