Changeset 4393 for robolliurex

Timestamp:

Apr 21, 2017, 2:32:09 PM (3 years ago)

Author:

hectorgh

Message:

fixing udev rule

Location:

robolliurex/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• rsrc/10-robolliurex.rules (modified) (1 diff)
• rsrc/CMakeLists.txt (modified) (1 diff)
• src/robocore.cpp (modified) (5 diffs)
• src/robocore.h (modified) (2 diffs)
• src/robolliurex.h (modified) (1 diff)

robolliurex/trunk/fuentes/debian/changelog

@@ +1 @@
+robolliurex (1.2.1) xenial; urgency=medium
+
+  * Added proper udev rules to fix device permissions
+
+ -- Enrique Medina Gremaldos <quiqueiii@gmail.com>  Fri, 21 Apr 2017 13:50:44 +0200
+
+robolliurex (1.2.0) xenial; urgency=medium
+
+  * Using first available legousbtower[n] device found. Need a patched nqc for that.
+
+ -- Enrique Medina Gremaldos <quiqueiii@gmail.com>  Fri, 07 Apr 2017 14:55:20 +0200
+
 robolliurex (1.1.5) xenial; urgency=medium
 

robolliurex/trunk/fuentes/rsrc/10-robolliurex.rules

@@ -1 @@
-#Añadido por Robolinex
-KERNEL=="legousbtower0", MODE="0666", SYMLINK+="usb/lego0"
-#fin añadido por RoboLinex
+#Robolliurex lego rcx usb tower
+KERNEL=="legousbtower[0-9]*", MODE="0666"
+

robolliurex/trunk/fuentes/rsrc/CMakeLists.txt

@@ -18 +18 @@
 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/icon.robolliurex.svg DESTINATION share/icons/hicolor/scalable/apps/ RENAME robolliurex.svg)
 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/robolliurex.desktop DESTINATION share/applications/)
-install(FILES ${CMAKE_SOURCE_DIR}/rsrc/10-robolliurex.rules DESTINATION /lib/udeb/rules.d/)
+install(FILES ${CMAKE_SOURCE_DIR}/rsrc/10-robolliurex.rules DESTINATION /lib/udev/rules.d/)
 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/FIRM0309.lgo DESTINATION /lib/firmware/rcx/)
 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/FIRM0328.lgo DESTINATION /lib/firmware/rcx/)
-install(FILES ${CMAKE_SOURCE_DIR}/rsrc/fast0612.lgo DESTINATION /lib/firmware/rcx/)

robolliurex/trunk/fuentes/src/robocore.cpp

@@ -7 +7 @@
 
 #include <lsf-1.0/system.hpp>
+#include <lsf-1.0/filesystem.hpp>
 #include <gtk/gtk.h>
 
@@ -83 +84 @@
 
 RoboCore * RoboCore::singleton = nullptr;
-const char * RoboCore::comm_name[]={"/dev/ttyS0","/dev/ttyS1","usb"};
+string RoboCore::comm_name[]={"/dev/ttyS0","/dev/ttyS1","usb"};
 
 RoboCore::RoboCore() : Application("net.lliurex.robolliurex")
@@ -133 +134 @@
                 cout<<"* Found Lego USB tower"<<endl;
                 comm_port = RBC_PORT_USB;
+                
+                vector<string> towers = filesystem::List("/dev/usb/legousbtower*");
+                
+                if(towers.size()==0)
+                {
+                        cout<<"* Warning, Lego driver is loaded but something failed!"<<endl;
+                }
+                else
+                {
+                        string usbp="usb:"+towers[0];
+                        RoboCore::comm_name[comm_port]=usbp;
+                        cout<<"Using tower device: "<<towers[0]<<endl;
+                }
                 
         }
@@ -215 +229 @@
                 
         string cmd = string("nqc -S") + RoboCore::comm_name[RoboCore::GetCore()->comm_port] + " -firmware " + FIRM_PATH;
-        
+        cout<<cmd<<endl;
         fp = popen( cmd.c_str(),"r" );
         
@@ -283 +297 @@
         
         string cmd = string("nqc -S") + RoboCore::comm_name[RoboCore::GetCore()->comm_port] + " -raw 10";
-        
+        cout<<cmd<<endl;
         fp = popen( cmd.c_str(),"r" );
         

robolliurex/trunk/fuentes/src/robocore.h

@@ -13 +13 @@
 
 #ifdef LOCAL
-        #define FIRM_PATH "../rsrc/fast0612.lgo"
+        #define FIRM_PATH "../rsrc/FIRM0328.lgo"
 #else
-        #define FIRM_PATH "/lib/firmware/rcx/fast0612.lgo"
+        #define FIRM_PATH "/lib/firmware/rcx/FIRM0328.lgo"
 #endif
 
@@ -77 +77 @@
                                 
                                 public:
-                                        static const char * comm_name[];
+                                        static std::string comm_name[];
                                         int comm_port;
                                         bool usb_tower;

robolliurex/trunk/fuentes/src/robolliurex.h

@@ -8 +8 @@
 
 
-#define VERSION "1.1.5"
+#define VERSION "1.2.1"
 
 #define T(String) gettext(String)