Skip to content

Commit 3ff7fe4

Browse files
fix: small collection of bugfixed debugger hints and warnings (#801)
* small collection of bugfixed debugger hints / warnings * 'toStdVector' has been explicitly marked deprecated * fixed double zip naming in artifacts * V4L2 WebUI Fix * Some code fixes based on alerts from lgtm.com * only execute dynamic v4l2 enum code, if V4L2_AVAIL * very high critical bugfix ;) * merge fix * some lgtm.com fixes * lgtm fixes * undo localtime_r fix Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com>
1 parent e1288a2 commit 3ff7fe4

File tree

24 files changed

+577
-580
lines changed

24 files changed

+577
-580
lines changed

.github/workflows/pull-request.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Upload artifacts
6565
uses: actions/upload-artifact@v1
6666
with:
67-
name: ${{ matrix.dockerTag }}.zip
67+
name: ${{ matrix.dockerTag }}
6868
path: ${{ matrix.dockerTag }}
6969
if: matrix.dockerTag != 'aarch64'
7070

@@ -111,7 +111,7 @@ jobs:
111111
- name: Upload artifacts
112112
uses: actions/upload-artifact@v1
113113
with:
114-
name: macOS.zip
114+
name: macOS
115115
path: macOS
116116

117117
######################
@@ -169,11 +169,12 @@ jobs:
169169
run: |
170170
mkdir -p windows
171171
mv build/*.zip windows
172+
172173
# Upload artifacts
173174
- name: Upload artifacts
174175
uses: actions/upload-artifact@v1
175176
with:
176-
name: windows.zip
177+
name: windows
177178
path: windows
178179

179180
######################

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ We provide a macOS Build but we can not support this.
4141

4242
## Documentation
4343
Covers these topics (WorkInProgress)
44-
- Installtion
44+
- Installation
4545
- Configuration
4646
- Effect development
4747
- JSON API

assets/webconfig/js/content_grabber.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ $(document).ready( function() {
118118
buildSchemaPart(item, v4l2_dynamic_enum_schema, val);
119119
grabberV4L2.original_schema.properties[item] = window.schema.grabberV4L2.properties[item];
120120
grabberV4L2.schema.properties[item] = window.schema.grabberV4L2.properties[item];
121+
conf_editor_v4l2.validator.schema.properties.grabberV4L2.properties[item] = window.schema.grabberV4L2.properties[item];
121122

122123
grabberV4L2.removeObjectProperty(item);
123124
delete grabberV4L2.cached_editors[item];

assets/webconfig/js/content_leds.js

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,9 @@ function createClassicLeds(){
8686
var pttlv = parseInt($("#ip_cl_ptlv").val())/100;
8787
var pttrh = parseInt($("#ip_cl_ptrh").val())/100;
8888
var pttrv = parseInt($("#ip_cl_ptrv").val())/100;
89-
89+
9090
//helper
9191
var edgeHGap = edgeVGap/(16/9);
92-
//var cornerHGap = cornerVGap/(16/9);
93-
var Vmin = 0.0 + edgeVGap;
94-
var Vmax = 1.0 - edgeVGap;
95-
var Hmin = 0.0 + edgeHGap;
96-
var Hmax = 1.0 - edgeHGap;
97-
var Hdiff = Hmax-Hmin;
98-
var Vdiff = Vmax-Vmin;
9992
var ledArray = [];
10093

10194
function createFinalArray(array){
@@ -154,7 +147,7 @@ function createClassicLeds(){
154147
function createTopLeds(){
155148
var steph = (pttrh - pttlh - (2*edgeHGap))/ledstop;
156149
var stepv = (pttrv - pttlv)/ledstop;
157-
150+
158151
for (var i = 0; i<ledstop; i++){
159152
var hmin = ovl("-",pttlh+(steph*Number([i]))+edgeHGap);
160153
var hmax = ovl("+",pttlh+(steph*Number([i+1]))+edgeHGap);
@@ -167,7 +160,7 @@ function createClassicLeds(){
167160
function createRightLeds(){
168161
var steph = (ptbrh - pttrh)/ledsright;
169162
var stepv = (ptbrv - pttrv - (2*edgeVGap))/ledsright;
170-
163+
171164
for (var i = 0; i<ledsright; i++){
172165
var hmax = pttrh+(steph*Number([i+1]));
173166
var hmin = hmax-ledsVDepth;
@@ -180,7 +173,7 @@ function createClassicLeds(){
180173
function createBottomLeds(){
181174
var steph = (ptbrh - ptblh - (2*edgeHGap))/ledsbottom;
182175
var stepv = (ptbrv - ptblv)/ledsbottom;
183-
176+
184177
for (var i = ledsbottom-1; i>-1; i--){
185178
var hmin = ovl("-",ptblh+(steph*Number([i]))+edgeHGap);
186179
var hmax = ovl("+",ptblh+(steph*Number([i+1]))+edgeHGap);
@@ -193,7 +186,7 @@ function createClassicLeds(){
193186
function createLeftLeds(){
194187
var steph = (ptblh - pttlh)/ledsleft;
195188
var stepv = (ptblv - pttlv - (2*edgeVGap))/ledsleft;
196-
189+
197190
for (var i = ledsleft-1; i>-1; i--){
198191
var hmin = pttlh+(steph*Number([i]));
199192
var hmax = hmin+ledsVDepth;
@@ -378,7 +371,7 @@ $(document).ready(function() {
378371
var slConfig = window.serverConfig.ledConfig;
379372

380373
//Check, if structure is not aligned to expected -> migrate structure
381-
var newConfig = {};
374+
382375
if ( isEmpty(slConfig.classic) )
383376
{
384377
slConfig = migrateLedConfig( slConfig );
@@ -530,7 +523,7 @@ $(document).ready(function() {
530523
conf_editor.validate().length ? $('#btn_submit_controller').attr('disabled', true) : $('#btn_submit_controller').attr('disabled', false);
531524

532525
// led controller sepecific wizards
533-
$('#btn_wiz_holder').html("")
526+
$('#btn_wiz_holder').html("");
534527
$('#btn_led_device_wiz').off();
535528

536529
if(ledType == "philipshue") {

0 commit comments

Comments
 (0)