Skip to content

Commit 8db85c9

Browse files
brindoschPaulchen-Panther
brindosch
and
Paulchen-Panther
authored
refactor: Led layout, clearAll (#703)
* add SSDP name field * YALL - yet another led layout * led layout migration * add initial vscode config * merge clearAll with clear, rename Hyperion::compStateChange * simpler components api * Corrected code formatting + triggered PR build * fix: regression from #636 * Support for color patterns Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com>
1 parent ef51d28 commit 8db85c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+656
-738
lines changed

‎.vscode/c_cpp_properties.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"configurations": [
3+
{
4+
"name": "Linux",
5+
"includePath": [
6+
"${workspaceFolder}/**",
7+
"/usr/include/**"
8+
],
9+
"defines": [],
10+
"compilerPath": "/usr/bin/gcc-5",
11+
"intelliSenseMode": "gcc-x64",
12+
"cppStandard": "c++11",
13+
"cStandard": "c11",
14+
"configurationProvider": "ms-vscode.cmake-tools"
15+
}
16+
],
17+
"version": 4
18+
}

‎assets/webconfig/js/content_leds.js‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ function createLedPreview(leds, origin){
4040
var led = leds[idx];
4141
var led_id='ledc_'+[idx];
4242
var bgcolor = "background-color:hsl("+(idx*360/leds.length)+",100%,50%);";
43-
var pos = "left:"+(led.h.min * canvas_width)+"px;"+
44-
"top:"+(led.v.min * canvas_height)+"px;"+
45-
"width:"+((led.h.max-led.h.min) * (canvas_width-1))+"px;"+
46-
"height:"+((led.v.max-led.v.min) * (canvas_height-1))+"px;";
43+
var pos = "left:"+(led.hmin * canvas_width)+"px;"+
44+
"top:"+(led.vmin * canvas_height)+"px;"+
45+
"width:"+((led.hmax-led.hmin) * (canvas_width-1))+"px;"+
46+
"height:"+((led.vmax-led.vmin) * (canvas_height-1))+"px;";
4747
leds_html += '<div id="'+led_id+'" class="led" style="'+bgcolor+pos+'" title="'+idx+'"><span id="'+led_id+'_num" class="led_prev_num">'+idx+'</span></div>';
4848
}
4949
$('#leds_preview').html(leds_html);
@@ -91,11 +91,11 @@ function createClassicLeds(){
9191
function createFinalArray(array){
9292
finalLedArray = [];
9393
for(var i = 0; i<array.length; i++){
94-
var hmin = array[i].h.min;
95-
var hmax = array[i].h.max;
96-
var vmin = array[i].v.min;
97-
var vmax = array[i].v.max;
98-
finalLedArray[i] = { "h": { "max" : hmax, "min" : hmin }, "v": { "max": vmax, "min": vmin}}
94+
var hmin = array[i].hmin;
95+
var hmax = array[i].hmax;
96+
var vmin = array[i].vmin;
97+
var vmax = array[i].vmax;
98+
finalLedArray[i] = { "hmax": hmax, "hmin": hmin, "vmax": vmax, "vmin": vmin }
9999
}
100100
createLedPreview(finalLedArray, 'classic');
101101
}
@@ -138,7 +138,7 @@ function createClassicLeds(){
138138
hmax = round(hmax);
139139
vmin = round(vmin);
140140
vmax = round(vmax);
141-
ledArray.push( { "h" : { "min" : hmin, "max" : hmax }, "v": { "min": vmin, "max": vmax }} );
141+
ledArray.push({ "hmin": hmin, "hmax": hmax, "vmin": vmin, "vmax": vmax });
142142
}
143143

144144
function createTopLeds(){
@@ -268,14 +268,10 @@ function createMatrixLeds(){
268268
vscanMax = round(vscanMax);
269269

270270
leds.push({
271-
h: {
272-
min: hscanMin,
273-
max: hscanMax
274-
},
275-
v: {
276-
min: vscanMin,
277-
max: vscanMax
278-
}
271+
hmin: hscanMin,
272+
hmax: hscanMax,
273+
vmin: vscanMin,
274+
vmax: vscanMax
279275
})
280276
}
281277

@@ -446,7 +442,7 @@ $(document).ready(function() {
446442
});
447443

448444
// v4 of json schema with diff required assignment - remove when hyperion schema moved to v4
449-
var ledschema = {"items":{"additionalProperties":false,"required":["h","v"],"properties":{"colorOrder":{"enum":["rgb","bgr","rbg","brg","gbr","grb"],"type":"string"},"h":{"additionalProperties":false,"properties":{"max":{"maximum":1,"minimum":0,"type":"number"},"min":{"maximum":1,"minimum":0,"type":"number"}},"type":"object"},"v":{"additionalProperties":false,"properties":{"max":{"maximum":1,"minimum":0,"type":"number"},"min":{"maximum":1,"minimum":0,"type":"number"}},"type":"object"}},"type":"object"},"type":"array"};
445+
var ledschema = { "items": { "additionalProperties": false, "required": ["hmin", "hmax", "vmin", "vmax"], "properties": { "name": { "type": "string" }, "colorOrder": { "enum": ["rgb", "bgr", "rbg", "brg", "gbr", "grb"], "type": "string" }, "hmin": { "maximum": 1, "minimum": 0, "type": "number" }, "hmax": { "maximum": 1, "minimum": 0, "type": "number" }, "vmin": { "maximum": 1, "minimum": 0, "type": "number" }, "vmax": { "maximum": 1, "minimum": 0, "type": "number" } }, "type": "object" }, "type": "array" };
450446
//create jsonace editor
451447
aceEdt = new JSONACEEditor(document.getElementById("aceedit"),{
452448
mode: 'code',

‎assets/webconfig/js/ledsim.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $(document).ready(function() {
2222
for(var idx=0; idx<leds.length; idx++)
2323
{
2424
var led = leds[idx];
25-
twoDPaths.push( build2DPath(led.h.min * canvas_width, led.v.min * canvas_height, (led.h.max-led.h.min) * canvas_width, (led.v.max-led.v.min) * canvas_height, 5) );
25+
twoDPaths.push( build2DPath(led.hmin * canvas_width, led.vmin * canvas_height, (led.hmax-led.hmin) * canvas_width, (led.vmax-led.vmin) * canvas_height, 5) );
2626
}
2727
}
2828

@@ -144,8 +144,8 @@ $(document).ready(function() {
144144
{
145145
var led = leds[idx];
146146
// can be used as fallback when Path2D is not available
147-
//roundRect(ledsCanvasNodeCtx, led.h.min * canvas_width, led.v.min * canvas_height, (led.h.max-led.h.min) * canvas_width, (led.v.max-led.v.min) * canvas_height, 4, true, colors[idx])
148-
//ledsCanvasNodeCtx.fillRect(led.h.min * canvas_width, led.v.min * canvas_height, (led.h.max-led.h.min) * canvas_width, (led.v.max-led.v.min) * canvas_height);
147+
//roundRect(ledsCanvasNodeCtx, led.hmin * canvas_width, led.vmin * canvas_height, (led.hmax-led.hmin) * canvas_width, (led.vmax-led.vmin) * canvas_height, 4, true, colors[idx])
148+
//ledsCanvasNodeCtx.fillRect(led.hmin * canvas_width, led.vmin * canvas_height, (led.hmax-led.hmin) * canvas_width, (led.vmax-led.vmin) * canvas_height);
149149

150150
ledsCanvasNodeCtx.fillStyle = (useColor) ? "rgba("+colors[cPos]+","+colors[cPos+1]+","+colors[cPos+2]+",0.9)" : "hsl("+(idx*360/leds.length)+",100%,50%)";
151151
ledsCanvasNodeCtx.fill(twoDPaths[idx]);
@@ -155,7 +155,7 @@ $(document).ready(function() {
155155
{
156156
ledsCanvasNodeCtx.fillStyle = "blue";
157157
ledsCanvasNodeCtx.textAlign = "center";
158-
ledsCanvasNodeCtx.fillText(idx, (led.h.min * canvas_width) + ( ((led.h.max-led.h.min) * canvas_width) / 2), (led.v.min * canvas_height) + ( ((led.v.max-led.v.min) * canvas_height) / 2));
158+
ledsCanvasNodeCtx.fillText(idx, (led.hmin * canvas_width) + ( ((led.hmax-led.hmin) * canvas_width) / 2), (led.vmin * canvas_height) + ( ((led.vmax-led.vmin) * canvas_height) / 2));
159159
}
160160

161161
// increment colorsPosition

‎assets/webconfig/js/wizard.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -518,11 +518,11 @@ $('#btn_wizard_colorcalibration').off().on('click', startWizardCC);
518518
var hueIPs = [];
519519
var hueIPsinc = 0;
520520
var lightIDs = null;
521-
var huePosTop = {h: {max: 0.85, min: 0.15}, v: {max: 0.2, min: 0}};
522-
var huePosBottom = {h: {max: 0.85, min: 0.15}, v: {max: 1, min: 0.8}};
523-
var huePosLeft = {h: {max: 0.15, min: 0}, v: {max: 0.85, min: 0.15}};
524-
var huePosRight = {h: {max: 1, min: 0.85}, v: {max: 0.85, min: 0.15}};
525-
var huePosEntire = {h: {max: 1.0, min: 0.0}, v: {max: 1.0, min: 0.0}};
521+
var huePosTop = {hmax: 0.85, hmin: 0.15, vmax: 0.2, vmin: 0};
522+
var huePosBottom = {hmax: 0.85, hmin: 0.15, vmax: 1, vmin: 0.8};
523+
var huePosLeft = {hmax: 0.15, hmin: 0, vmax: 0.85, vmin: 0.15};
524+
var huePosRight = {hmax: 1, hmin: 0.85, vmax: 0.85, vmin: 0.15};
525+
var huePosEntire = {hmax: 1.0, hmin: 0.0, vmax: 1.0, vmin: 0.0};
526526

527527
function startWizardPhilipsHue()
528528
{

‎cmake/FindGitVersion.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ execute_process( COMMAND sh -c "git remote --verbose | grep origin | grep fetch
66
STRING ( STRIP "${BUILD_ID}" BUILD_ID )
77
STRING ( STRIP "${VERSION_ID}" VERSION_ID )
88
STRING ( STRIP "${GIT_REMOTE_PATH}" GIT_REMOTE_PATH )
9-
SET ( HYPERION_BUILD_ID "${VERSION_ID} (${BUILD_ID}) Git Remote: ${GIT_REMOTE_PATH}" )
9+
SET ( HYPERION_BUILD_ID "${VERSION_ID} (${BUILD_ID})" )
10+
SET ( HYPERION_GIT_REMOTE "${GIT_REMOTE_PATH}" )
1011
message ( STATUS "Current Version: ${HYPERION_VERSION}" )
1112
message ( STATUS " - Build: ${HYPERION_BUILD_ID}" )

0 commit comments

Comments
 (0)