Skip to content

P
proview
Commit 8bb0d3e8 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

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

parents a56a78da 62f615ad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 33521 additions and 26006 deletions
abb/doc/dsh/en_us/abb_acs880.html 0 → 100644
View file @ 8bb0d3e8
<html>
<head>
<link rel="stylesheet" type="text/css" href="../../pcss.css">
<title>Datasheet</title>
</head>
<body id="dsh">
<h1>Datasheets ABB ACS880</h1>
<br>
<div id="dsh"><p id="dsh">
<table id="dsh"><tr><td>
<a href="abb_acs880_hw.pdf">Manual hardware</a>
</td><tr><td>
<a href="abb_acs880_sw.pdf">Manual software</a>
</td><tr><td>
<a href="abb_acs880_profibus_FPB1_01_adapter.pdf">Profibus adapter modul FPBA-01</a>
</td><tr><td>
<a href="abb_acs880_powerlink_FEPL_02_adapter.pdf">Powerlink adapter modul FEPL-02</a>
</td><tr><td>
<a href="abb_acs880_ethernet_FENA_01_adapter.pdf">Ethernet adapter modul FENA-01</a>
</td></tr>
</table>
</p></div>
</body>
</html>
abb/mmi/mcomp/src/pwr_c_abb_acs880_1.pwg
View file @ 8bb0d3e8
This diff is collapsed.
abb/mmi/mcomp/src/pwr_c_abb_acs880_1param2.pwg 0 → 100644
View file @ 8bb0d3e8
This diff is collapsed.
abb/mmi/mcomp/src/pwr_c_abb_acs880fanaggr12.pwg
View file @ 8bb0d3e8
......@@ -40,21 +40,21 @@
100 20
135 20
101 20
102 -36
103 23
104 2.81134
136 2.81134
102 -300
103 -20
104 2.58503
136 2.58503
105 100
106 -5
107 3
106 -38
107 -2
108 23.068
109 2.8
110 36.9737
111 1.2
116 0
117 0
118 145
119 114
118 161
119 113
120 1
121 Claes context
122 0
......@@ -121,6 +121,7 @@ pwr_exe:
2234 2
2235 1
2243 0
2248 0
2245 0
2244
99
......@@ -239,6 +240,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -1379,6 +1381,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -1992,6 +1995,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -2270,6 +2274,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -3183,6 +3188,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -4104,6 +4110,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -4819,6 +4826,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -5744,6 +5752,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -6665,6 +6674,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -7578,6 +7588,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -7701,6 +7712,7 @@ pwr_exe:
319 0
320 0
328 -1717986917
332 0
329
1
100 1
......@@ -7796,6 +7808,7 @@ pwr_exe:
319 0
320 0
328 143604400
332 0
329
1
100 0
......@@ -7919,6 +7932,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
99
3
300 pwr_indsquare
......@@ -8005,6 +8019,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -9566,6 +9581,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -9689,6 +9705,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -9960,6 +9977,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -10140,6 +10158,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -10369,6 +10388,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -10598,6 +10618,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -10861,6 +10882,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -11069,6 +11091,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -11317,6 +11340,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -11718,6 +11742,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -11915,6 +11940,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -12114,6 +12140,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -12345,6 +12372,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -12574,6 +12602,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -12737,6 +12766,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -12958,6 +12988,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -13153,6 +13184,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -13376,6 +13408,7 @@ pwr_exe:
319 0
320 0
328 1
332 0
329
1
100 1
......@@ -13541,6 +13574,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -13698,6 +13732,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -13976,6 +14011,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -14254,6 +14290,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -14532,6 +14569,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -14810,6 +14848,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -15088,6 +15127,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -15366,6 +15406,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -15644,6 +15685,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -16567,6 +16609,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -17490,6 +17533,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -19143,6 +19187,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -20666,6 +20711,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -21358,6 +21404,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -21807,6 +21854,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -28320,6 +28368,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
99
99
99
......@@ -29885,6 +29934,7 @@ pwr_exe:
319 0
320 0
328 65535
332 0
99
99
99
......@@ -30194,6 +30244,7 @@ pwr_exe:
319 0
320 0
328 65627
332 0
99
99
99
......@@ -31054,6 +31105,7 @@ pwr_exe:
319 0
320 0
328 12566463
332 0
99
99
99
......@@ -31727,6 +31779,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
99
99
99
......
abb/mmi/mcomp/src/pwr_c_abb_acs880motoraggrsim.pwg
View file @ 8bb0d3e8
0! DefaultWidth 444
0! DefaultHeight 933
0! DefaultWidth 425
0! DefaultHeight 894
199
!/**
! ACS880PumpAggr
......@@ -37,25 +37,25 @@
!
!*/
1
100 26.6086
135 26.6086
100 25.4961
135 25.4961
101 20
102 -375
103 107
104 2.77571
136 2.77571
102 -306
103 -35
104 3.20726
136 3.20726
105 100
106 -39
107 -6
106 -38
107 -7
108 16.3616
109 0.151105
110 32.3395
111 -2.32358
116 0
117 17
118 170
117 2
118 157
119 113
120 1
120 0
121 Claes context
122 0
126 1
......@@ -121,27 +121,28 @@ pwr_exe:
2234 1
2235 0
2243 0
2248 0
2245 0
2244
99
123
2
3
300 pwr_indsquare
300 pwr_smallbuttoncenter
301
2
19
1904
1900 0.75
1901 0.15
1902 0.75
1903 0.1
1904 O0
1900 2.4
1901 0.2
1902 1.05
1903 0.2
1908 0
1909 293
1910 293
1909 102
1910 102
1911 1
1915 0
1913 15
1915 1
1913 16
1916 2
1914 0
1918 0
......@@ -149,7 +150,7 @@ pwr_exe:
1920 0
1917 0
1921 0
1922 4
1922 2
1923 0
1907 0
1906
......@@ -161,26 +162,54 @@ pwr_exe:
505 1
502
7
700 0.15
701 0.1
700 0.2
701 0.2
99
503
7
700 0.75
701 0.75
700 2.4
701 1.05
99
99
1912
28
2800 1
2801 0
2802 0
2802 6.07153e-17
2803 0
2804 1
2805 0
2805 -2.63678e-16
2806 0
99
99
29
2907
13
1300 1
1301 304
1306 0
1302 2
1305 1
1303
7
700 0.55
701 0.65
99
1304 0
1307 0
99
2908
28
2800 1
2801 0
2802 0.781156
2803 0
2804 1
2805 0.2
2806 0
99
2901 0
99
99
302 0
304 0
......@@ -188,11 +217,11 @@ pwr_exe:
305 0
306
307
308 4
308 0
330 0
321 0
321 16
331 0
309 29
309 0
313 0
322 0
323 0
......@@ -211,32 +240,33 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
105 0
101 1
106 0
102 65532
102 33619964
103 0
99
99
3
300 pwr_smallbuttoncenter
300 pwr_indsquare
301
2
19
1904 O0
1900 2.4
1901 0.2
1902 1.05
1903 0.2
1904
1900 0.75
1901 0.15
1902 0.75
1903 0.1
1908 0
1909 102
1910 102
1909 293
1910 293
1911 1
1915 1
1913 16
1915 0
1913 15
1916 2
1914 0
1918 0
......@@ -244,7 +274,7 @@ pwr_exe:
1920 0
1917 0
1921 0
1922 2
1922 4
1923 0
1907 0
1906
......@@ -256,53 +286,25 @@ pwr_exe:
505 1
502
7
700 0.2
701 0.2
700 0.15
701 0.1
99
503
7
700 2.4
701 1.05
700 0.75
701 0.75
99
99
1912
28
2800 1
2801 0
2802 6.07153e-17
2803 0
2804 1
2805 -2.63678e-16
2806 0
99
99
29
2907
13
1300 1
1301 304
1306 0
1302 2
1305 1
1303
7
700 0.55
701 0.65
99
1304 0
1307 0
99
2908
28
2800 1
2801 0
2802 0.781156
2802 0
2803 0
2804 1
2805 0.2
2805 0
2806 0
99
2901 0
99
99
302 0
......@@ -311,11 +313,11 @@ pwr_exe:
305 0
306
307
308 0
308 4
330 0
321 16
321 0
331 0
309 0
309 29
313 0
322 0
323 0
......@@ -334,13 +336,14 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
105 0
101 1
106 0
102 33619964
102 65532
103 0
99
99
......@@ -529,6 +532,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -752,6 +756,7 @@ pwr_exe:
319 0
320 0
328 1
332 0
329
1
100 1
......@@ -932,6 +937,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -1180,6 +1186,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -1377,6 +1384,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -1576,6 +1584,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
329
1
100 1
......@@ -6342,9 +6351,9 @@ pwr_exe:
99
27
2703 10000
2704 114
2704 295
2722 10000
2705 114
2705 295
2723 10000
2706 10000
2708 0
......@@ -8281,6 +8290,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
99
99
99
......@@ -8490,6 +8500,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
99
99
99
......@@ -8699,6 +8710,7 @@ pwr_exe:
319 0
320 0
328 0
332 0
99
99
99
......
abb/wbl/mcomp/src/abb.wb_load
View file @ 8bb0d3e8
This diff is collapsed.
abb/wbl/mcomp/src/pwr_abb_acs880_1fo.flw
View file @ 8bb0d3e8
This diff is collapsed.
abb/wbl/mcomp/src/pwr_abb_acs880_1sim.flw
View file @ 8bb0d3e8
This diff is collapsed.
otherio/doc/orm/src/os_templ/hw_templ/makefile 0 → 100644
View file @ 8bb0d3e8
include $(pwre_dir_symbols)
ifndef variables_mk
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/variables.mk
endif
ifndef variables_mk
include $(pwre_kroot)/tools/bld/src/$(os_name)/variables.mk
endif
ifndef rules_mk
-include $(pwre_kroot)/tools/bld/src/$(os_name)/$(hw_name)/rules.mk
endif
ifndef rules_mk
include $(pwre_kroot)/tools/bld/src/$(os_name)/rules.mk
endif
vpath %.gif $(hw_source):$(os_source):$(co_source)
vpath %.png $(hw_source):$(os_source):$(co_source)
source_dirs := $(hw_source) $(os_source) $(co_source)
gif_sources := $(sort \
$(foreach file, \
$(foreach dir, \
$(source_dirs), \
$(wildcard $(dir)/*.gif) \
), $(notdir $(file)) \
) \
)
png_sources := $(sort \
$(foreach file, \
$(foreach dir, \
$(source_dirs), \
$(wildcard $(dir)/*.png) \
), $(notdir $(file)) \
) \
)
html_sources := $(sort \
$(foreach file, \
$(foreach dir, \
$(source_dirs), \
$(wildcard $(dir)/*.html) \
), $(notdir $(file)) \
) \
)
export_gif := $(patsubst %.gif,$(doc_dir)/en_us/orm/%.gif,$(gif_sources))
export_png := $(patsubst %.png,$(doc_dir)/en_us/orm/%.png,$(png_sources))
export_html := $(patsubst %.html,$(doc_dir)/en_us/orm/%.html,$(html_sources))
clean_gif := $(patsubst %.gif,clean_%.gif,$(gif_sources))
clean_png := $(patsubst %.png,clean_%.png,$(png_sources))
clean_html := $(patsubst %.html,clean_%.html,$(html_sources))
.SUFFIXES:
$(doc_dir)/en_us/orm/%.gif : %.gif
@ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target)
@ $(cp) $(cpflags) $(source) $(doc_dir)/sv_se/orm
@ $(cp) $(cpflags) $(source) $(doc_dir)/help
$(doc_dir)/en_us/orm/%.png : %.png
@ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target)
@ $(cp) $(cpflags) $(source) $(doc_dir)/sv_se/orm
@ $(cp) $(cpflags) $(source) $(doc_dir)/help
$(doc_dir)/en_us/orm/%.html : ../../%.html
@ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target)
@ $(cp) $(cpflags) $(source) $(doc_dir)/sv_se/orm
@ $(cp) $(cpflags) $(source) $(doc_dir)/help
.PHONY : all init copy lib exe clean realclean \
$(clean_gif) $(clean_png)
all : init copy lib exe
init :
copy : $(export_gif) $(export_png) $(export_html)
lib :
exe :
clean :
realclean : clean $(clean_gif) $(clean_png) $(clean_html) $(clean_c)
$(clean_gif) : clean_%.gif : %.gif
@ $(rm) $(rmflags) $(doc_dir)/orm/$*.gif
$(clean_png) : clean_%.png : %.png
@ $(rm) $(rmflags) $(doc_dir)/orm/$*.png
$(clean_html) : clean_%.html : %.html
@ $(rm) $(rmflags) $(doc_dir)/orm/$*.html
otherio/wbl/mcomp/src/cnv_setup.dat 0 → 100644
View file @ 8bb0d3e8
#
# Setup file for co_convert
#
# Definition of groups
group NodeConfiguration nmps_nmpsmirrorconfig.html
group Powerlink otherio_epl_module.html
group USB otherio_motioncontrol_usb.html
group Modbus otherio_modbus_tcp_slave.html
group Arduino otherio_arduino_usb.html
group Hilscher otherio_hilscher_cifx_diag.html
group UDP otherio_udp_io.html
group SPI otherio_spi_master.html
group Nodave otherio_nodave_plc.html
\ No newline at end of file
otherio/wbl/mcomp/src/otherio.wb_load
View file @ 8bb0d3e8
This diff is collapsed.
src/wbl/pwrb/src/cnv_setup.dat
View file @ 8bb0d3e8
......@@ -13,8 +13,6 @@ group Supervision pwrb_asup.html
group IO pwrb_chanai.html
group Signals pwrb_ai.html
group Channels pwrb_chanai.html
group IO_Profibus pwrb_pb_profiboard.html
group IO_PSS9000 pwrb_ai_ai32up.html
group PlcGrafcet pwrb_initstep.html
group PlcIO pwrb_apcollect.html
group PlcLogic pwrb_and.html
......
xtt/lib/xtt/src/xtt_evlist.cpp
View file @ 8bb0d3e8
......@@ -1019,7 +1019,7 @@ void EvList::event_ack( mh_sAck *msg)
dest_code = flow_eDest_IntoLast;
dest_node = NULL;
}
new ItemAlarm( this, "Alarm",
ItemAlarm *item = new ItemAlarm( this, "Alarm",
net_NetTimeToTime( &event->Info.EventTime), "",
event->Ack.EventName, event->Info.EventFlags,
event->Info.EventPrio, event->Info.Id,
......@@ -1027,6 +1027,9 @@ void EvList::event_ack( mh_sAck *msg)
&event->Ack.SupObject, dest_node, dest_code, &sts);
if ( EVEN(sts)) return;
size++;
view_alarm( item);
view_configure();
}
else {
......@@ -1095,7 +1098,7 @@ void EvList::event_return( mh_sReturn *msg)
dest_code = flow_eDest_IntoLast;
dest_node = NULL;
}
new ItemAlarm( this, "Alarm",
ItemAlarm *item = new ItemAlarm( this, "Alarm",
net_NetTimeToTime( &event->Info.EventTime), event->Msg.EventText,
event->Return.EventName, event->Info.EventFlags,
event->Info.EventPrio, event->Info.Id,
......@@ -1103,6 +1106,9 @@ void EvList::event_return( mh_sReturn *msg)
&event->Return.SupObject, dest_node, dest_code, &sts);
if ( EVEN(sts)) return;
size++;
view_alarm( item);
view_configure();
}
else {
......@@ -2041,7 +2047,7 @@ void ItemCategory::alarm( EvList *evlist, ItemAlarm *item)
}
brow_CreateNode( evlist->brow->ctx, name, nc,
node, flow_eDest_IntoLast, item, 1, &item->tree_node);
node, flow_eDest_IntoFirst, item, 1, &item->tree_node);
item->update_text( 1);
brow_SetAnnotPixmap( node, 0, evlist->brow->pixmap_openmap);
}
......
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