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

java/jpwr/jop/src/JopLang.java

@@ -347,7 +347,7 @@ public class JopLang {
 	    if ( i == 0 && btree_en_us != null)
 		continue;
 	
-	    if ( root != null && root instanceof JopApplet) {
+	    if ( root != null && root instanceof JApplet) {
 	      try {
 		URL current = ((JApplet) root).getCodeBase();
 		String current_str = current.toString();

java/jpwr/jop/src/os_linux/hw_x86/makefile

@@ -15,9 +15,9 @@ local_java_sources := \
 	JopUtilityIfc.java \
 	JopUtility.java \
 	JopSession.java \
+	JopLang.java \
 	JopMethods.java \
 	JopMethodsMenu.java \
-	JopLang.java \
 	JopConfirm.java \
 	JopConfirmDialog.java \
 	JopFrame.java \

otherio/changelog.txt

@@ -7,3 +7,8 @@
 090301 cs  usbio     Bugfix for Ai on port B. If Ai and Di/Do were mixed the Ai didn't work.
 091208 cs  modbus    Modbus TCP Server implemented.
 100316 cs  modbus    ScanInterval added to modbus slave object.
+100417 cs  gpio      IO methods and objects for GPIO.
+100530 cs  -         Added support for Velleman K8055 USB experiment board.
+100606 cs  -         IO methods and objects for temperature sensor Maxim DS18B20 added.
+100621 cs  modbus    Modbus TCP server, correction for WriteSingleCoil. If value is not 0 or 0x00FF, no value shoud be set.
+100701 cs  modbus    Modbus TCP bugfix in scan interval.

src/changelog.txt

@@ -135,4 +135,6 @@
 100209 cs  gdh       gdh_RefObjectInfoList returns error status for invalid local attribute.
 100202 cs  errh      Log message sent via qcom, null termination was lost.
 100226 cs  pwrb      Class LocalTime added.
-100304 cs  script    Script type int change from int to long int.  
\ No newline at end of file
+100304 cs  script    Script type int change from int to long int.
+100610 cs  emon      Support for EmergBreakAction Reboot added.
+100617 cs  cdh       Bugfix in cdh_SuppressSuperAll.

src/tools/pwre/src/os_linux/pwre.pl

@@ -220,6 +220,7 @@ sub build_kernel # args: flavour
   _module("otherio");
   _build("exp","rt","src","copy");
   _build("lib","usbio_dummy","src","init lib");
+  _build("lib","usb_dummy","src","init lib");
   merge();
   _module("xtt");
   build_all("exe", $flavour);
@@ -325,6 +326,7 @@ sub ebuild # args: pass flavour
     _module("otherio");
     _build("exp","rt","src","copy");
     _build("lib","usbio_dummy","src","init lib");
+    _build("lib","usb_dummy","src","init lib");
     merge();
     _module("rt");
     _build("exe", "rt*", "src", "all");

ssabox/changelog.txt

@@ -3,4 +3,5 @@
                        and does not cause system to halt
 070518 rk   rt         Added i/o swap-method to avoid stall during warm restart.
 080226 cs   rt         Read method for co-card changed with double reading of high word (24-bit only).
-080926 cs   rt         Bugfix for do cards. 16 channels do card couldn't be handled.
\ No newline at end of file
+080926 cs   rt         Bugfix for do cards. 16 channels do card couldn't be handled.
+100630 cs   rt         PSS9000 card MIO3102up added.
\ No newline at end of file

wb/changelog.txt

@@ -154,4 +154,9 @@
 100111 cs  wb        Mysql classvolume databases.
 100118 cs  plc       Toggle button in plc editor for feedback connections.
 100120 cs  wb        Functionality to view configuration status added.
-100121 cs  plc       Toolbar buttons in plc editor to create texts and documents and to redraw.
\ No newline at end of file
+100121 cs  plc       Toolbar buttons in plc editor to create texts and documents and to redraw.
+100417 cs  wb        Distribution to other users than pwrp.
+100420 cs  wb        Custom build configuration object and generation of custom_build.sh file.
+100520     plc       Bugfix in plc editor, channels wasn't viewed in subvolumes.
+100617 cs  script    Wb script function GetAttribute didn't work for attribute objects.
+100618 cs  wb        Crossreferences in LibHier not inserted into crossreferece list.  

xtt/changelog.txt

@@ -170,4 +170,8 @@
 100216 cs  xtt       Command 'wait' added.
 100305 cs  ge        Keystroke Ctrl+W can be used to close a Ge graph.
 100309 cs  ge        Graph width and height stored in the beginning of the .pwg file to create the window with the correct size.
-100512 cs  ge        Gradients added in java export.
\ No newline at end of file
+100512 cs  ge        Gradients added in java export.
+100617 cs  xtt       Logging of operator actions implemented.
+100617 cs  ge        Ge scale dynamic: negative scalefactors zeroed.
+100617 cs  ge        Popup menu action: attribute can be referenced, and object methods viewed with cascading menu.
+100618 cs  xtt       Show crossreferences searches in crossreferencefiles for all volumes.
\ No newline at end of file