Changeset 4393 for robolliurex
- Timestamp:
- Apr 21, 2017, 2:32:09 PM (4 years ago)
- Location:
- robolliurex/trunk/fuentes
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
robolliurex/trunk/fuentes/debian/changelog
r4028 r4393 1 robolliurex (1.2.1) xenial; urgency=medium 2 3 * Added proper udev rules to fix device permissions 4 5 -- Enrique Medina Gremaldos <quiqueiii@gmail.com> Fri, 21 Apr 2017 13:50:44 +0200 6 7 robolliurex (1.2.0) xenial; urgency=medium 8 9 * Using first available legousbtower[n] device found. Need a patched nqc for that. 10 11 -- Enrique Medina Gremaldos <quiqueiii@gmail.com> Fri, 07 Apr 2017 14:55:20 +0200 12 1 13 robolliurex (1.1.5) xenial; urgency=medium 2 14 -
robolliurex/trunk/fuentes/rsrc/10-robolliurex.rules
r89 r4393 1 # Añadido por Robolinex2 KERNEL=="legousbtower 0", MODE="0666", SYMLINK+="usb/lego0"3 #fin añadido por RoboLinex 1 #Robolliurex lego rcx usb tower 2 KERNEL=="legousbtower[0-9]*", MODE="0666" 3 -
robolliurex/trunk/fuentes/rsrc/CMakeLists.txt
r4028 r4393 18 18 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/icon.robolliurex.svg DESTINATION share/icons/hicolor/scalable/apps/ RENAME robolliurex.svg) 19 19 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/robolliurex.desktop DESTINATION share/applications/) 20 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/10-robolliurex.rules DESTINATION /lib/ude b/rules.d/)20 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/10-robolliurex.rules DESTINATION /lib/udev/rules.d/) 21 21 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/FIRM0309.lgo DESTINATION /lib/firmware/rcx/) 22 22 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/FIRM0328.lgo DESTINATION /lib/firmware/rcx/) 23 install(FILES ${CMAKE_SOURCE_DIR}/rsrc/fast0612.lgo DESTINATION /lib/firmware/rcx/) -
robolliurex/trunk/fuentes/src/robocore.cpp
r89 r4393 7 7 8 8 #include <lsf-1.0/system.hpp> 9 #include <lsf-1.0/filesystem.hpp> 9 10 #include <gtk/gtk.h> 10 11 … … 83 84 84 85 RoboCore * RoboCore::singleton = nullptr; 85 const char *RoboCore::comm_name[]={"/dev/ttyS0","/dev/ttyS1","usb"};86 string RoboCore::comm_name[]={"/dev/ttyS0","/dev/ttyS1","usb"}; 86 87 87 88 RoboCore::RoboCore() : Application("net.lliurex.robolliurex") … … 133 134 cout<<"* Found Lego USB tower"<<endl; 134 135 comm_port = RBC_PORT_USB; 136 137 vector<string> towers = filesystem::List("/dev/usb/legousbtower*"); 138 139 if(towers.size()==0) 140 { 141 cout<<"* Warning, Lego driver is loaded but something failed!"<<endl; 142 } 143 else 144 { 145 string usbp="usb:"+towers[0]; 146 RoboCore::comm_name[comm_port]=usbp; 147 cout<<"Using tower device: "<<towers[0]<<endl; 148 } 135 149 136 150 } … … 215 229 216 230 string cmd = string("nqc -S") + RoboCore::comm_name[RoboCore::GetCore()->comm_port] + " -firmware " + FIRM_PATH; 217 231 cout<<cmd<<endl; 218 232 fp = popen( cmd.c_str(),"r" ); 219 233 … … 283 297 284 298 string cmd = string("nqc -S") + RoboCore::comm_name[RoboCore::GetCore()->comm_port] + " -raw 10"; 285 299 cout<<cmd<<endl; 286 300 fp = popen( cmd.c_str(),"r" ); 287 301 -
robolliurex/trunk/fuentes/src/robocore.h
r4028 r4393 13 13 14 14 #ifdef LOCAL 15 #define FIRM_PATH "../rsrc/ fast0612.lgo"15 #define FIRM_PATH "../rsrc/FIRM0328.lgo" 16 16 #else 17 #define FIRM_PATH "/lib/firmware/rcx/ fast0612.lgo"17 #define FIRM_PATH "/lib/firmware/rcx/FIRM0328.lgo" 18 18 #endif 19 19 … … 77 77 78 78 public: 79 static const char *comm_name[];79 static std::string comm_name[]; 80 80 int comm_port; 81 81 bool usb_tower; -
robolliurex/trunk/fuentes/src/robolliurex.h
r4028 r4393 8 8 9 9 10 #define VERSION "1. 1.5"10 #define VERSION "1.2.1" 11 11 12 12 #define T(String) gettext(String)
Note: See TracChangeset
for help on using the changeset viewer.