added SimCommand backdoor to the gen plugin

lib/abstractpropertytype.h

@@ -459,7 +459,7 @@ class StringPropertyType: public AbstractPropertyType
 	StringPropertyType(std::string propertyName)
 		:AbstractPropertyType(propertyName)
 	{
-
+		setValue(std::string());
 	}
 
 	StringPropertyType(std::string propertyName, std::string val)

lib/vehicleproperty.cpp

@@ -350,10 +350,14 @@ AbstractPropertyType* VehicleProperty::getPropertyTypeForPropertyNameValue(Vehic
 
 bool VehicleProperty::registerProperty(VehicleProperty::Property name, VehicleProperty::PropertyTypeFactoryCallback factory)
 {
+	if(!contains(mCustomProperties,name))
+	{
+		mCustomProperties.push_back(name);
 
-	mCustomProperties.push_back(name);
+		return registerPropertyPriv(name, factory);
+	}
 
-	return registerPropertyPriv(name, factory);
+	return false;
 }
 
 bool VehicleProperty::registerPropertyPriv(VehicleProperty::Property name, VehicleProperty::PropertyTypeFactoryCallback factory)

plugins/cangenplugin/cangenplugin.cpp

@@ -54,6 +54,10 @@ CANGenPlugin::CANGenPlugin(AbstractRoutingEngine* re, const map<string, string>&
     AmbPluginImpl(re, config, parent),
     ws(new WebSockets(*this))
 {
+	addPropertySupport(Zone::None,[]()
+	{
+		return new SimCommand();
+	});
 }
 
 CANGenPlugin::~CANGenPlugin()
@@ -74,7 +78,19 @@ void CANGenPlugin::propertyChanged(AbstractPropertyType* value)
         return;
     if(!value->name.compare("MappingTable")) {
         parseMappingTable(value->toString());
-    }
+	}
+}
+
+AsyncPropertyReply *CANGenPlugin::setProperty(const AsyncSetPropertyRequest &request)
+{
+	if(request.property == "SimCommand")
+	{
+		std::string v = request.value->toString();
+
+		dataReceived(nullptr,v.c_str(),v.length());
+	}
+
+	return AmbPluginImpl::setProperty(request);
 }
 
 void CANGenPlugin::parseMappingTable(const std::string& table)
@@ -303,6 +319,12 @@ void CANGenPlugin::dataReceived(libwebsocket* socket, const char* data, size_t l
     json_object *nameobject = json_object_object_get(rootobject.get(),"name");
     json_object *transidobject = json_object_object_get(rootobject.get(),"transactionid");
 
+	if(!typeobject || !nameobject || !transidobject)
+	{
+		DebugOut(DebugOut::Warning)<<"Malformed json. aborting"<<endl;
+		return;
+	}
+
     string type = string(json_object_get_string(typeobject));
     string name = string(json_object_get_string(nameobject));
     string id;

plugins/cangenplugin/cangenplugin.h

@@ -102,6 +102,8 @@ class CANGenPlugin: public AmbPluginImpl, public CANObserver, public WebSocketsO
       */
     void propertyChanged(AbstractPropertyType* value);
 
+	AsyncPropertyReply* setProperty(const AsyncSetPropertyRequest &request);
+
     // from CANObserver
 public:
     /*!
@@ -299,6 +301,13 @@ class CANGenPlugin: public AmbPluginImpl, public CANObserver, public WebSocketsO
     interprocess_recursive_mutex mutex;
 };
 
+class SimCommand: public StringPropertyType
+{
+public:
+	SimCommand(): StringPropertyType("SimCommand") { }
+	SimCommand(std::string val) : StringPropertyType("SimCommand",val) { }
+};
+
 #endif // _CANGENPLUGINIMPL_H_
 
 /** @} */

plugins/cansimplugin/cansimplugin.h

@@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  * \brief CAN frames listener plug-in for the AMB CAN Simulator.
  *
  *  Listens on AMB notification for changes in supported properties using supportedChanged() callback. \n
- *  On startup it registers property called 'MappingTable' and all properties needed for simulation in intelPoc12.Dashboard and intelPoc16.HVAC applications. \n
+ *  On startup it registers property called 'MappingTable' and all properties needed for simulation in html5UI.Dashboard and html5UI.HVAC applications. \n
  *  Immediately after it registers own properties it will get first notification supportedChanged().\n
  *  On every notification from supportedChanged() CANSimPlugin goes through all supported properties in AMB, exclude those properties for which there are known sources in the AMB,\n
  *  assigns to each single property and zone some unique CAN Id(builds 'mapping table') and this 'mapping table' stores as JSON string and updates it as a 'MappingTable' property in AMB.\n

plugins/common/ambpluginimpl.cpp

@@ -118,7 +118,7 @@ PropertyList AmbPluginImpl::supported() const
 
 int AmbPluginImpl::supportedOperations() const
 {
-    return AbstractSource::Get /*| AbstractSource::Set*/;
+	return AbstractSource::Get | AbstractSource::Set;
 }
 
 void AmbPluginImpl::unsubscribeToPropertyChanges(const VehicleProperty::Property& property)

plugins/dbus/dbussignaller.h

@@ -103,7 +103,6 @@ class DBusSignaller
 				g_dbus_connection_emit_signal(signal.connection, NULL, signal.objectPath.c_str(), "org.freedesktop.DBus.Properties", signal.signalName.c_str(), g_variant_new("(sa{sv}as)",
 																																									 signal.interface.c_str(),
 																																						 &builder, NULL), &error);
-
 				if(error)
 				{
 					DebugOut(DebugOut::Error)<<error->message<<std::endl;

tests/CMakeLists.txt

@@ -1,3 +1,3 @@
-set(amb_tests amb-get amb-set amb-get-history amb-listen)
+set(amb_tests amb-get amb-set amb-get-history amb-listen gen-set)
 install (PROGRAMS ${amb_tests} DESTINATION bin)
 

tests/gen-set

@@ -0,0 +1,27 @@
+#!/usr/bin/python
+
+import dbus
+import sys
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument("property", help="{propertyToSet}")
+parser.add_argument("value", help="{value}")
+parser.add_argument("zone", help="{zone}")
+
+args = parser.parse_args()
+
+# "{'type' : 'method', 'name' : 'set', 'transactionid' : 'meh', 
+# 'data' : [{'interface' : 'vcan0', 'property' : 'VehicleSpeed', 'value' : '33', 'zone' : '0' }]}"
+
+realValue = "{'type' : 'method', 'name' : 'set', 'transactionid' : 'meh', 'data' : [{'interface' : 'vcan0', 'property' : '" + args.property + "', 'value' : '" + args.value + "', 'zone' : " + args.zone + " }]}"
+
+bus = dbus.SystemBus()
+managerObject = bus.get_object("org.automotive.message.broker", "/");
+managerInterface = dbus.Interface(managerObject, "org.automotive.Manager")
+
+object = managerInterface.FindObjectForZone("SimCommand", 0)
+
+propertiesInterface = dbus.Interface(bus.get_object("org.automotive.message.broker", object),"org.freedesktop.DBus.Properties")
+propertiesInterface.Set("org.automotive.SimCommand", "SimCommand", realValue)
+print "Success!"