Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
E
Euro ADC 65M 14b 40cha gw PUMA-gw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Euro ADC 65M 14b 40cha gw PUMA-gw
Commits
c9801c0c
Commit
c9801c0c
authored
May 02, 2018
by
Dave Newbold
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://bitbucket.org/solidexperiment/solid_firmware
parents
afe09b58
1a904cb4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
top_decl.vhd
projects/64ch/firmware/hdl/top_decl.vhd
+1
-1
top_decl.vhd
projects/8ch/firmware/hdl/top_decl.vhd
+1
-1
No files found.
projects/64ch/firmware/hdl/top_decl.vhd
View file @
c9801c0c
...
...
@@ -11,7 +11,7 @@ package top_decl is
constant
MAC_ADDR
:
std_logic_vector
(
47
downto
0
)
:
=
X"020ddba11500"
;
-- last byte from local addr
constant
IP_ADDR
:
std_logic_vector
(
31
downto
0
)
:
=
X"c0a8eb00"
;
-- last byte from local addr
constant
FW_REV
:
std_logic_vector
(
15
downto
0
)
:
=
X"001
6
"
;
constant
FW_REV
:
std_logic_vector
(
15
downto
0
)
:
=
X"001
7
"
;
constant
N_CHAN
:
integer
:
=
64
;
constant
BLK_RADIX
:
integer
:
=
8
;
-- 256 sample blocks
...
...
projects/8ch/firmware/hdl/top_decl.vhd
View file @
c9801c0c
...
...
@@ -11,7 +11,7 @@ package top_decl is
constant
MAC_ADDR
:
std_logic_vector
(
47
downto
0
)
:
=
X"020ddba11503"
;
constant
IP_ADDR
:
std_logic_vector
(
31
downto
0
)
:
=
X"c0a8eb00"
;
constant
FW_REV
:
std_logic_vector
(
15
downto
0
)
:
=
X"001
6
"
;
constant
FW_REV
:
std_logic_vector
(
15
downto
0
)
:
=
X"001
7
"
;
constant
N_CHAN
:
integer
:
=
8
;
constant
BLK_RADIX
:
integer
:
=
8
;
-- 256 sample blocks
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment