Merge branch 'master' of 62.20.65.89:/data1/git/pwr

otherio/lib/rt/src/os_linux/rt_io_m_velleman_k8055_board.c

@@ -36,6 +36,7 @@
 #include "rt_io_m_usb_agent.h"
 #include "rt_io_m_velleman_k8055_board.h"
 
+static int last_usblib_sts = 0;
 
 static pwr_tStatus IoCardInit( io_tCtx ctx,
 			       io_sAgent *ap,
@@ -160,10 +161,14 @@ static pwr_tStatus IoCardRead( io_tCtx ctx,
   pwr_tUInt32 error_count = op->Super.ErrorCount;
 
   // You have to read twice to get the latest ?????
-  sts = libusb_interrupt_transfer( local->libusb_device, endpoint, data, 8, &tsize, 20);
-  sts = libusb_interrupt_transfer( local->libusb_device, endpoint, data, 8, &tsize, 20);
+  sts = libusb_interrupt_transfer( local->libusb_device, endpoint, data, 8, &tsize, 100);
+  sts = libusb_interrupt_transfer( local->libusb_device, endpoint, data, 8, &tsize, 100);
   if ( sts != 0 || tsize != size) {
     op->Super.ErrorCount++;
+    if ( sts != 0 && sts != last_usblib_sts) {
+      errh_Error( "K8055 libusb transfer error %d", sts);
+      last_usblib_sts = sts;
+    }
     return IO__SUCCESS;
   }
   else {
@@ -278,9 +283,13 @@ static pwr_tStatus IoCardWrite( io_tCtx ctx,
     }
   }
 
-  sts = libusb_interrupt_transfer( local->libusb_device, endpoint, data, size, &tsize, 20);
+  sts = libusb_interrupt_transfer( local->libusb_device, endpoint, data, size, &tsize, 100);
   if ( sts != 0 || tsize != size) {
     op->Super.ErrorCount++;
+    if ( sts != 0 && sts != last_usblib_sts) {
+      errh_Error( "K8055 libusb transfer error %d", sts);
+      last_usblib_sts = sts;
+    }
     return IO__SUCCESS;
   }
 

src/tools/pkg/ubu/pwr/control

@@ -3,7 +3,7 @@ Version: 4.8.0-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: libc6 (>= 2.12.1-0ubuntu6), libgtk2.0-0 (>= 2.22.0-0ubuntu1), libasound2 (>= 1.0.23-1ubuntu2), libdb4.7 (>=4.8.30-1), libdb4.7++ (>=4.8.30.1), libmysql++3 (>= 3.0.9-1ubuntu2), g++ (>= 4:4.4.4-1ubuntu2)
+Depends: libc6 (>= 2.12.1-0ubuntu6), libgtk2.0-0 (>= 2.22.0-0ubuntu1), libasound2 (>= 1.0.23-1ubuntu2), libdb4.8 (>=4.8.30-1), libdb4.8++ (>=4.8.30-1), libmysql++3 (>= 3.0.9-1ubuntu2), g++ (>= 4:4.4.4-1ubuntu2)
 Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview development and runtime environment package

src/tools/pkg/ubu/pwrdemo/build.sh

@@ -75,7 +75,7 @@ cd $currentdir
   echo "Name=Proview Demo"
   echo "Type=Application"
   echo "Comment=Start Proview Demo"
-  echo "Exec=xterm -title \"Proview Demo Console\" -e 'export pwra_db=$aroot/db;source \$pwra_db/pwr_setup.sh;source \$pwra_db/pwra_env.sh set project pwrdemo""$ver"";export PWR_BUS_ID=999;pwr_rtmon'"
+  echo "Exec=xterm -title \"Proview Demo Console\" -e 'source /etc/pwrp_profile;export pwra_db=$aroot/db;source \$pwra_db/pwr_setup.sh;source \$pwra_db/pwra_env.sh set project pwrdemo""$ver"";export PWR_BUS_ID=999;pwr_rtmon'"
   echo "Icon=$aroot/db/proview_icon.png"
   echo "Categories=GNOME;GTK;Application;"
 } > $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop