Merge branch 'extendscale' into development

config/Windows/productionroaster.xml

@@ -628,6 +628,8 @@
 				scale.setParity(driverReference.parity);
 				scale.setStopBits(driverReference.stopbits);
 				scale.setFlowControl(driverReference.flowcontrol);
+				scale.setWeighCommand(driverReference.weighcommand);
+				scale.setCommandTerminator(driverReference.commandterminator);
 				scale.open(3);
 				window.scales.push(scale);
 			}

src/moc_scale.cpp

@@ -22,7 +22,7 @@ static const uint qt_meta_data_SerialScale[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       4,   14, // methods
+       6,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -35,7 +35,9 @@ static const uint qt_meta_data_SerialScale[] = {
  // slots: signature, parameters, type, tag, flags
       60,   12,   12,   12, 0x0a,
       67,   12,   12,   12, 0x0a,
-      75,   12,   12,   12, 0x08,
+      83,   75,   12,   12, 0x0a,
+     119,  108,   12,   12, 0x0a,
+     149,   12,   12,   12, 0x08,
 
        0        // eod
 };
@@ -43,7 +45,9 @@ static const uint qt_meta_data_SerialScale[] = {
 static const char qt_meta_stringdata_SerialScale[] = {
     "SerialScale\0\0weight,unit\0"
     "newMeasurement(double,Units::Unit)\0"
-    "tare()\0weigh()\0dataAvailable()\0"
+    "tare()\0weigh()\0command\0setWeighCommand(QString)\0"
+    "terminator\0setCommandTerminator(QString)\0"
+    "dataAvailable()\0"
 };
 
 void SerialScale::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -55,7 +59,9 @@ void SerialScale::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         case 0: _t->newMeasurement((*reinterpret_cast< double(*)>(_a[1])),(*reinterpret_cast< Units::Unit(*)>(_a[2]))); break;
         case 1: _t->tare(); break;
         case 2: _t->weigh(); break;
-        case 3: _t->dataAvailable(); break;
+        case 3: _t->setWeighCommand((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 4: _t->setCommandTerminator((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 5: _t->dataAvailable(); break;
         default: ;
         }
     }
@@ -93,9 +99,9 @@ int SerialScale::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 4)
+        if (_id < 6)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 4;
+        _id -= 6;
     }
     return _id;
 }

src/moc_typica.cpp

@@ -7694,10 +7694,10 @@ static const uint qt_meta_data_SerialScaleConfWidget[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       5,   14, // methods
+       7,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
-       1,   39, // constructors
+       1,   49, // constructors
        0,       // flags
        0,       // signalCount
 
@@ -7707,9 +7707,11 @@ static const uint qt_meta_data_SerialScaleConfWidget[] = {
       86,   80,   22,   22, 0x08,
      104,   80,   22,   22, 0x08,
      127,   80,   22,   22, 0x08,
+     155,  147,   22,   22, 0x08,
+     194,  183,   22,   22, 0x08,
 
  // constructors: signature, parameters, type, tag, flags
-     159,  147,   22,   22, 0x0e,
+     239,  227,   22,   22, 0x0e,
 
        0        // eod
 };
@@ -7719,7 +7721,10 @@ static const char qt_meta_stringdata_SerialScaleConfWidget[] = {
     "updatePort(QString)\0rate\0"
     "updateBaudRate(QString)\0index\0"
     "updateParity(int)\0updateFlowControl(int)\0"
-    "updateStopBits(int)\0model,index\0"
+    "updateStopBits(int)\0command\0"
+    "updateWeighCommand(QString)\0terminator\0"
+    "updateCommandTerminator(QString)\0"
+    "model,index\0"
     "SerialScaleConfWidget(DeviceTreeModel*,QModelIndex)\0"
 };
 
@@ -7739,6 +7744,8 @@ void SerialScaleConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c
         case 2: _t->updateParity((*reinterpret_cast< int(*)>(_a[1]))); break;
         case 3: _t->updateFlowControl((*reinterpret_cast< int(*)>(_a[1]))); break;
         case 4: _t->updateStopBits((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 5: _t->updateWeighCommand((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 6: _t->updateCommandTerminator((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         default: ;
         }
     }
@@ -7776,9 +7783,9 @@ int SerialScaleConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 5)
+        if (_id < 7)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 5;
+        _id -= 7;
     }
     return _id;
 }

src/scale.cpp

@@ -1,5 +1,5 @@
 /*1008:*/
-#line 131 "./scales.w"
+#line 135 "./scales.w"
 
 #include "scale.h"
 #include <QStringList> 
@@ -11,7 +11,7 @@ connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
 /*:1008*//*1009:*/
-#line 149 "./scales.w"
+#line 153 "./scales.w"
 
 void SerialScale::dataAvailable()
 {
@@ -25,7 +25,7 @@ responseBuffer.clear();
 else
 {
 /*1010:*/
-#line 189 "./scales.w"
+#line 193 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
 if(responseParts.size()> 2)
@@ -35,26 +35,26 @@ responseParts.replace(0,QString("-%1").arg(responseParts[0]));
 }
 double weight= responseParts[0].toDouble();
 Units::Unit unit= Units::Unitless;
-if(responseParts[1]=="lb")
+if(responseParts[1].compare("lb",Qt::CaseInsensitive)==0)
 {
 unit= Units::Pound;
 }
-else if(responseParts[1]=="kg")
+else if(responseParts[1].compare("kg",Qt::CaseInsensitive)==0)
 {
 unit= Units::Kilogram;
 }
-else if(responseParts[1]=="g")
+else if(responseParts[1].compare("g",Qt::CaseInsensitive)==0)
 {
 unit= Units::Gram;
 }
-else if(responseParts[1]=="oz")
+else if(responseParts[1].compare("oz",Qt::CaseInsensitive)==0)
 {
 unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
 /*:1010*/
-#line 161 "./scales.w"
+#line 165 "./scales.w"
 
 responseBuffer.clear();
 }
@@ -62,7 +62,7 @@ responseBuffer.clear();
 }
 
 /*:1009*//*1011:*/
-#line 220 "./scales.w"
+#line 224 "./scales.w"
 
 void SerialScale::tare()
 {
@@ -71,7 +71,29 @@ write("!KT\x0D");
 
 void SerialScale::weigh()
 {
-write("!KP\x0D");
+
+write(weighCommand+commandTerminator);
+}
+
+void SerialScale::setWeighCommand(const QString&command)
+{
+weighCommand= command.toAscii();
+}
+
+void SerialScale::setCommandTerminator(const QString&terminator)
+{
+if(terminator=="CRLF")
+{
+commandTerminator= "\x0D\x0A";
+}
+else if(terminator=="CR")
+{
+commandTerminator= "\x0D";
+}
+else if(terminator=="LF")
+{
+commandTerminator= "\x0A";
+}
 }
 
 /*:1011*/

src/scales.w

@@ -115,12 +115,16 @@ class SerialScale : public QextSerialPort
 	public slots:
 		void tare();
 		void weigh();
+		void setWeighCommand(const QString &command);
+		void setCommandTerminator(const QString &terminator);
 	signals:
 		void newMeasurement(double weight, Units::Unit unit);
 	private slots:
 		void dataAvailable();
 	private:
 		QByteArray responseBuffer;
+		QByteArray weighCommand;
+		QByteArray commandTerminator;
 };
 
 #endif
@@ -195,19 +199,19 @@ if(responseParts.size() > 2)
 }
 double weight = responseParts[0].toDouble();
 Units::Unit unit = Units::Unitless;
-if(responseParts[1] == "lb")
+if(responseParts[1].compare("lb", Qt::CaseInsensitive) == 0)
 {
 	unit = Units::Pound;
 }
-else if(responseParts[1] == "kg")
+else if(responseParts[1].compare("kg", Qt::CaseInsensitive) == 0)
 {
 	unit = Units::Kilogram;
 }
-else if(responseParts[1] == "g")
+else if(responseParts[1].compare("g", Qt::CaseInsensitive) == 0)
 {
 	unit = Units::Gram;
 }
-else if(responseParts[1] == "oz")
+else if(responseParts[1].compare("oz", Qt::CaseInsensitive) == 0)
 {
 	unit = Units::Ounce;
 }
@@ -225,7 +229,29 @@ void SerialScale::tare()
 
 void SerialScale::weigh()
 {
-	write("!KP\x0D");
+	//write("!KP\x0D");
+	write(weighCommand + commandTerminator);
+}
+
+void SerialScale::setWeighCommand(const QString &command)
+{
+	weighCommand = command.toAscii();
+}
+
+void SerialScale::setCommandTerminator(const QString &terminator)
+{
+	if(terminator == "CRLF")
+	{
+		commandTerminator = "\x0D\x0A";
+	}
+	else if(terminator == "CR")
+	{
+		commandTerminator = "\x0D";
+	}
+	else if(terminator == "LF")
+	{
+		commandTerminator = "\x0A";
+	}
 }
 
 @ This must be available to the host environment.
@@ -380,12 +406,16 @@ class SerialScaleConfWidget : public BasicDeviceConfigurationWidget
 		void updateParity(int index);
 		void updateFlowControl(int index);
 		void updateStopBits(int index);
+		void updateWeighCommand(const QString &command);
+		void updateCommandTerminator(const QString &terminator);
 	private:
 		PortSelector *port;
 		BaudSelector *baud;
 		ParitySelector *parity;
 		FlowSelector *flow;
 		StopSelector *stop;
+		QLineEdit *weighcommand;
+		QComboBox *commandterminator;
 };
 
 @ This is very similar to other configuration widgets.
@@ -395,7 +425,8 @@ SerialScaleConfWidget::SerialScaleConfWidget(DeviceTreeModel *model,
                                              const QModelIndex &index)
 : BasicDeviceConfigurationWidget(model, index),
   port(new PortSelector), baud(new BaudSelector), parity(new ParitySelector),
-  flow(new FlowSelector), stop(new StopSelector)
+  flow(new FlowSelector), stop(new StopSelector),
+  weighcommand(new QLineEdit("!KP")), commandterminator(new QComboBox)
 {
 	QFormLayout *layout = new QFormLayout;
 	layout->addRow(tr("Port:"), port);
@@ -415,6 +446,16 @@ SerialScaleConfWidget::SerialScaleConfWidget(DeviceTreeModel *model,
 	layout->addRow(tr("Stop Bits:"), stop);
 	connect(stop, SIGNAL(currentIndexChanged(int)),
 	        this, SLOT(updateStopBits(int)));
+	layout->addRow(tr("Weigh Command:"), weighcommand);
+	connect(weighcommand, SIGNAL(textChanged(QString)),
+	        this, SLOT(updateWeighCommand(QString)));
+	commandterminator->addItem("CRLF");
+	commandterminator->addItem("CR");
+	commandterminator->addItem("LF");
+	layout->addRow(tr("Command Terminator:"), commandterminator);
+	connect(commandterminator, SIGNAL(currentIndexChanged(QString)),
+	        this, SLOT(updateCommandTerminator(QString)));
+	
 	@<Get device configuration data for current node@>@;
 	for(int i = 0; i < configData.size(); i++)
 	{
@@ -448,12 +489,23 @@ SerialScaleConfWidget::SerialScaleConfWidget(DeviceTreeModel *model,
 		{
 			stop->setCurrentIndex(stop->findData(node.attribute("value")));
 		}
+		else if(node.attribute("name") == "weighcommand")
+		{
+			weighcommand->setText(node.attribute("value"));
+		}
+		else if(node.attribute("name") == "commandterminator")
+		{
+			commandterminator->setCurrentIndex(
+				commandterminator->findText(node.attribute("value")));
+		}
 	}
 	updatePort(port->currentText());
 	updateBaudRate(baud->currentText());
 	updateParity(parity->currentIndex());
 	updateFlowControl(flow->currentIndex());
 	updateStopBits(stop->currentIndex());
+	updateWeighCommand(weighcommand->text());
+	updateCommandTerminator(commandterminator->currentText());
 	setLayout(layout);
 }
 
@@ -485,6 +537,16 @@ void SerialScaleConfWidget::updateStopBits(int index)
 	updateAttribute("stopbits", stop->itemData(index).toString());
 }
 
+void SerialScaleConfWidget::updateWeighCommand(const QString &command)
+{
+	updateAttribute("weighcommand", command);
+}
+
+void SerialScaleConfWidget::updateCommandTerminator(const QString &terminator)
+{
+	updateAttribute("commandterminator", terminator);
+}
+
 @ The configuration widget is registered with the configuration system.
 
 @<Register device configuration widgets@>=