summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJonathan Bauer2011-03-24 11:45:14 +0100
committerJonathan Bauer2011-03-24 11:45:14 +0100
commit1f53d9073a713d50ecdac289c61a9b7f638efd12 (patch)
tree0d49e97bf5df9cc3cb771357d72e164887d78e08 /src/main.cpp
parenttimestamps for debug console (diff)
downloadfbgui-1f53d9073a713d50ecdac289c61a9b7f638efd12.tar.gz
fbgui-1f53d9073a713d50ecdac289c61a9b7f638efd12.tar.xz
fbgui-1f53d9073a713d50ecdac289c61a9b7f638efd12.zip
serial path configurable
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 0e3ce53..1fa82ee 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -50,14 +50,17 @@ int main(int argc, char *argv[])
{
switch(opt)
{
+ case 'c':
+ clOpts.insert("configFile", optarg);
+ break;
case 'u':
clOpts.insert("url", optarg);
break;
case 'd':
clOpts.insert("downloadDir", optarg);
break;
- case 'c':
- clOpts.insert("configFile", optarg);
+ case 's':
+ clOpts.insert("serialLocation", optarg);
break;
case 't':
clOpts.insert("trigger", optarg);
@@ -136,15 +139,14 @@ int main(int argc, char *argv[])
fileToTriggerURL = DEFAULT_FILE_TRIGGER;
// set serial location
- if (clOpts.contains("serial"))
- serialLocation = clOpts.value("serial");
+ if (clOpts.contains("serialLocation"))
+ serialLocation = clOpts.value("serialLocation");
else if (confFileSettings.contains("default/serial_location"))
serialLocation = confFileSettings.value("default/serial_location").toString();
else
serialLocation = QString("/serial");
// basic std out engine is ugly... not yet initialised so using qDebug
-
qDebug() << "************* CONFIG INFO *************";
qDebug() << "configFilePath: " << configFilePath;
qDebug() << "baseURL: " << baseURL;