Commit 4e965b610a44dded05b123dc371ddff0ce1fb215

dss-socket build fixes
config.h
(0 / 24)
  
1#ifndef DIGITAL_STROM_SERVER_CONFIG_H
2#define DIGITAL_STROM_SERVER_CONFIG_H
3
4#define DSS_VERSION "0.8-dev"
5
6/* SpiderMonkey API header */
7#define HAVE_STDINT
8/* #undef HAVE_MOZJS_JSAPI_H */
9/* #undef HAVE_JS_JSAPI_H */
10#define HAVE_JSAPI_H
11#define HAVE_LIBICAL_ICAL_H
12/* #undef HAVE_ICAL_H */
13/* #undef HAVE_DNS_SD */
14#define HAVE_AVAHI
15#define WITH_SIM
16#define WITH_TESTS
17#define WITH_DATADIR "/usr/local/share/dss/data"
18#define WITH_CONFIGDIR "/usr/local/share/dss/data"
19#define WITH_WEBROOTDIR "/usr/local/share/dss/data/webroot"
20#define WITH_JSLOGDIR "/usr/local/share/dss/data/logs"
21#define WITH_BONJOUR
22/* #undef WITH_GCOV */
23
24#endif /* DIGITAL_STROM_SERVER_CONFIG_H */
core/ds485-socket/CMakeLists.txt
(1 / 2)
  
1add_library(ds485-Socket ds485Connection.c ds485RawFunction-old.c ds485RawFunction.c
2 ds485-socket.cpp)
1add_library(ds485-socket ds485Connection.c ds485RawFunction-old.c ds485RawFunction.c ds485-socket.cpp)
core/dss.cpp
(1 / 1)
  
9292const char* JSLogDirectory = "data/logs/";
9393#endif
9494
95 dsid_t NullDSID(0,0);
95const dsid_t NullDSID(0,0);
9696
9797 DSS::DSS()
9898 {
core/web/handler/eventrequesthandler.cpp
(1 / 1)
  
5959 for(std::vector<std::string>::iterator iParam = params.begin(), e = params.end();
6060 iParam != e; ++iParam)
6161 {
62 std::vector<std::string> nameValue = dss::splitStrin g(*iParam, '=');
62 std::vector<std::string> nameValue = dss::splitString(*iParam, '=');
6363 if(nameValue.size() == 2) {
6464 dss::Logger::getInstance()->log("WebServer::handleEventCall: Got parameter '" + nameValue[0] + "'='" + nameValue[1] + "'");
6565 evt->setProperty(nameValue[0], nameValue[1]);
data/config.xml
(1 / 4)
  
1111 <value>8442</value>
1212 </property>
1313 <property name="ip" type="string">
14 <value>10.0.0.111</value>
14 <value>localhost</value>
1515 </property>
1616 </property>
1717 <!--property name="connection_1">
2727 </property-->
2828 </property>
2929
30 <!--property name="subsystems/DS485Proxy/rs485devicename" type="string">
31 <value>/dev/ttyUSB0</value>
32 </property-->
3330 <property name="subsystems/DSSim/js-devices">
3431 <property name="example">
3532 <property name="script-file" type="string">