Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send more data to Zynq #191

Merged
merged 103 commits into from
Nov 14, 2023
Merged

Send more data to Zynq #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
c03180c
add new zynqmon_data blocks for clk and ff's 12-ch part + present bit…
pkotamnives May 26, 2023
2f2d1c3
a minor clk bug
pkotamnives May 26, 2023
29997b5
update count and start as in yaml_2
pkotamnives May 27, 2023
96cca28
add optical power info to FFDAQ+FF12 w/ 25Gbs in MONI2C and Zynq
pkotamnives Jun 30, 2023
e86da9a
update README
pkotamnives Jun 30, 2023
0435b16
a few numerical error
pkotamnives Jun 30, 2023
26f1476
Merge branch 'master' into dev_zynqmon_path
pkotamnives Jun 30, 2023
624308c
fix Clang
pkotamnives Jun 30, 2023
ab346a7
fix codacy
pkotamnives Jun 30, 2023
9997053
fix codacy v2
pkotamnives Jun 30, 2023
cf92d98
fix codacy v3
pkotamnives Jun 30, 2023
7f933ee
fix clock data type to be consistent with sm_cm_config
pkotamnives Jul 5, 2023
95bcaf1
separate 12-ch and 4-ch to send via zynqmon
pkotamnives Jul 5, 2023
9c01e0a
enlarge ZM*ENTRIES
pkotamnives Jul 5, 2023
d8483f2
sync code to sm_cm_config
pkotamnives Jul 5, 2023
55307b3
modify zynqmon + assisted by mcu_generate for data
pkotamnives Jul 19, 2023
18c177a
success sending clk + ff info except optical power
pkotamnives Jul 21, 2023
de85809
try to solve shifting 32-bit by 251-bit
pkotamnives Aug 2, 2023
6e5cf78
try again
pkotamnives Aug 2, 2023
2e5564e
add clkconfig in zynq data
pkotamnives Aug 2, 2023
a222b9e
fix REV1 failed
pkotamnives Aug 2, 2023
d9dee06
fix cadacy complaint
pkotamnives Aug 2, 2023
8fc25af
fix cadacy complaint again
pkotamnives Aug 2, 2023
3acf338
try resolve codacy again
pkotamnives Aug 9, 2023
e2ce330
resolve built failed
pkotamnives Aug 9, 2023
7ae9519
fix cadacy complaint again
pkotamnives Aug 9, 2023
4e272e2
fix cadacy complaint again
pkotamnives Aug 9, 2023
01c42c2
fix clang format
pkotamnives Aug 9, 2023
e38a77a
fix codacy
pkotamnives Aug 9, 2023
5728596
fix bug + codacy
pkotamnives Aug 9, 2023
53c4bc9
fix codacy
pkotamnives Aug 9, 2023
52a307d
fix clang
pkotamnives Aug 9, 2023
8c64db0
fix codacy
pkotamnives Aug 9, 2023
7c09f91
maybe last attempt to fix codacy
pkotamnives Aug 11, 2023
8b44241
change configASSERT to if cond't
pkotamnives Aug 11, 2023
3aee00c
need a return to prevent codacy
pkotamnives Aug 11, 2023
e40172b
fix build bug
pkotamnives Aug 11, 2023
c3aa400
success sending a clock config version to zynq (just r0a for now)
pkotamnives Aug 17, 2023
f94713b
fix rev1 build failed
pkotamnives Aug 17, 2023
5f95c6a
fix a bug from optical power check
pkotamnives Aug 18, 2023
4d1a2e7
Merge branch 'master' into dev_zynqmon_path
pkotamnives Aug 19, 2023
836ce33
fix bugs for sending present bits
pkotamnives Aug 19, 2023
9faf3a8
Merge branch 'dev_zynqmon_path' of github.com:apollo-lhc/cm_mcu into …
pkotamnives Aug 19, 2023
f65828d
combine ff is present + is 25gbs to one data steam
pkotamnives Aug 23, 2023
38de269
working version with all clock configs sent
pkotamnives Aug 25, 2023
bdbee5c
add all inventory info and successfully sent
pkotamnives Aug 25, 2023
142ccbb
fix build failed
pkotamnives Aug 25, 2023
598cf5d
a better start bit scheme
pkotamnives Sep 1, 2023
8d77252
Merge commit '06405f20a51b0cf5f5dc6adf0f3fb4cf32241309' as 'sm_cm_con…
pkotamnives Sep 8, 2023
06405f2
Squashed 'sm_cm_config/' content from commit 137e4c2
pkotamnives Sep 8, 2023
dadc7f5
Merge tag 'v0.99.5' into dev_zynqmon_path
pkotamnives Sep 8, 2023
db5d4a1
apply clang format (mostly to sm_cm_config)
pkotamnives Sep 8, 2023
ad28e59
Squashed 'sm_cm_config/' changes from 137e4c2..4fbba1f
pwittich Sep 26, 2023
38d31f5
Merge commit 'ad28e5906ebe85a049cbb4b1fe8a69282201be87' into dev_zynq…
pwittich Sep 26, 2023
7c372f2
Merge commit 'df85c9b4a3bfb9d24048ebb2426b7aa33e5a4eb9' into dev_zynq…
pkotamnives Sep 29, 2023
df85c9b
Squashed 'sm_cm_config/' changes from 4fbba1f..38d31f5
pkotamnives Sep 29, 2023
20e4ac8
modify *allclk for sm_cm_config
pkotamnives Sep 29, 2023
dece1c8
Merge commit 'c16e3bee7e9ee31655f83527ba66336d42a01e5e' into dev_zynq…
pkotamnives Sep 30, 2023
c16e3be
Squashed 'sm_cm_config/' changes from 38d31f5..855b371
pkotamnives Sep 30, 2023
2a7bdb3
Squashed 'sm_cm_config/' changes from 855b371..9796670
pwittich Oct 6, 2023
d480b69
Merge commit '2a7bdb3df644c783a8f18d7662d4f8ec48b07617' into dev_zynq…
pwittich Oct 6, 2023
fa582d9
Squashed 'sm_cm_config/' changes from 9796670..0913c37
pwittich Oct 6, 2023
1ab237f
Merge commit 'fa582d9a095776363b0ed398c672732d541dad92' into dev_zynq…
pwittich Oct 6, 2023
a929418
updates for including auto-generated MCU code
pwittich Oct 6, 2023
fb05b9d
rev1 build fix
pwittich Oct 6, 2023
c5b396d
Merge commit '860c84667d17527530eb60f86cc0e143aeee1f58' into dev_zynq…
pkotamnives Oct 9, 2023
860c846
Squashed 'sm_cm_config/' changes from 855b371..400f5a3
pkotamnives Oct 9, 2023
d8bd3fc
split allclk to be conistent with the xml file
pkotamnives Oct 9, 2023
04cadd7
resolve merge conflict
pkotamnives Oct 9, 2023
593fdc3
add ff_optpow CLI
pkotamnives Oct 9, 2023
7cc7cde
updates for tying py scripts into build
pwittich Oct 10, 2023
350b59d
clean up py files
pwittich Oct 10, 2023
fcd0b5b
Squashed 'sm_cm_config/' changes from 400f5a3..5ad5777
pwittich Oct 10, 2023
caed78d
Merge commit 'fcd0b5bdfbe41ac807658a994c43b76a5873efee' into dev_zynq…
pwittich Oct 10, 2023
e410bd1
pylint cleanups and py cleanups
pwittich Oct 10, 2023
d788866
Merge commit '4c4cb326217ac4512fc1a2d25f9aa9b9412b0560' into dev_zynq…
pwittich Oct 10, 2023
4c4cb32
Squashed 'sm_cm_config/' changes from 5ad5777..c268e4b
pwittich Oct 10, 2023
1ff831a
clean up yaml file and py scripts
pwittich Oct 10, 2023
39484a3
Update c-cpp.yml
pwittich Oct 10, 2023
b6b3539
formatting
pwittich Oct 10, 2023
45ecb8f
update ci files
pwittich Oct 10, 2023
89e0329
remove `clang-format` call from mcu_generate
pwittich Oct 11, 2023
19e794e
don't run ci against py 3.8
pwittich Oct 11, 2023
28532ef
ensure that the yaml files are processed in order
pwittich Oct 13, 2023
56b3340
add optpow CLI + clean-up structs
pkotamnives Oct 13, 2023
2d87188
fix build rev1 + clang format
pkotamnives Oct 13, 2023
5387fd6
avoid buffer overrun
pkotamnives Oct 18, 2023
d0b4868
set a size of 20 char
pkotamnives Oct 18, 2023
e9d2ec9
Merge commit 'd2d1a1ca8179235f096908827ecf9515125c91bf' into dev_zynq…
pkotamnives Oct 25, 2023
d2d1a1c
Squashed 'sm_cm_config/' changes from c268e4b..ef151ce
pkotamnives Oct 25, 2023
fd4fb80
update sm_cm_config + delete zm_fill_structs_old
pkotamnives Oct 25, 2023
78ae126
Update Makefile
pwittich Oct 26, 2023
504f80d
Squashed 'sm_cm_config/' changes from ef151ce..9553b4c
pwittich Oct 31, 2023
4b791c8
Merge commit '504f80deadd783638df46fade78ab2ea848e5b57' into dev_zynq…
pwittich Oct 31, 2023
9b4106f
update to include zynqmon_address.h file
pwittich Oct 31, 2023
f4f2692
clang-format
pwittich Oct 31, 2023
ad6d5aa
Update Makefile
pwittich Oct 31, 2023
ff48a06
clean up copy/paste code
pkotamnives Nov 1, 2023
77ff48f
Merge branch 'dev_zynqmon_path' of github.com:apollo-lhc/cm_mcu into …
pkotamnives Nov 1, 2023
d52edb3
add comment to obscure ffpart_bit for zynq
pkotamnives Nov 1, 2023
47cfd80
store clk configs differently to out of scope pointer
pkotamnives Nov 3, 2023
12f614e
move ff non-monitoring variables out of moni2c struct
pkotamnives Nov 8, 2023
402c7e3
make rev2 exclusively for some ff stuff
pkotamnives Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .codacy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
exclude_paths:
- "sm_cm_config/**"
7 changes: 7 additions & 0 deletions .github/workflows/c-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,20 @@ jobs:
with:
files_ignore: |
**/*.yml
**/*.py
**/*.xml
**/*.ipynb
.clang*
.git*
**/*.sh
**/*.def
**/Makefile
makedefs
**/*.md
**/.pylintrc
**/.gitignore
**/.git*
**/LICENSE
- name: Format changed files
if: steps.changed-files.outputs.any_changed == 'true'
uses: DoozyX/[email protected]
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,5 @@ compile_commands.json
c_cpp_properties.json
.cache
/.metadata/
projects/cm_mcu/ZynqMon_addresses.c
projects/cm_mcu/ZynqMon_addresses.h
Loading
Loading