Skip to content

P
proview
Commit 69394212 authored by claes's avatar claes
Browse files
Options

*** empty log message ***

parent 863c699d
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 111 deletions
java/exe/jpwr_rt_gdh/src/jpwr_rt_mh.c
View file @ 69394212
......@@ -37,8 +37,7 @@ JNIEXPORT void JNICALL Java_jpwr_rt_Mh_initIDs
}
//hmta pekare till staticmetoden messReceived
Mh_messReceived_id = (*env)->GetStaticMethodID( env, Mh_id, "messReceived",
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;IILjpwr/rt/PwrtObjid;)V");
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IIIILjava/lang/String;IILjava/lang/String;IILjpwr/rt/PwrtObjid;)V");
sts = (*env)->GetJavaVM(env, &jvm);
if(sts)
{
......@@ -285,11 +284,19 @@ pwr_tStatus ev_mh_ack_bc( mh_sAck *MsgP)
jstring jevName;
jstring jevTime;
jstring jevBirthTime;
jint jevFlags;
jint jevPrio;
jint jevStatus;
jint jevNix;
jint jevIdx;
jstring jevTargetBirthTime;
jint jevTargetNix;
jint jevTargetIdx;
char targetBirthTime_str[40];
jint jevType;
jint oix, vid;
char time_str[40];
......@@ -298,6 +305,7 @@ pwr_tStatus ev_mh_ack_bc( mh_sAck *MsgP)
pwr_tTime time = MsgP->Info.EventTime;
pwr_tTime birthTime = MsgP->Info.Id.BirthTime;
pwr_tTime targetBirthTime = MsgP->TargetId.BirthTime;
//hmta enviormentpekaren
(*jvm)->AttachCurrentThread(jvm,(void **)&env,NULL);
......@@ -318,23 +326,31 @@ pwr_tStatus ev_mh_ack_bc( mh_sAck *MsgP)
time_AtoAscii( &time, time_eFormat_ComprDateAndTime, time_str, sizeof(time_str));
time_AtoAscii( &birthTime, time_eFormat_ComprDateAndTime, birthTime_str, sizeof(birthTime_str));
time_AtoAscii( &targetBirthTime, time_eFormat_ComprDateAndTime, targetBirthTime_str, sizeof(targetBirthTime_str));
//gr om till Java-strngar
jevText = (*env)->NewStringUTF( env, " "); //eventText anvnds inte vid ack
jevName = (*env)->NewStringUTF( env, MsgP->Info.EventName);
jevTime = (*env)->NewStringUTF( env, time_str);
jevBirthTime = (*env)->NewStringUTF( env, birthTime_str);
jevTargetBirthTime = (*env)->NewStringUTF( env, targetBirthTime_str);
//gr om till Java-int
jevFlags = (jint)MsgP->Info.EventFlags;
jevPrio = (jint)MsgP->Info.EventPrio;
jevStatus = (jint)1; //finns ej i mh_sAck och anvnds ej heller
jevNix = (jint)MsgP->Info.Id.Nix;
jevIdx = (jint)MsgP->Info.Id.Idx;
jevTargetNix = (jint)MsgP->TargetId.Nix;
jevTargetIdx = (jint)MsgP->TargetId.Idx;
jevType = (jint)MsgP->Info.EventType;
//anropa callback metoden i Mh-klassen
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, jevText, jevName,
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx, jevType, objid_obj);
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx,
jevTargetNix, jevTargetBirthTime, jevTargetIdx,
jevType, objid_obj);
//important:check if an exception was raised
if ((*env)->ExceptionCheck(env))
{
......@@ -362,6 +378,13 @@ pwr_tStatus ev_mh_return_bc( mh_sReturn *MsgP)
jint jevIdx;
jint jevType;
jint oix, vid;
jstring jevTargetBirthTime;
jint jevTargetNix;
jint jevTargetIdx;
char targetBirthTime_str[40];
char time_str[40];
char birthTime_str[40];
......@@ -369,6 +392,7 @@ pwr_tStatus ev_mh_return_bc( mh_sReturn *MsgP)
pwr_tObjid objid = MsgP->Info.Object;
pwr_tTime time = MsgP->Info.EventTime;
pwr_tTime birthTime = MsgP->Info.Id.BirthTime;
pwr_tTime targetBirthTime = MsgP->TargetId.BirthTime;
//hmta enviormentpekaren
(*jvm)->AttachCurrentThread(jvm,(void **)&env,NULL);
......@@ -386,12 +410,15 @@ pwr_tStatus ev_mh_return_bc( mh_sReturn *MsgP)
time_AtoAscii( &time, time_eFormat_ComprDateAndTime, time_str, sizeof(time_str));
time_AtoAscii( &birthTime, time_eFormat_ComprDateAndTime, birthTime_str, sizeof(birthTime_str));
time_AtoAscii( &targetBirthTime, time_eFormat_ComprDateAndTime, targetBirthTime_str, sizeof(targetBirthTime_str));
//gr om till Java-strngar
jevText = (*env)->NewStringUTF( env, MsgP->EventText);
jevName = (*env)->NewStringUTF( env, MsgP->Info.EventName);
jevTime = (*env)->NewStringUTF( env, time_str);
jevBirthTime = (*env)->NewStringUTF( env, birthTime_str);
jevTargetBirthTime = (*env)->NewStringUTF( env, targetBirthTime_str);
//gr om till Java-int
jevFlags = (jint)MsgP->Info.EventFlags;
......@@ -399,10 +426,17 @@ pwr_tStatus ev_mh_return_bc( mh_sReturn *MsgP)
jevStatus = (jint)1;//mh_sReturn har ingen status
jevNix = (jint)MsgP->Info.Id.Nix;
jevIdx = (jint)MsgP->Info.Id.Idx;
jevTargetNix = (jint)MsgP->TargetId.Nix;
jevTargetIdx = (jint)MsgP->TargetId.Idx;
jevType = (jint)MsgP->Info.EventType;
//anropa callback metoden i Mh-klassen
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, jevText, jevName,
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx, jevType, objid_obj);
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx,
jevTargetNix, jevTargetBirthTime, jevTargetIdx,
jevType, objid_obj);
//important:check if an exception was raised
if ((*env)->ExceptionCheck(env))
{
......@@ -430,6 +464,12 @@ pwr_tStatus ev_mh_alarm_bc( mh_sMessage *MsgP)
jint jevIdx;
jint jevType;
jint oix, vid;
jstring jevTargetBirthTime;
jint jevTargetNix = (jint) 0;
jint jevTargetIdx = (jint) 0;
char time_str[40];
char birthTime_str[40];
......@@ -460,6 +500,9 @@ pwr_tStatus ev_mh_alarm_bc( mh_sMessage *MsgP)
jevName = (*env)->NewStringUTF( env, MsgP->Info.EventName);
jevTime = (*env)->NewStringUTF( env, time_str);
jevBirthTime = (*env)->NewStringUTF( env, birthTime_str);
jevTargetBirthTime = (*env)->NewStringUTF( env, " ");
//gr om till Java-int
jevFlags = (jint)MsgP->Info.EventFlags;
......@@ -470,7 +513,9 @@ pwr_tStatus ev_mh_alarm_bc( mh_sMessage *MsgP)
jevType = (jint)MsgP->Info.EventType;
//anropa callback metoden i Mh-klassen
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, jevText, jevName,
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx, jevType, objid_obj);
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx,
jevTargetNix, jevTargetBirthTime, jevTargetIdx,
jevType, objid_obj);
//important:check if an exception was raised
if ((*env)->ExceptionCheck(env))
{
......@@ -498,6 +543,11 @@ pwr_tStatus ev_mh_info_bc( mh_sMessage *MsgP)
jint jevIdx;
jint jevType;
jint oix, vid;
jstring jevTargetBirthTime;
jint jevTargetNix = (jint) 0;
jint jevTargetIdx = (jint) 0;
char time_str[40];
char birthTime_str[40];
......@@ -528,6 +578,8 @@ pwr_tStatus ev_mh_info_bc( mh_sMessage *MsgP)
jevName = (*env)->NewStringUTF( env, MsgP->Info.EventName);
jevTime = (*env)->NewStringUTF( env, time_str);
jevBirthTime = (*env)->NewStringUTF( env, birthTime_str);
jevTargetBirthTime = (*env)->NewStringUTF( env, " ");
//gr om till Java-int
jevFlags = (jint)MsgP->Info.EventFlags;
......@@ -538,7 +590,9 @@ pwr_tStatus ev_mh_info_bc( mh_sMessage *MsgP)
jevType = (jint)MsgP->Info.EventType;
//anropa callback metoden i Mh-klassen
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, jevText, jevName,
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx, jevType, objid_obj);
jevTime, jevFlags, jevPrio, jevStatus, jevNix, jevBirthTime, jevIdx,
jevTargetNix, jevTargetBirthTime, jevTargetIdx,
jevType, objid_obj);
//important:check if an exception was raised
if ((*env)->ExceptionCheck(env))
{
......@@ -564,7 +618,8 @@ pwr_tStatus ev_mh_clear_alarmlist_bc( pwr_tNodeIndex nix)
jevType = (jint)66;
//anropa callback metoden i Mh-klassen
(*env)->CallStaticVoidMethod( env, Mh_id, Mh_messReceived_id, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, jevType, NULL);
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, jevType, NULL);
//printf("C-kod: efter callback\n");
//important:check if an exception was raised
if ((*env)->ExceptionCheck(env))
......
src/exe/rt_elog/src/os_linux/rt_elog.c
View file @ 69394212
......@@ -133,7 +133,7 @@ Init ()
exit(1);
}
/*open the database*/
if((ret = dataBaseP->open(dataBaseP, fname, NULL, DATABASETYPE, DB_CREATE, 0664)) != 0)
if((ret = dataBaseP->open(dataBaseP, 0, fname, NULL, DATABASETYPE, DB_CREATE, 0664)) != 0)
{
/*error opening/creating db send the mess to errh, then exit*/
sprintf(msg, "db_open: %s, no eventlogger will run", db_strerror(ret));
......
src/lib/co/src/co_ccm.c
View file @ 69394212
......@@ -710,14 +710,18 @@ void ccm_float_to_string( char *string, float f)
int i;
/* If value is close to integer, round it */
if ( fabs( f - floor( f)) <= FLT_EPSILON)
{
i = f + FLT_EPSILON;
if ( fabs( f - floor( f)) <= FLT_EPSILON) {
if ( f >= 0)
i = f + FLT_EPSILON;
else
i = f - FLT_EPSILON;
sprintf( string, "%d", i);
}
else if ( fabs( f - floor( f) + 1) <= FLT_EPSILON)
{
i = f + FLT_EPSILON;
else if ( fabs( f - floor( f) + 1) <= FLT_EPSILON) {
if ( f >= 0)
i = f + FLT_EPSILON;
else
i = f - FLT_EPSILON;
sprintf( string, "%d", i);
}
else
......
src/lib/co/src/co_dcli.h
View file @ 69394212
#ifndef co_dcli_h
#define co_dcli_h
#include <stdio.h>
#ifdef __cplusplus
extern "C" {
#endif
......
src/lib/co/src/co_user.cpp
View file @ 69394212
......@@ -42,10 +42,11 @@ int GeUser::load( char *filename)
int end_found = 0;
char dummy[40];
strcpy( fname, filename);
if ( !check_file( filename))
return USER__FILEOPEN;
strcpy( fname, filename);
fp.open( filename);
#ifndef OS_VMS
......
src/lib/co/src/os_linux/co_time_os.c
View file @ 69394212
......@@ -10,6 +10,7 @@
#ifndef OS_LINUX
# error This file is only for Linux
#endif
#include <unistd.h>
#include <sys/times.h>
#include <string.h>
#include "pwr.h"
......@@ -30,22 +31,48 @@ time_Uptime (
pwr_tDeltaTime time;
long tics;
struct tms buff;
static int tics_per_sec = 0;
static pwr_tTime boot_time = {0,0};
static pwr_tDeltaTime max_diff = {0,20000000};
pwr_tDeltaTime uptime_tics;
pwr_tTime current_time;
pwr_tDeltaTime diff;
pwr_dStatus(sts, status, TIME__SUCCESS);
if ( !tics_per_sec)
tics_per_sec = sysconf(_SC_CLK_TCK);
if (tp == NULL)
tp = &time;
tics = times(&buff);
tp->tv_sec = tics / CLK_TCK;
tp->tv_nsec = (tics % CLK_TCK) * (1000000000 / CLK_TCK);
uptime_tics.tv_sec = tics / tics_per_sec;
uptime_tics.tv_nsec = (tics % tics_per_sec) * (1000000000 / tics_per_sec);
pwr_Assert(tp->tv_sec >= 0 && tp->tv_nsec >= 0);
// pwr_Assert(tp->tv_sec >= 0 && tp->tv_nsec >= 0);
clock_gettime( CLOCK_REALTIME, &current_time);
if ( !boot_time.tv_sec) {
time_Asub( &boot_time, &current_time, &uptime_tics);
*tp = uptime_tics;
}
else {
time_Adiff( tp, &current_time, &boot_time);
time_Dsub( &diff, tp, &uptime_tics);
time_Dabs(NULL, &diff);
if ( time_Dcomp(&diff, &max_diff) > 0) {
time_Asub( &boot_time, &current_time, &uptime_tics);
*tp = uptime_tics;
*status = TIME__CLKCHANGE;
}
}
if (ap != NULL)
return time_Dadd(tp, tp, ap);
else
return tp;
}
/* Return number of clock ticks since system start.
Add number of tics corresponding to delta time 'add'. */
......
src/lib/rt/src/os_linux/rt_io_m_ai_hvai32.c
View file @ 69394212
......@@ -252,9 +252,9 @@ static pwr_tStatus IoCardRead (
}
/* Check max/min */
if (actvalue > cop->ActValRangeHigh)
if (actvalue > cop->ActValRangeHigh && cop->ActValRangeHigh > cop->ActValRangeLow)
actvalue = cop->ActValRangeHigh;
if (actvalue < cop->ActValRangeLow)
if (actvalue < cop->ActValRangeLow && cop->ActValRangeHigh > cop->ActValRangeLow)
actvalue = cop->ActValRangeLow;
/* Filter */
......
src/lib/rt/src/rt_c_plcthread.c
View file @ 69394212
......@@ -33,6 +33,9 @@
#define cNanoSec 1.0e-9
/**
@aref plcthread PlcThread
*/
pwr_sClass_PlcThread *
pwrb_PlcThread_Init (
pwr_tStatus *sts,
......@@ -55,49 +58,6 @@ pwrb_PlcThread_Init (
}
void
pwrb_PlcThread_Zero (
plc_sThread *tp
)
{
pwr_sClass_PlcThread *o;
o = tp->PlcThread;
o->Limit_1_8 = o->ScanTime / 8.0;
o->Limit_1_4 = o->ScanTime / 4.0;
o->Limit_1_2 = o->ScanTime / 2.0;
o->Limit_1_1 = o->ScanTime;
o->Limit_2_1 = o->ScanTime * 2.0;
o->Limit_4_1 = o->ScanTime * 4.0;
o->Limit_8_1 = o->ScanTime * 8.0;
o->ScanTimeMin = 1.0e30;
o->ScanTimeMean = 0.0;
o->ScanTimeMax = 0.0;
/* Update ScanTimeMean after 100 loops or after 10 seconds */
o->ScanTimeMeanCount = MIN(100., MAX(10./o->ScanTime, 1)) +.5;
o->ScanTimeStart.tv_sec = 0;
o->ScanTimeStart.tv_nsec = 0;
o->Count = 0;
o->Sum = 0.0;
o->Min = 1.0e30;
o->Mean = 0.0;
o->Coverage = 0.0;
o->Max = 0.0;
o->Count_1_8 = 0;
o->Count_1_4 = 0;
o->Count_1_2 = 0;
o->Count_1_1 = 0;
o->Count_2_1 = 0;
o->Count_4_1 = 0;
o->Count_8_1 = 0;
o->CountHigh = 0;
o->SlipCount = 0;
}
void
pwrb_PlcThread_Exec (
plc_sThread *tp
)
......@@ -168,3 +128,48 @@ pwrb_PlcThread_Exec (
}
void
pwrb_PlcThread_Zero (
plc_sThread *tp
)
{
pwr_sClass_PlcThread *o;
o = tp->PlcThread;
o->Limit_1_8 = o->ScanTime / 8.0;
o->Limit_1_4 = o->ScanTime / 4.0;
o->Limit_1_2 = o->ScanTime / 2.0;
o->Limit_1_1 = o->ScanTime;
o->Limit_2_1 = o->ScanTime * 2.0;
o->Limit_4_1 = o->ScanTime * 4.0;
o->Limit_8_1 = o->ScanTime * 8.0;
o->ScanTimeMin = 1.0e30;
o->ScanTimeMean = 0.0;
o->ScanTimeMax = 0.0;
/* Update ScanTimeMean after 100 loops or after 10 seconds */
o->ScanTimeMeanCount = MIN(100., MAX(10./o->ScanTime, 1)) +.5;
o->ScanTimeStart.tv_sec = 0;
o->ScanTimeStart.tv_nsec = 0;
o->Count = 0;
o->Sum = 0.0;
o->Min = 1.0e30;
o->Mean = 0.0;
o->Coverage = 0.0;
o->Max = 0.0;
o->Count_1_8 = 0;
o->Count_1_4 = 0;
o->Count_1_2 = 0;
o->Count_1_1 = 0;
o->Count_2_1 = 0;
o->Count_4_1 = 0;
o->Count_8_1 = 0;
o->CountHigh = 0;
o->SlipCount = 0;
}
src/lib/rt/src/rt_csup.c
View file @ 69394212
......@@ -22,6 +22,9 @@
#include "rt_errh.h"
/**
@aref cyclesup CycleSup
*/
lst_sEntry *
csup_Init (
pwr_tStatus *status,
......
src/lib/rt/src/rt_gdh.h
View file @ 69394212
......@@ -13,11 +13,8 @@
*/
/** @defgroup GDH Global Data Handler
* This module contains the access routines to the Global Data
* Handler. Those routines are callable from application level.
* @{
*/
/** @addtogroup GDH */
/*@{*/
#ifndef pwr_h
#include "pwr.h"
......
src/lib/rt/src/rt_mh_appl.h
View file @ 69394212
......@@ -8,9 +8,8 @@
<Description>. */
/** @defgroup MSGH Message Handler
* @{
*/
/** @addtogroup MSGH */
/*@{*/
#define RS_MH_APPL_VERSION "X2.3.1"
......
src/lib/rt/src/rt_plc_arithm.c
View file @ 69394212
......@@ -508,7 +508,7 @@ void adelay_exec(
object->StoInd++;
if ((object->StoInd >= maxindex) || (object->StoInd < 0))
object->StoInd = 0;
if (object->StoredNumbers <= maxindex)
if (object->StoredNumbers < maxindex)
object->StoredNumbers++;
object->Count = 0;
object->TimVect[object->StoInd] = object->In;
......@@ -519,7 +519,7 @@ void adelay_exec(
/* Calculate position for output
*/
actoff = (object->Tim / *object->ScanTime - object->Count)
actoff = (object->Tim / tp->f_scan_time - object->Count)
/ object->MaxCount;
if (actoff >= object->StoredNumbers)
actoff = object->StoredNumbers - 1;
......
src/lib/rt/src/rt_plc_macro_logic.h
View file @ 69394212
......@@ -164,7 +164,7 @@
/**
STRCAT
@aref strcat STRCAT
@aref strcat Strcat
*/
#define Strcat_exec(obj,str1,str2) \
strcpy(obj->ActVal, str1); \
......
src/lib/rt/src/rt_plc_pid.c
View file @ 69394212
......@@ -367,11 +367,11 @@ ddiff = ((object->PidAlg & DAVV) != 0) ?
(object->ControlDiff - eold) / *object->ScanTime:
(object->ProcVal - xold) / *object->ScanTime;
if ((object->DerGain < 1.0) ||
(object->DerGain * *object->ScanTime >= object->DerTime))
object->FiltDer = ddiff; /* No Filter */
(object->DerGain * *object->ScanTime >= object->DerTime))
object->FiltDer = ddiff * object->DerTime; /* No Filter */
else
object->FiltDer += (ddiff - derold) *
object->DerGain * *object->ScanTime / object->DerTime; /* Filter */
object->DerGain * *object->ScanTime; /* Filter */
if ( object->Force )
/* Force */
......@@ -399,7 +399,7 @@ else
{
/* Derivative-part */
if ((object->PidAlg & DALG) != 0)
dut += (object->FiltDer-derold) * object->DerTime;
dut += (object->FiltDer-derold);
/* P-part */
dut += ((object->PidAlg & PAVV) != 0) ?
object->ControlDiff - eold :
......@@ -442,7 +442,7 @@ else
ut = object->ControlDiff;
/* Derivative-part */
if ((object->PidAlg & DALG) != 0)
ut += object->FiltDer * object->DerTime;
ut += object->FiltDer;
/* Gain */
ut *= object->Gain;
if (object->Inverse != 0) ut = - ut;
......
src/lib/rt/src/rt_plc_thread.c
View file @ 69394212
......@@ -119,10 +119,13 @@ scan (
plc_sProcess *pp = tp->pp;
int delay_action = 0;
time_Uptime(&sts, &tp->before_scan, NULL);
time_Uptime(&sts, &tp->before_scan, NULL);
clock_gettime(CLOCK_REALTIME, &tp->before_scan_abs);
if (tp->loops > 0) {
if (sts == TIME__CLKCHANGE) {
time_Dadd(&tp->before_scan, &tp->one_before_scan, &tp->scan_time);
}
time_Dsub(&tp->delta_scan, &tp->before_scan, &tp->one_before_scan);
time_DToFloat(&tp->ActualScanTime, &tp->delta_scan);
if (tp->ActualScanTime < MIN_SCANTIME)
......@@ -162,6 +165,9 @@ scan (
}
time_Uptime(&sts, &tp->after_scan, NULL);
if (sts == TIME__CLKCHANGE) {
tp->after_scan = tp->before_scan;
}
clock_gettime(CLOCK_REALTIME, &tp->after_scan_abs);
if (tp->log)
pwrb_PlcThread_Exec(tp);
......
src/lib/rt/src/rt_qcom.h
View file @ 69394212
......@@ -9,10 +9,8 @@
This include file contains the internal datastructures and
data entities in GDH. */
/** @defgroup QCOM Queue communication
* This module ...
* @{
*/
/** @addtogroup QCOM */
/*@{*/
#include <rpc/rpc.h>
......
src/wbl/ssab/src/os_linux/hw_x86/makefile
View file @ 69394212
......@@ -34,7 +34,7 @@ copy : $(inc_dir)/pwr_ssabclasses.h
lib : $(load_dir)/ssab.dbs
exe : $(doc_dir)/ssab_allclasses.html \
exe : $(doc_dir)/orm/ssab_allclasses.html \
$(exe_dir)/ssab_xtthelp.dat
clean :
......@@ -50,14 +50,14 @@ $(inc_dir)/pwr_ssabclasses.h :
@ echo "Generating struct files for ssab classes..."
@ co_convert -sv -d $(inc_dir) "$(pwre_sroot)/wbl/ssab/src/ssab_c_*.wb_load"
$(doc_dir)/ssab_allclasses.html :
$(doc_dir)/orm/ssab_allclasses.html :
@ echo "Generating html files for ssab classes..."
@ co_convert -w -d $(doc_dir) "$(pwre_sroot)/wbl/ssab/src/ssab_c_*.wb_load"
@ co_convert -w -d $(doc_dir)/orm "$(pwre_sroot)/wbl/ssab/src/ssab_c_*.wb_load"
@ echo "Generating html files for ssab structs..."
@ co_convert -c -d $(doc_dir) $(inc_dir)/pwr_ssabclasses.h
@ co_convert -c -d $(doc_dir)/orm $(inc_dir)/pwr_ssabclasses.h
@ echo "Generating html files for ssab code..."
@ co_convert -c -d $(doc_dir) "$(pwre_sroot)/lib/rs/src/rs_plc_macro_ssab.h"
@ co_convert -c -d $(doc_dir) "$(pwre_sroot)/lib/rs/src/rs_plc_ssab*.c"
@ co_convert -c -d $(doc_dir)/orm "$(pwre_sroot)/lib/rs/src/rs_plc_macro_ssab.h"
@ co_convert -c -d $(doc_dir)/orm "$(pwre_sroot)/lib/rs/src/rs_plc_ssab*.c"
$(exe_dir)/ssab_xtthelp.dat :
@ echo "Generating xtt help files for ssab classes"
......
src/wbl/ssab/src/ssab_c_buffstr80.wb_load 0 → 100644
View file @ 69394212
! ssab_c_BuffStr80.wb_load -- Defines the class BuffStr80.
!
! PROVIEW/R
!
! <Description>.
!
SObject SSAB:Class
!
! BuffStr80 Transbuffer
!
Object BuffStr80 $ClassDef 24
Body SysBody
Attr Editor = pwr_eEditor_AttrEd
Attr Method = pwr_eMethod_Standard
EndBody
!
! BuffStr80 Runtime Body
!
Object RtBody $ObjBodyDef 1
Body SysBody
Attr StructName = "BuffStr80"
EndBody
!
! Parameter Data
!
Object Data $Attribute 1
Body SysBody
Attr TypeRef = "pwrs:Type-$String80"
EndBody
EndObject
EndObject
!
! Template fr BuffStr80
!
Object Template BuffStr80
Body RtBody
EndBody
EndObject
!
! End BuffStr80
!
EndObject
EndSObject
src/wbl/tlog/src/os_linux/hw_x86/makefile
View file @ 69394212
......@@ -35,7 +35,7 @@ copy : $(inc_dir)/pwr_tlogclasses.h
lib : $(load_dir)/tlog.dbs
exe : $(doc_dir)/tlog_allclasses.html \
exe : $(doc_dir)/orm/tlog_allclasses.html \
$(exe_dir)/tlog_xtthelp.dat
clean :
......@@ -51,14 +51,14 @@ $(inc_dir)/pwr_tlogclasses.h :
@ echo "Generating struct files for tlog classes..."
@ co_convert -sv -d $(inc_dir) "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
$(doc_dir)/tlog_allclasses.html :
$(doc_dir)/orm/tlog_allclasses.html :
@ echo "Generating html files for tlog classes..."
@ co_convert -w -d $(doc_dir) "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
@ co_convert -w -d $(doc_dir)/orm "$(pwre_sroot)/wbl/tlog/src/tlog_c_*.wb_load"
@ echo "Generating html files for tlog structs..."
@ co_convert -c -d $(doc_dir) $(inc_dir)/pwr_tlogclasses.h
@ co_convert -c -d $(doc_dir)/orm $(inc_dir)/pwr_tlogclasses.h
@ echo "Generating html files for tlog code..."
@ co_convert -c -d $(doc_dir) "$(pwre_sroot)/lib/rs/src/rs_plc_macro_tlog.h"
@ co_convert -c -d $(doc_dir) "$(pwre_sroot)/lib/rs/src/rs_plc_tlog*.c"
@ co_convert -c -d $(doc_dir)/orm "$(pwre_sroot)/lib/rs/src/rs_plc_macro_tlog.h"
@ co_convert -c -d $(doc_dir)/orm "$(pwre_sroot)/lib/rs/src/rs_plc_tlog*.c"
$(exe_dir)/tlog_xtthelp.dat :
@ echo "Generating xtt help files for tlog classes"
......
wb/exe/wb/src/wb.cpp
View file @ 69394212
......@@ -17,6 +17,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "wb_env.h"
#include "flow.h"
#include "flow_ctx.h"
#include "flow_api.h"
......@@ -46,7 +47,6 @@ extern "C" {
#include "co_xhelp.h"
#include "wb_wtt.h"
#include "wb_env.h"
#include "wb_erep.h"
#include "wb_vrepwbl.h"
#include "wb_vrepdbs.h"
......@@ -239,12 +239,12 @@ void pwr_login_success()
if ( login_prv.priv & pwr_mPrv_DevRead )
{
utl_get_systemname( systemname, systemgroup);
strcpy( title, "PROVIEW/R Navigator: ");
strcpy( title, "PwR Navigator: ");
strcat( title, login_prv.username);
strcat( title, " on ");
strcat( title, systemname);
appl_count++;
new WVsel( &sts, NULL, mainwindow, "PROVIEW/R Volumes",
new WVsel( &sts, NULL, mainwindow, "PwR Volumes",
wbctx, NULL,
&pwr_vsel_success, &pwr_vsel_cancel, &pwr_time_to_exit, 0, wb_eType_Volume);
}
......@@ -284,12 +284,12 @@ void pwr_wtt_open_volume( void *wttctx, wb_eType type, char *filename, wow_eFile
{
if ( !filename) {
utl_get_systemname( systemname, systemgroup);
strcpy( title, "PROVIEW/R Navigator: ");
strcpy( title, "PwR Navigator: ");
strcat( title, login_prv.username);
strcat( title, " on ");
strcat( title, systemname);
appl_count++;
new WVsel( &sts, NULL, mainwindow, "PROVIEW/R Volumes", wbctx, NULL,
new WVsel( &sts, NULL, mainwindow, "PwR Volumes", wbctx, NULL,
&pwr_vsel_success, &pwr_vsel_cancel, &pwr_time_to_exit, 1,
type);
}
......@@ -555,7 +555,7 @@ int main( int argc, char *argv[])
sprintf( msg, "User %s logged in", login_prv.username);
MsgWindow::message( 'I', msg);
strcpy( title, "PROVIEW/R Development ");
strcpy( title, "PwR Development ");
strcat( title, login_prv.username);
strcat( title, " on ");
strcat( title, systemname);
......@@ -590,23 +590,23 @@ int main( int argc, char *argv[])
{
if ( login_prv.priv & pwr_mPrv_DevRead )
{
strcpy( title, "PROVIEW/R Navigator: ");
strcpy( title, "PwR Navigator: ");
strcat( title, login_prv.username);
strcat( title, " on ");
strcat( title, systemname);
appl_count++;
new WVsel( &sts, NULL, mainwindow, "PROVIEW/R Volumes", wbctx, volumename,
new WVsel( &sts, NULL, mainwindow, "PwR Volumes", wbctx, volumename,
&pwr_vsel_success, &pwr_vsel_cancel, &pwr_time_to_exit, 0, wb_eType_Volume);
}
else
exit(LOGIN__NOPRIV);
}
else if ( login_display)
login_new(NULL, mainwindow, "PROVIEW/R Login", systemgroup,
login_new(NULL, mainwindow, "PwR Login", systemgroup,
&pwr_login_success, &pwr_login_cancel);
strcpy( title, "PROVIEW/R Development ");
strcpy( title, "PwR Development ");
strcat( title, login_prv.username);
strcat( title, " on ");
strcat( title, systemname);
......
wb/exp/wb/src/os_linux/hw_x86/makefile
View file @ 69394212
......@@ -60,6 +60,7 @@ all : init copy lib exe
init :
copy : $(export_h) $(export_c) $(export_dat) $(exe_dir)/wtt_help.dat \
$(exe_dir)/ge_help.dat \
$(exe_dir)/pwr_wb_palette.cnf $(load_dir)/pwr_volumelist.dat
lib :
......@@ -75,6 +76,10 @@ $(exe_dir)/wtt_help.dat : wtt_help.dat
@ echo "Copying wtt_help.dat"
@ $(cp) $(cpflags) $(source) $(target)
$(exe_dir)/ge_help.dat : ge_help.dat
@ echo "Copying ge_help.dat"
@ $(cp) $(cpflags) $(source) $(target)
$(exe_dir)/pwr_wb_palette.cnf : ../../pwr_wb_palette.cnf
@ echo "Copying pwr_wb_palette.cnf"
@ $(cp) $(cpflags) $(source) $(target)
......
xtt/exe/wb_ge/src/os_linux/link_rule.mk
View file @ 69394212
......@@ -2,11 +2,11 @@ ifndef link_rule_mk
link_rule_mk := 1
link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o -L/usr/X11R6/lib -L/usr/lib/mysql \
-lpwr_ge -lpwr_wb -lpwr_rt -lpwr_co -lpwr_flow -lpwr_glow \
$(export_obj) $(objects) $(wb_msg_objs) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o -L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
-lpwr_ge -lpwr_wb -lpwr_flow -lpwr_glow -lpwr_rt -lpwr_co \
-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lXmu -lSM -lICE\
-lrpcsvc -lpthread -ldb_cxx-4.0 -lm -lmysqlclient -lz
-lrpcsvc -lpthread -lm -ldb_cxx-4.0 -lz
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7