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>
This commit is contained in:
SJunkies 2020-05-25 21:51:11 +02:00 committed by GitHub
parent e1288a2649
commit 3ff7fe483f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 519 additions and 522 deletions

View File

@ -64,7 +64,7 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v1
with:
name: ${{ matrix.dockerTag }}.zip
name: ${{ matrix.dockerTag }}
path: ${{ matrix.dockerTag }}
if: matrix.dockerTag != 'aarch64'
@ -111,7 +111,7 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v1
with:
name: macOS.zip
name: macOS
path: macOS
######################
@ -169,11 +169,12 @@ jobs:
run: |
mkdir -p windows
mv build/*.zip windows
# Upload artifacts
- name: Upload artifacts
uses: actions/upload-artifact@v1
with:
name: windows.zip
name: windows
path: windows
######################

View File

@ -41,7 +41,7 @@ We provide a macOS Build but we can not support this.
## Documentation
Covers these topics (WorkInProgress)
- Installtion
- Installation
- Configuration
- Effect development
- JSON API

View File

@ -118,6 +118,7 @@ $(document).ready( function() {
buildSchemaPart(item, v4l2_dynamic_enum_schema, val);
grabberV4L2.original_schema.properties[item] = window.schema.grabberV4L2.properties[item];
grabberV4L2.schema.properties[item] = window.schema.grabberV4L2.properties[item];
conf_editor_v4l2.validator.schema.properties.grabberV4L2.properties[item] = window.schema.grabberV4L2.properties[item];
grabberV4L2.removeObjectProperty(item);
delete grabberV4L2.cached_editors[item];

View File

@ -89,13 +89,6 @@ function createClassicLeds(){
//helper
var edgeHGap = edgeVGap/(16/9);
//var cornerHGap = cornerVGap/(16/9);
var Vmin = 0.0 + edgeVGap;
var Vmax = 1.0 - edgeVGap;
var Hmin = 0.0 + edgeHGap;
var Hmax = 1.0 - edgeHGap;
var Hdiff = Hmax-Hmin;
var Vdiff = Vmax-Vmin;
var ledArray = [];
function createFinalArray(array){
@ -378,7 +371,7 @@ $(document).ready(function() {
var slConfig = window.serverConfig.ledConfig;
//Check, if structure is not aligned to expected -> migrate structure
var newConfig = {};
if ( isEmpty(slConfig.classic) )
{
slConfig = migrateLedConfig( slConfig );
@ -530,7 +523,7 @@ $(document).ready(function() {
conf_editor.validate().length ? $('#btn_submit_controller').attr('disabled', true) : $('#btn_submit_controller').attr('disabled', false);
// led controller sepecific wizards
$('#btn_wiz_holder').html("")
$('#btn_wiz_holder').html("");
$('#btn_led_device_wiz').off();
if(ledType == "philipshue") {

View File

@ -210,7 +210,7 @@ $(document).ready(function() {
components.forEach( function(obj) {
if (obj.name == "ALL")
{
hyperionEnabled = obj.enabled
hyperionEnabled = obj.enabled;
}
});
@ -232,9 +232,9 @@ $(document).ready(function() {
$('#componentsbutton').append(d);
$(`#${comp_btn_id}`).bootstrapToggle();
$(`#${comp_btn_id}`).bootstrapToggle(hyperionEnabled ? "enable" : "disable")
$(`#${comp_btn_id}`).bootstrapToggle((hyperionEnabled ? "enable" : "disable"));
$(`#${comp_btn_id}`).change(e => {
requestSetComponentState(e.currentTarget.id.split('_').pop(), e.currentTarget.checked)
requestSetComponentState(e.currentTarget.id.split('_').pop(), e.currentTarget.checked);
//console.log(e.currentTarget.checked)
});
}
@ -246,8 +246,7 @@ $(document).ready(function() {
if (component.name == "ALL")
{
var components = window.comps;
hyperionEnabled = component.enabled
var hyperionEnabled = component.enabled;
for (const comp of components)
{

View File

@ -45,7 +45,7 @@ function connectionLostDetection(type)
{
if ( window.watchdog > 2 )
{
var interval_id = window.setInterval("", 9999); // Get a reference to the last
var interval_id = window.setInterval(function(){clearInterval(interval_id);}, 9999); // Get a reference to the last
for (var i = 1; i < interval_id; i++)
window.clearInterval(i);
if(type == 'restart')

View File

@ -1,6 +1,6 @@
# Two projectiles are sent from random positions and collide with each other
# Template from https://github.com/nickpesce/lit/blob/master/lit/effects/collision.py
import hyperion, time, colorsys, random, math
import hyperion, time, colorsys, random
# Get parameters
sleepTime = max(0.02, float(hyperion.args.get('speed', 100))/1000.0)

View File

@ -24,7 +24,7 @@ public slots:
void stop();
void setSignalThreshold(double redSignalThreshold, double greenSignalThreshold, double blueSignalThreshold);
void setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom);
void setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom);
void setSignalDetectionOffset(double verticalMin, double horizontalMin, double verticalMax, double horizontalMax);
void setSignalDetectionEnable(bool enable);
void setDeviceVideoStandard(QString device, VideoStandard videoStandard);

View File

@ -52,7 +52,7 @@ private slots:
///
/// @brief Handle COMP_ALL changes from Hyperion->compStateChangeRequest
///
void handleCompStateChangeRequest(const hyperion::Components comp, const bool activated);
void handleCompStateChangeRequest(const hyperion::Components comps, const bool activated);
private:
/// Hyperion instance

View File

@ -86,4 +86,4 @@ inline Components stringToComponent(QString component)
return COMP_INVALID;
}
}; // end of namespace
} // end of namespace

View File

@ -61,4 +61,4 @@ QString getDirName( QString sourceFile);
/// @param[in] log The logger of the caller
///
void resolveFileError(const QFile& file, Logger* log);
};
}

View File

@ -203,7 +203,7 @@ public:
assert(other._width == _width);
assert(other._height == _height);
memcpy(_pixels, other._pixels, _width*_height*sizeof(Pixel_T));
memcpy(_pixels, other._pixels, _width * _height * sizeof(Pixel_T));
}
///
@ -258,7 +258,7 @@ public:
_height = 1;
_pixels = new Pixel_T[2];
_endOfPixels = _pixels + 1;
memset(_pixels, 0, _width * _height * sizeof(Pixel_T));
memset(_pixels, 0, (unsigned long) _width * _height * sizeof(Pixel_T));
}
private:

View File

@ -92,4 +92,4 @@ namespace JsonUtils{
/// @return true on success else false
///
bool resolveRefs(const QJsonObject& schema, QJsonObject& obj, Logger* log);
};
}

View File

@ -103,4 +103,4 @@ protected:
const int _loggerMaxMsgBufferSize;
};
Q_DECLARE_METATYPE(Logger::T_LOG_MESSAGE);
Q_DECLARE_METATYPE(Logger::T_LOG_MESSAGE)

View File

@ -8,4 +8,4 @@ namespace Process {
void restartHyperion(bool asNewProcess=false);
QByteArray command_exec(QString cmd, QByteArray data="");
};
}

View File

@ -17,4 +17,4 @@ namespace RGBW {
WhiteAlgorithm stringToWhiteAlgorithm(QString str);
void Rgb_to_Rgbw(ColorRgb input, ColorRgbw * output, const WhiteAlgorithm algorithm);
};
}

View File

@ -6,8 +6,8 @@
/// @brief Provide util methods to work with SettingsManager class
///
namespace settings {
// all available settings sections
enum type {
// all available settings sections
enum type {
BGEFFECT,
FGEFFECT,
BLACKBORDER,
@ -30,15 +30,15 @@ enum type {
FLATBUFSERVER,
PROTOSERVER,
INVALID
};
};
///
/// @brief Convert settings::type to string representation
/// @param type The settings::type from enum
/// @return The settings type as string
///
inline QString typeToString(const type& type)
{
///
/// @brief Convert settings::type to string representation
/// @param type The settings::type from enum
/// @return The settings type as string
///
inline QString typeToString(const type& type)
{
switch (type)
{
case BGEFFECT: return "backgroundEffect";
@ -64,15 +64,15 @@ inline QString typeToString(const type& type)
case PROTOSERVER: return "protoServer";
default: return "invalid";
}
}
}
///
/// @brief Convert string to settings::type representation
/// @param type The string to convert
/// @return The settings type from enum
///
inline type stringToType(const QString& type)
{
///
/// @brief Convert string to settings::type representation
/// @param type The string to convert
/// @return The settings type from enum
///
inline type stringToType(const QString& type)
{
if (type == "backgroundEffect") return BGEFFECT;
else if (type == "foregroundEffect") return FGEFFECT;
else if (type == "blackborderdetector") return BLACKBORDER;
@ -95,5 +95,5 @@ inline type stringToType(const QString& type)
else if (type == "flatbufServer") return FLATBUFSERVER;
else if (type == "protoServer") return PROTOSERVER;
else return INVALID;
}
}
};

View File

@ -143,7 +143,8 @@ PyObject* EffectModule::wrapSetColor(PyObject *self, PyObject *args)
if (PyArg_ParseTuple(args, "bbb", &color.red, &color.green, &color.blue))
{
getEffect()->_colors.fill(color);
getEffect()->setInput(getEffect()->_priority, getEffect()->_colors.toStdVector(), timeout, false);
QVector<ColorRgb> _cQV = getEffect()->_colors;
getEffect()->setInput(getEffect()->_priority, std::vector<ColorRgb>( _cQV.begin(), _cQV.end() ), timeout, false);
Py_RETURN_NONE;
}
return nullptr;
@ -161,7 +162,8 @@ PyObject* EffectModule::wrapSetColor(PyObject *self, PyObject *args)
{
char * data = PyByteArray_AS_STRING(bytearray);
memcpy(getEffect()->_colors.data(), data, length);
getEffect()->setInput(getEffect()->_priority, getEffect()->_colors.toStdVector(), timeout, false);
QVector<ColorRgb> _cQV = getEffect()->_colors;
getEffect()->setInput(getEffect()->_priority, std::vector<ColorRgb>( _cQV.begin(), _cQV.end() ), timeout, false);
Py_RETURN_NONE;
}
else

View File

@ -47,7 +47,7 @@ void V4L2Wrapper::setSignalThreshold(double redSignalThreshold, double greenSign
_grabber.setSignalThreshold( redSignalThreshold, greenSignalThreshold, blueSignalThreshold, 50);
}
void V4L2Wrapper::setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom)
void V4L2Wrapper::setCropping(unsigned cropLeft, unsigned cropRight, unsigned cropTop, unsigned cropBottom)
{
_grabber.setCropping(cropLeft, cropRight, cropTop, cropBottom);
}

View File

@ -40,9 +40,9 @@ void ComponentRegister::setNewComponentState(const hyperion::Components comp, co
}
}
void ComponentRegister::handleCompStateChangeRequest(const hyperion::Components comp, const bool activated)
void ComponentRegister::handleCompStateChangeRequest(const hyperion::Components comps, const bool activated)
{
if(comp == COMP_ALL && !_inProgress)
if(comps == COMP_ALL && !_inProgress)
{
_inProgress = true;
if(!activated && _prevComponentStates.empty())

View File

@ -87,7 +87,7 @@ private:
///
/// @return Zero on success else negative
///
virtual int write(const std::vector<ColorRgb>& ledValues);
virtual int write(const std::vector<ColorRgb>& ledValues) override;
///
/// Test if the device is a (or the) lightpack we are looking for

View File

@ -87,8 +87,7 @@ int LedDeviceFile::write(const std::vector<ColorRgb> & ledValues)
// get a precise timestamp as a string
const auto now = std::chrono::system_clock::now();
const auto nowAsTimeT = std::chrono::system_clock::to_time_t(now);
const auto nowMs = std::chrono::duration_cast<std::chrono::milliseconds>(
now.time_since_epoch()) % 1000;
const auto nowMs = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) % 1000;
const auto elapsedTimeMs = std::chrono::duration_cast<std::chrono::milliseconds>(now - lastWriteTime);

View File

@ -32,10 +32,13 @@ LedDevicePiBlaster::LedDevicePiBlaster(const QJsonObject &deviceConfig)
LedDevicePiBlaster::~LedDevicePiBlaster()
{
if (_fid != nullptr)
{
fclose(_fid);
_fid = nullptr;
}
}
bool LedDevicePiBlaster::init(const QJsonObject &deviceConfig)
{
bool isInitOK = LedDevice::init(deviceConfig);
@ -95,7 +98,6 @@ int LedDevicePiBlaster::open()
if (!QFile::exists(_deviceName))
{
errortext = QString ("The device (%1) does not yet exist.").arg(_deviceName);
}
else
{
@ -116,7 +118,6 @@ int LedDevicePiBlaster::open()
if ( retval < 0 )
{
this->setInError( errortext );
}
}
return retval;
@ -132,8 +133,8 @@ void LedDevicePiBlaster::close()
{
fclose(_fid);
_fid = nullptr;
}}
}
}
int LedDevicePiBlaster::write(const std::vector<ColorRgb> & ledValues)
{
@ -172,8 +173,8 @@ int LedDevicePiBlaster::write(const std::vector<ColorRgb> & ledValues)
// fprintf(_fid, "%i=%f\n", iPins[iPin], pwmDutyCycle);
if ( (fprintf(_fid, "%i=%f\n", i, pwmDutyCycle) < 0)
|| (fflush(_fid) < 0)) {
if ( (fprintf(_fid, "%i=%f\n", i, pwmDutyCycle) < 0) || (fflush(_fid) < 0))
{
if (_fid != nullptr)
{
fclose(_fid);

View File

@ -208,7 +208,8 @@ int main(int argc, char * argv[])
if (parser.isSet(argColor))
{
// TODO: make sure setColor accepts a QList<QColor>
connection.setColor(argColor.getColors(parser).toVector().toStdVector(), argPriority.getInt(parser), argDuration.getInt(parser));
QVector<QColor> _cQV = argColor.getColors(parser).toVector();
connection.setColor(std::vector<QColor>( _cQV.begin(), _cQV.end() ), argPriority.getInt(parser), argDuration.getInt(parser));
}
else if (parser.isSet(argImage))
{