Commit c8048d72 authored by Erik Andresen's avatar Erik Andresen

Initial support for Knobloch education line:

-Cross Roads
-Trafic Lights
-Signal
parent 673ea3e7
......@@ -13,7 +13,7 @@ SET(CPACK_PACKAGE_VENDOR "Erik Andresen")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "5")
SET(CPACK_PACKAGE_VERSION_PATCH "3")
SET(CPACK_PACKAGE_VERSION_PATCH "4")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "libroboint ${CPACK_VERSION_MAJOR}.${CPACK_VERSION_MINOR}")
SET(CPACK_SOURCE_STRIP_FILES "")
SET(CPACK_GENERATOR "TGZ")
......
README libroboint
==========
libroboint - Open Source version of the fischertechnik ROBO Interface Library for Unix like systems - Version 0.5.3
libroboint - Open Source version of the fischertechnik ROBO Interface Library for Unix like systems - Version 0.5.4
The goal is to create a library that is fully compatible with the ftlib by knobloch eletronic.
......@@ -15,7 +15,7 @@ Also included is an Interface Diagnose utility. See section Interface Diagnose
Download:
<---------->
Download: https://github.com/nxdefiant/libroboint/archive/0.5.3.zip
Download: https://github.com/nxdefiant/libroboint/archive/0.5.4.zip
Git: https://github.com/nxdefiant/libroboint
......@@ -109,6 +109,7 @@ LGPL, see license.txt
Changes:
<---------->
0.5.4: -Added support for Knobloch education line Cross Roads, Trafic Lights & Signal
0.5.3: -Added experimental support for Robo Connect Box
-Updated java bindings to jna 4.0.0
0.5.2: -Added experimental support for Robo LT Controller
......
libroboint (0.5.4) unstable; urgency=low
* Updated to 0.5.4
-- Erik Andresen <erik@Blackstar.vontaene.all> Sat, 15 Jun 2019 18:24:53 +0200
libroboint (0.5.2-1) unstable; urgency=low
* Updated to 0.5.2
......
usr/include/*
usr/lib/lib*.a
usr/lib/lib*.so
usr/lib/pkgconfig/*
usr/lib/*.la
usr/share/pkgconfig/*
......@@ -249,7 +249,7 @@ class DiagForm(QtGui.QMainWindow, Thread):
typ = self.pInterface.GetDeviceType()
if typ == RoboInterface.FT_INTELLIGENT_IF_SLAVE:
self.ui.tabWidget.setTabEnabled(1, 1)
elif typ in [RoboInterface.FT_ROBO_IF_USB, RoboInterface.FT_ROBO_IF_OVER_RF, RoboInterface.FT_ROBO_RF_DATA_LINK]:
elif typ in [RoboInterface.FT_ROBO_IF_USB, RoboInterface.FT_ROBO_IF_OVER_RF, RoboInterface.FT_ROBO_RF_DATA_LINK, RoboInterface.EDU_LINE_CROSSROADS]:
self.ui.tabWidget.setTabEnabled(1, 1)
self.ui.tabWidget.setTabEnabled(2, 1)
self.ui.tabWidget.setTabEnabled(3, 1)
......
#!/usr/bin/python
from distutils.core import setup
setup(name="ftdiagnose", version="0.4.2", py_modules=["ftdiagnose", "ftdiagnose_ui", "ftdiagnose_open_ui"])
setup(name="ftdiagnose", version="0.5.4", py_modules=["ftdiagnose", "ftdiagnose_ui", "ftdiagnose_open_ui"])
......@@ -44,9 +44,9 @@
* The new ROBO TX Controller is not supported!
*
* \section dl_sec Download
* Current Version: 0.5.3
* Current Version: 0.5.4
*
* Download: https://gitlab.com/Humpelstilzchen/libroboint/-/archive/0.5.3/libroboint-0.5.3.zip \n
* Download: https://gitlab.com/Humpelstilzchen/libroboint/-/archive/0.5.4/libroboint-0.5.4.zip \n
* Git: https://gitlab.com/Humpelstilzchen/libroboint \n
* A <a href="http://ros.org">ROS</a>-Package with basic support of the Navigation Stack is available: https://defiant.homedns.org/gitweb/?p=ros_roboint.git
*
......@@ -119,6 +119,8 @@
*
*
* \section changes_sec Changes
* - 0.5.4:
* - Added support for Knobloch education line Cross Roads, Trafic Lights & Signal
* - 0.5.3:
* - Added experimental support for Robo Connect Box
* - Updated java bindings to jna 4.0.0
......@@ -229,6 +231,9 @@
#define EXT_IF_PRODUCT_ID 0x2
#define RF_DATA_LINK_PRODUCT_ID 0x3
#define LT_IF_PRODUCT_ID 0xa
#define EDU_LINE_CROSS_ROADS_PRODUCT_ID 0x6
#define EDU_LINE_TRAFFIC_LIGHTS_PRODUCT_ID 0x7
#define EDU_LINE_SIGNAL_PRODUCT_ID 0x8
#define ROBO_CONNECT_BOX_PRODUCT_ID 0x4
#define ABF_IF_COMPLETE 0x8b // 0xf2
#define ABF_IF_COMPLETE_NUM_WRITE 32
......@@ -437,6 +442,12 @@ static int FtproductIDToInterfaceID(int iProductID)
return FT_ROBO_LT_CONTROLLER;
case ROBO_CONNECT_BOX_PRODUCT_ID:
return ROBO_CONNECT_BOX;
case EDU_LINE_CROSS_ROADS_PRODUCT_ID:
return EDU_LINE_CROSSROADS;
case EDU_LINE_TRAFFIC_LIGHTS_PRODUCT_ID:
return EDU_LINE_TRAFFICLIGHTS;
case EDU_LINE_SIGNAL_PRODUCT_ID:
return EDU_LINE_SIGNAL;
}
return 0;
......@@ -456,6 +467,12 @@ static int FtInterfaceIDToProductID(int InterfaceID)
return LT_IF_PRODUCT_ID;
case ROBO_CONNECT_BOX:
return ROBO_CONNECT_BOX_PRODUCT_ID;
case EDU_LINE_CROSSROADS:
return EDU_LINE_CROSS_ROADS_PRODUCT_ID;
case EDU_LINE_TRAFFICLIGHTS:
return EDU_LINE_TRAFFIC_LIGHTS_PRODUCT_ID;
case EDU_LINE_SIGNAL:
return EDU_LINE_SIGNAL_PRODUCT_ID;
}
return 0;
......@@ -698,6 +715,15 @@ long int GetFtDeviceTypeString(FT_HANDLE hFt, char *dest, int len)
case FT_ROBO_LT_CONTROLLER:
strncpy(dest, "Robo LT Controller", len);
break;
case EDU_LINE_CROSSROADS:
strncpy(dest, "CrossRoads - Education-Line", len);
break;
case EDU_LINE_TRAFFICLIGHTS:
strncpy(dest, "TrafficLights - Education-Line", len);
break;
case EDU_LINE_SIGNAL:
strncpy(dest, "Signal - Education-Line", len);
break;
case ROBO_CONNECT_BOX:
strncpy(dest, "Robo Connect Box", len);
break;
......@@ -875,6 +901,17 @@ static void *FtThread(FT_HANDLE hFt)
area->TransferAktiv = 0;
}
break;
case EDU_LINE_CROSSROADS:
case EDU_LINE_TRAFFICLIGHTS:
out[0] = 0x8b;
num_write = 32;
num_read = 42;
break;
case EDU_LINE_SIGNAL:
out[0] = 0x8b;
num_write = 32;
num_read = 0;
break;
}
// Setup timer
......
......@@ -631,8 +631,15 @@ char IsFtInterfaceConnected(FT_HANDLE hFt);
#define FT_ROBO_IF_OVER_RF 80 // FT-Robo Interface connect over RF-Data-Link
#define FT_ROBO_IO_EXTENSION 90 // FT-Robo I/O-Extension
#define FT_ROBO_LT_CONTROLLER 91 // FT-Robo LT Controller
#define ROBO_CONNECT_BOX 200 // Robo-Connect-Box (USB-Product for old Interfaces with parallel- or serial- port)
#define FT_ROBO_RF_DATA_LINK 110 // FT-Robo RF Data Link
#define FT_SOUND_AND_LIGHTS 120 // FT-Sound + Lights Module
#define ROBO_CONNECT_BOX 200 // Robo-Connect-Box (USB-Product for old Interfaces with parallel- or serial- port)
#define EDU_LINE_MODULE 300 // education line module
#define EDU_LINE_CROSSROADS 301 // education line - Module: CrossRoads (www.knobloch-gmbh.de)
#define EDU_LINE_TRAFFICLIGHTS 302 // education line - Module: Trafic Lights
#define EDU_LINE_SIGNAL 303 // education line - Module: Signal
#define EDU_LINE_EASY_PH 304 // education line - Module: easy pH
#define EDU_LINE_LIFT_01 305 // education line - Module: Lift (Aufzug)
#define FT_MAX_TYP_NUMBER 999 // Max Typ Number
......
......@@ -189,6 +189,10 @@ class RoboInterface:
FT_ROBO_IF_OVER_RF -- Robo Interface over RF Module
FT_ROBO_IO_EXTENSION -- Robo IO Extension
FT_ROBO_RF_DATA_LINK -- Robo RF Data Link
ROBO_CONNECT_BOX -- Robo-Connect-Box (USB-Product for old Interfaces with parallel- or serial- port)
EDU_LINE_CROSSROADS -- Education-Line "CrossRoads"
EDU_LINE_TRAFFICLIGHTS -- Education-Line "Trafic Lights"
EDU_LINE_SIGNAL -- Education-Line "Signal"
Public module variables:
......@@ -209,6 +213,9 @@ class RoboInterface:
FT_ROBO_LT_CONTROLLER = 91
FT_ROBO_RF_DATA_LINK = 110
ROBO_CONNECT_BOX = 200
EDU_LINE_CROSSROADS = 301
EDU_LINE_TRAFFICLIGHTS = 302
EDU_LINE_SIGNAL = 303
# Distance Input settings
kTolerance = (20, 20)
......
......@@ -2,5 +2,4 @@
from distutils.core import setup
setup(name="robointerface", version="0.5.0", py_modules=["robointerface"])
setup(name="robointerface", version="0.5.4", py_modules=["robointerface"])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment