Conficts fixed

bcomp/mmi/bcomp/src/bcomp_basefcppo3pumpaggr__p2.pwg

@@ -40,19 +40,19 @@
 101 20
 102 -175
 103 -218
-104 0
-136 0
+104 18.4207
+136 18.4207
 105 100
-106 0
-107 0
+106 -32
+107 -40
 108 3.3
 109 0
 110 2
 111 -0.5
 116 0
 117 0
-118 137
-119 126
+118 126
+119 113
 120 1
 121 Claes context
 122 0
@@ -115,6 +115,7 @@ pwr_exe:
 2234 1
 2235 0
 2243 0
+2245 0
 2244
 1
 100 1
@@ -149,6 +150,9 @@ pwr_exe:
 1919 1
 1920 0
 1917 1
+1921 0
+1922 4
+1923 1
 1907 0
 1906
 1905
@@ -194,6 +198,9 @@ pwr_exe:
 2416 2
 2414 0
 2417 0
+2418 0
+2419 4
+2420 0
 2407 0
 2406
 2405
@@ -283,6 +290,9 @@ pwr_exe:
 2620 0
 2621 0
 2622 0
+2623 0
+2624 4
+2625 0
 99
 23
 2304 O4

bcomp/mmi/bcomp/src/bcomp_basefcppo3pumpaggr__p2.pwsg

@@ -22,6 +22,9 @@
 1919 1
 1920 0
 1917 1
+1921 0
+1922 4
+1923 1
 1907 0
 1906
 1905
@@ -67,6 +70,9 @@
 2416 2
 2414 0
 2417 0
+2418 0
+2419 4
+2420 0
 2407 0
 2406
 2405
@@ -156,6 +162,9 @@
 2620 0
 2621 0
 2622 0
+2623 0
+2624 4
+2625 0
 99
 29
 2907

bcomp/mmi/bcomp/src/bcomp_basefcppo5fanaggr__p2.pwg

@@ -40,19 +40,19 @@
 101 20
 102 -85
 103 -128
-104 0
-136 0
+104 18.4207
+136 18.4207
 105 100
-106 0
-107 0
+106 -15
+107 -23
 108 3
 109 0
 110 2
 111 0
 116 0
 117 0
-118 138
-119 126
+118 126
+119 113
 120 1
 121 Claes context
 122 0
@@ -115,6 +115,7 @@ pwr_exe:
 2234 1
 2235 0
 2243 0
+2245 0
 2244
 1
 100 1
@@ -149,6 +150,9 @@ pwr_exe:
 1919 1
 1920 0
 1917 1
+1921 0
+1922 4
+1923 1
 1907 0
 1906
 1905
@@ -194,6 +198,9 @@ pwr_exe:
 2416 2
 2414 0
 2417 0
+2418 0
+2419 4
+2420 0
 2407 0
 2406
 2405
@@ -283,6 +290,9 @@ pwr_exe:
 2620 0
 2621 0
 2622 0
+2623 0
+2624 4
+2625 0
 99
 23
 2304 O4

bcomp/mmi/bcomp/src/bcomp_basefcppo5fanaggr__p2.pwsg

@@ -22,6 +22,9 @@
 1919 1
 1920 0
 1917 1
+1921 0
+1922 4
+1923 1
 1907 0
 1906
 1905
@@ -67,6 +70,9 @@
 2416 2
 2414 0
 2417 0
+2418 0
+2419 4
+2420 0
 2407 0
 2406
 2405
@@ -156,6 +162,9 @@
 2620 0
 2621 0
 2622 0
+2623 0
+2624 4
+2625 0
 99
 29
 2907

changelog.txt

@@ -4,3 +4,4 @@
 070706 cs  .         Release 4.4.2-1.
 071127 cs  .         Release 4.4.4-5.
 080428 cs  .         Release 4.5.0-5.
+081205 cs  .         Release 4.6.0-4.

java/changelog.txt

@@ -10,3 +10,4 @@
 080314 cs  jop       Bugfix in integer format conversion.
 080623 cs  rt        Password encryption class added.
 080623 cs  rt        Default privileges and system group fetched from Security object (DefaultWebPriv and WebSystemGroup).
+090129 cs  rt        GdhServer terminated with error status, not 0, is no WebHandler object was found.

java/jpwr/rt/src/GdhServer.java

@@ -255,7 +255,7 @@ public class GdhServer
     if(sts % 2 == 0)
     {
       errh.setStatus( 0);
-      return;
+      System.exit(0);
     }
 
     errh.setStatus( Errh.PWR__SRUN);

otherio/changelog.txt

@@ -4,3 +4,4 @@
 080229 rk  modbus    New I/O-system for Modbus TCP implemented.
 081016 rk  modbus    Added class Modbus_Master.
 081016 rk  modbus    Added moore functionality.
+090301 cs  usbio     Bugfix for Ai on port B. If Ai and Di/Do were mixed the Ai didn't work.

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

@@ -143,6 +143,13 @@ static pwr_tStatus IoCardInit( io_tCtx ctx,
       io_AiRangeToCoef( &cp->chanlist[i]);
     }
   }
+
+  if ( local->portB_hasDi || local->portB_hasDo) {
+    op->Status = USBIO_ConfigDIO( &local->USB_Handle, 2, local->portB_diMask);
+    if ( op->Status)
+      errh_Error( "IO Init Card '%s', Status %d", cp->Name, op->Status);
+  }
+
   if ( local->portB_hasAi) {
     int num_ai;
     for ( i = 0; i < 8; i++) {
@@ -156,12 +163,6 @@ static pwr_tStatus IoCardInit( io_tCtx ctx,
   else
     op->Status = USBIO_ConfigAI( &local->USB_Handle, 0);
 
-  if ( local->portB_hasDi || local->portB_hasDo) {
-    op->Status = USBIO_ConfigDIO( &local->USB_Handle, 2, local->portB_diMask);
-    if ( op->Status)
-      errh_Error( "IO Init Card '%s', Status %d", cp->Name, op->Status);
-  }
-
   /* Configure port C */
   local->portC_hasDi = 0;
   local->portC_hasDo = 0;
@@ -196,6 +197,12 @@ static pwr_tStatus IoCardInit( io_tCtx ctx,
        cp->chanlist[18].ChanClass == pwr_cClass_ChanIi)
       local->portC_hasIi = 1;
 
+  if ( local->portC_hasDi || local->portC_hasDo) {
+    op->Status = USBIO_ConfigDIO( &local->USB_Handle, 3, local->portC_diMask);
+    if ( op->Status)
+      errh_Error( "IO Init Card '%s', Status %d", cp->Name, op->Status);
+  }
+
   if ( local->portC_hasAo) {
     op->Status = USBIO_ConfigAO( &local->USB_Handle, local->portC_aoMask >> 3);
     if ( op->Status)
@@ -210,12 +217,6 @@ static pwr_tStatus IoCardInit( io_tCtx ctx,
       errh_Error( "IO Init Card '%s', Status %d", cp->Name, op->Status);
   }
 
-  if ( local->portC_hasDi || local->portC_hasDo) {
-    op->Status = USBIO_ConfigDIO( &local->USB_Handle, 3, local->portC_diMask);
-    if ( op->Status)
-      errh_Error( "IO Init Card '%s', Status %d", cp->Name, op->Status);
-  }
-
   // Configure Watchdog
   if ( op->WatchdogTime > 0)
     active = 1;

profibus/lib/rt/src/rt_pb_gsd_attrnav.cpp

@@ -1199,7 +1199,7 @@ void GsdAttrNavBrow::create_nodeclasses()
   brow_AddAnnot( nc_object, 12, 0.6, 2,
 		flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 
 		1);
-  brow_AddFrame( nc_object, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
+  brow_AddFrame( nc_object, 0, 0, 20, 0.83, flow_eDrawType_LineGray, -1, 1);
 
   // Create attribute nodeclass
 
@@ -1212,7 +1212,7 @@ void GsdAttrNavBrow::create_nodeclasses()
   brow_AddAnnot( nc_attr, 12, 0.6, 1,
 		flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 
 		1);
-  brow_AddFrame( nc_attr, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
+  brow_AddFrame( nc_attr, 0, 0, 20, 0.83, flow_eDrawType_LineGray, -1, 1);
 
   // Create multiline attribute nodeclass
 
@@ -1225,7 +1225,7 @@ void GsdAttrNavBrow::create_nodeclasses()
   brow_AddAnnot( nc_attr_multiline, 8, 0.6, 1,
 		flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_MultiLine, 
 		1);
-  brow_AddFrame( nc_attr_multiline, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
+  brow_AddFrame( nc_attr_multiline, 0, 0, 20, 0.83, flow_eDrawType_LineGray, -1, 1);
 
   // Create attribute nodeclass
 
@@ -1236,7 +1236,7 @@ void GsdAttrNavBrow::create_nodeclasses()
   brow_AddAnnot( nc_enum, 2, 0.6, 0,
 		flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 
 		0);
-  brow_AddFrame( nc_enum, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
+  brow_AddFrame( nc_enum, 0, 0, 20, 0.83, flow_eDrawType_LineGray, -1, 1);
  
   // Create table nodeclass
 
@@ -1274,7 +1274,7 @@ void GsdAttrNavBrow::create_nodeclasses()
   brow_AddAnnot( nc_table, 38, 0.6, 9,
 		flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 
 		1);
-  brow_AddFrame( nc_table, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
+  brow_AddFrame( nc_table, 0, 0, 20, 0.83, flow_eDrawType_LineGray, -1, 1);
 
   // Create Header
 
@@ -1287,7 +1287,7 @@ void GsdAttrNavBrow::create_nodeclasses()
   brow_AddAnnot( nc_header, 8, 0.6, 1,
 		flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine, 
 		1);
-  brow_AddFrame( nc_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
+  brow_AddFrame( nc_header, 0, 0, 20, 0.83, flow_eDrawType_LineGray, 2, 1);
 
   // Create TableHeader
 
@@ -1324,7 +1324,7 @@ void GsdAttrNavBrow::create_nodeclasses()
   brow_AddAnnot( nc_table_header, 38, 0.6, 9,
 		flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine, 
 		0);
-  brow_AddFrame( nc_table_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
+  brow_AddFrame( nc_table_header, 0, 0, 20, 0.83, flow_eDrawType_LineGray, 2, 1);
 
 }
 

sev/exe/sev_xtt/src/xtt_tblnav.cpp

@@ -400,7 +400,7 @@ void TblNavBrow::create_nodeclasses()
   brow_AddAnnot( nc_object, 15, 0.6, 2,
 		flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 
 		1);
-  brow_AddFrame( nc_object, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
+  brow_AddFrame( nc_object, 0, 0, 20, 0.83, flow_eDrawType_LineGray, -1, 1);
 
   // Create attribute nodeclass
 
@@ -413,7 +413,7 @@ void TblNavBrow::create_nodeclasses()
   brow_AddAnnot( nc_attr, 8, 0.6, 1,
 		flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine, 
 		1);
-  brow_AddFrame( nc_attr, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
+  brow_AddFrame( nc_attr, 0, 0, 20, 0.83, flow_eDrawType_LineGray, -1, 1);
 
 }
 

sev/lib/sev/src/sev_dbms.cpp

@@ -1385,6 +1385,12 @@ char *sev_dbms::oid_to_table( pwr_tOid oid, char *aname)
   memcpy( &vid, &oid.vid, sizeof(vid));
   sprintf( tbl, "O%3.3u_%3.3u_%3.3u_%3.3u_%8.8x_%s",
 	   vid[3], vid[2], vid[1], vid[0], oid.oix, cdh_Low(aname));
+
+  // Replace '.' in attribute with '_'
+  for ( char *s = tbl; *s; s++) {
+    if ( *s == '.')
+      *s = '_';
+  }
   return tbl;
 }
 

src/changelog.txt

@@ -107,4 +107,5 @@
 081017 rk  rt        Added a few new enumeration types to pwrb (YesNo, TrueFalse).
 081022 cs  convert   Xtthelp bookmark on header didn't work after html conversion.
 081024 cs  xtthelp   New program co_help to view helptexts.
-081124 cs  qcom      Quota check for max number of buffered messages in a queue added.
\ No newline at end of file
+081124 cs  qcom      Quota check for max number of buffered messages in a queue added.
+090224 cs  xtthelp   New home button in help window.
\ No newline at end of file

src/doc/man/sv_se/man_dg.dat

@@ -6325,6 +6325,8 @@ GetNextSibling()	<LINK> getnextsibling()
 GetNextVolume()		<LINK> getnextvolume()
 GetClassList()		<LINK> getclasslist()
 GetNextObject()		<LINK> getnextobject()
+GetClassListAttrRef()	<LINK> getclasslistattrref()
+GetNextAttrRef()	<LINK> getnextattrref()
 GetObjectClass()	<LINK> getobjectclass()
 GetNodeObject()		<LINK> getnodeobject()
 GetRootList()		<LINK> getrootlist()
@@ -7133,6 +7135,56 @@ string		<t>name		<t>objektets namn.
 <c>  endwhile
 </TOPIC>
 
+<TOPIC> getclasslistattrref() <style> function
+GetClassListAttrRef()
+
+string GetClassListAttrRef( string class)
+
+<b>Beskrivning
+
+Hämta första objekt eller attributeobjekt av angiven klass. Nästa objekt 
+eller attributobjekt av klassen kan hämtas med GetNextAttrRef().
+Returnerar namnet på första objektet. Om det inte finns några instanser
+eller attributobjekt av klassen returneras en null-sträng.
+
+<b>Argument
+
+string		<t>name		<t>namn på klassen.
+
+<b>Exempel
+
+<c>  string name;
+
+<c>  name = GetClassListAttrRef("Dv");
+</TOPIC>
+
+<TOPIC> getnextattrref() <style> function
+GetNextAttrRef()
+
+string GetNextAttrRef( string class, string name)
+
+<b>Beskrivning
+
+Hämta nästa objekt i klasslistan.
+Returnerar namnet på objektet eller attributobjektet. Om det inte finns 
+något nästa objekt returneras en null-sträng.
+
+<b>Argument
+
+string		<t>class	<t>namn på klassen.
+string		<t>name		<t>namn på objektet eller attributobjektet.
+
+<b>Exempel
+
+<c>  string name;
+
+<c>  name = GetClassListAttrRef("Di");
+<c>  while ( name != "")
+<c>    printf("Di object found: %s", name);
+<c>    name = GetNextAttrRef(name);
+<c>  endwhile
+</TOPIC>
+
 <TOPIC> getobjectclass() <style> function
 GetObjectClass()
 

src/doc/prm/src/os_linux/hw_x86/Doxyfile

@@ -543,6 +543,7 @@ INPUT                  = $(pwre_sroot)/doc/prm/src/doxygen.dx \
                          $(pwre_sroot)/lib/rt/src/rt_qcom.h \
                          $(pwre_croot)/nmps/lib/nmps/src/nmps_appl.h \
                          $(pwre_sroot)/lib/rt/src/rt_appl.h \
+                         $(pwre_sroot)/lib/rt/src/rt_appl.cpp \
                          $(pwre_sroot)/lib/co/src/co_time.c \
                          $(pwre_sroot)/lib/co/src/co_cdh.c \
                          $(pwre_sroot)/lib/rt/src/rt_gdh.c \

src/exp/com/src/os_linux/pwrp_env.sh

@@ -590,7 +590,7 @@ EOF
 
 <h1>Welcome to $pname
 <h2>Description
-Edit file $pwrp_exe/xtt_help.dat to write this description.
+Edit file \$pwrp_exe/xtt_help.dat to write this description.
 </topic>
 
 <include> \$pwr_lang/profibus_xtthelp.dat

src/lib/co/gtk/co_xhelp_gtk.h

@@ -53,6 +53,7 @@ class CoXHelpGtk : public CoXHelp {
 			    const char *init_text,
 			    void (*ok_cb)( CoXHelp *, char *));
     static void activate_close( GtkWidget *w, gpointer data);
+    static void activate_home( GtkWidget *w, gpointer data);
     static void activate_back( GtkWidget *w, gpointer data);
     static void activate_nexttopic( GtkWidget *w, gpointer data);
     static void activate_previoustopic( GtkWidget *w, gpointer data);