Tools/SCViewer
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.minres.com/VP/SCViewer.git into

Browse Source 
develop

Conflicts:
	com.minres.scviewer.database.test/inputs/simple_system.vcd
	com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
	com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs
	com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java
	com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
	com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java
	com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/WaveformColors.java
	com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java
	com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java
	com.minres.scviewer.e4.application/plugin.xml
	com.minres.scviewer.e4.product/scviewer.product
	com.minres.scviewer.target/neon.target
	com.minres.scviewer.target/photon.target
	com.minres.scviewer.ui/.settings/org.eclipse.jdt.groovy.core.prefs
This commit is contained in:
Eyck Jentzsch
2018-10-11 15:22:10 +02:00
parent c4b16338a8 021c2bceff
commit 0634b9cfd5
19 changed files with 179 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
com.minres.scviewer.database.test/inputs/simple_system.vcd
View File

@ -1622,7 +1622,7 @@ b1110100011010100101001010 aabdd
0aabdv
0aabdw
0aabdx
r0.0 bbbbb
r1.0 bbbbb
$end
#10000
@ -1643,7 +1643,6 @@ $end
#1287121272
b1000000000100000000000000000100 aabcr
r1.0 bbbbb
#1288121272
b111111110100111110 aaabi
@ -1659,43 +1658,33 @@ b11000000000100000000000000000100 aabcr
b111111110100111110 aabcw
b101010 aabdb
b111111110100111110 aabdc
r2.0 bbbbb
#1303801016
b1000 aaacx
r3.0 bbbbb
#1311382718
b100000000 aabcu
r2.0 bbbbb
#1312689908
b1000000010111110001 aabct
r1.0 bbbbb
#1315304288
b10000000000000000000010111110001 aabct
r0.0 bbbbb
#1317395792
b101011 aabdb
r-1.0 bbbbb
#1345892534
b101100 aabdb
r-2.0 bbbbb
#1375173590
b101101 aabdb
r-3.0 bbbbb
#1404454646
b101110 aabdb
r-2.0 bbbbb
#1437918710
b101111 aabdb
r-1.0 bbbbb
#1443670346
b11111111010100 aaabi
@ -1710,7 +1699,6 @@ b11111111010100 aabac
b10000000000000010000010111110001 aabct
b11111111010100 aabcw
b11111111010100 aabdc
r0.0 bbbbb
#1444438324
1aaaar