From: Kevron Rees Date: Fri, 12 Jul 2013 05:43:39 +0000 (-0700) Subject: some additions to bluemonkey X-Git-Tag: accepted/tizen/20131016.224205~65^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6603d64711bbc8d986a983d73f663687358e178c;p=profile%2Fivi%2Fautomotive-message-broker.git some additions to bluemonkey --- diff --git a/ambd.conf.upstart b/ambd.conf.upstart index 7e7d00b..ebec005 100755 --- a/ambd.conf.upstart +++ b/ambd.conf.upstart @@ -19,8 +19,6 @@ expect fork # Run before process pre-start script - exec hciconfig hci0 up - exec /etc/init.d/gpsd start end script # Start the process diff --git a/lib/abstractpropertytype.h b/lib/abstractpropertytype.h index 9112f53..c5c1095 100644 --- a/lib/abstractpropertytype.h +++ b/lib/abstractpropertytype.h @@ -46,10 +46,12 @@ enum Type { Center = 1 << 5 }; -Zone::Type FrontRight = Zone::Type(Front | Right); -Zone::Type FrontLeft = Zone::Type(Front | Left); -Zone::Type MiddleRight = Zone::Type(Middle | Right); -Zone::Type MiddleLeft = Zone::Type(Middle | Left); +const Zone::Type FrontRight = Zone::Type(Front | Right); +const Zone::Type FrontLeft = Zone::Type(Front | Left); +const Zone::Type MiddleRight = Zone::Type(Middle | Right); +const Zone::Type MiddleLeft = Zone::Type(Middle | Left); +const Zone::Type RearRight = Zone::Type(Rear | Right); +const Zone::Type RearLeft = Zone::Type(Rear| Left); typedef std::list ZoneList; diff --git a/plugins/bluemonkey/bluemonkey.cpp b/plugins/bluemonkey/bluemonkey.cpp index 8c8a9c1..e04c4f5 100644 --- a/plugins/bluemonkey/bluemonkey.cpp +++ b/plugins/bluemonkey/bluemonkey.cpp @@ -202,7 +202,8 @@ void BluemonkeySink::reloadEngine() QScriptValue qtimerClass = engine->scriptValueFromQMetaObject(); engine->globalObject().setProperty("QTimer", qtimerClass); - + QScriptValue ircValue = engine->newQObject(irc); + engine->globalObject().setProperty("irc", ircValue); loadConfig(configuration["config"].c_str()); } @@ -211,7 +212,11 @@ void BluemonkeySink::writeProgram(QString program) { QFile file(configuration["customPrograms"].c_str()); - file.open(QIODevice::ReadWrite | QIODevice::Append); + if(!file.open(QIODevice::ReadWrite | QIODevice::Append)) + { + DebugOut(DebugOut::Error)<<"failed to open file: "<