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.

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

Update how monitoring code is generated and data stored #221

Merged
merged 74 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
1777a34
Update ZynqMonTask.c
pwittich Apr 9, 2024
ac64b8d
start breaking up LocalTasks.c
pwittich Apr 11, 2024
9b6ea79
naming cleanups
pwittich Apr 15, 2024
ca1068c
Cleanup
pwittich Apr 18, 2024
a4b5882
FFLDAQ->FFL4
pwittich May 6, 2024
a66a61c
header file cleanup and snprintf
pwittich May 6, 2024
bb96d61
code cleanup, intermediate
pwittich May 6, 2024
f49c187
clang-format
pwittich May 6, 2024
46ac14f
code that sort of works
pwittich May 7, 2024
673b016
Update Makefile clean target
pwittich May 9, 2024
a22f917
minor tweaks
pwittich May 9, 2024
6dabeab
in progress
pwittich May 19, 2024
490b449
WIP
pwittich May 19, 2024
63d601a
WIP
pwittich May 20, 2024
8cd98a0
bug fixes
pwittich May 20, 2024
59cf552
missing header
pwittich May 20, 2024
2ee56c8
fix rev1 build
pwittich May 20, 2024
4c28a27
formatting
pwittich May 20, 2024
c4e760e
add F2 task
pwittich May 21, 2024
e7cf33c
WIP
pwittich May 22, 2024
dc67bb2
clang-format
pwittich May 22, 2024
1939c57
work in progress
pwittich May 23, 2024
80d34bb
adapt to two sets of data arrays
pwittich May 23, 2024
df67d03
formatting and cleanup
pwittich May 23, 2024
081f873
clang complaint
pwittich May 23, 2024
08f68ef
fix b04 laser off bug and add ff_dump_names
pwittich May 27, 2024
e22dd8a
Merge branch 'MonDataCleanup' of github.com:apollo-lhc/cm_mcu into Mo…
pwittich May 27, 2024
8ca4325
add clock task
pwittich May 28, 2024
5b91e1b
Update SensorControl.c
pwittich May 28, 2024
85053c1
clock mon doesn't crash
pwittich May 28, 2024
663c00f
clang-format
pwittich May 28, 2024
001c597
transition to new i2c mon task
pwittich May 29, 2024
b7ccfc9
bug fixes
pwittich May 30, 2024
afcbbbf
fix rev1 build and format.
pwittich May 30, 2024
e97c1b7
remove _new and clean unused
pwittich May 30, 2024
0ce7788
format checks
pwittich May 30, 2024
5868012
speed up initial check of FF types w 4 byte reads
pwittich May 31, 2024
d258b1e
further cleanups
pwittich May 31, 2024
5bc5d5e
Update SensorControl.c
pwittich May 28, 2024
477812f
Merge branch 'master' into MonDataCleanup
pwittich May 31, 2024
c9b5510
sync yaml files, reimplement disable bit sending
pwittich May 31, 2024
8594fdb
Merge branch 'master' into MonDataCleanup
pwittich May 31, 2024
7625d22
formatting, sizes
pwittich May 31, 2024
788ce06
wip
pwittich Jun 1, 2024
5314718
cleanup and fix Rev1
pwittich Jun 2, 2024
6439b43
Committing clang-format changes
pwittich Jun 2, 2024
fc3e85c
Update xml_generate.py
pwittich Jun 2, 2024
c2f7ae8
update `FireflyType` for live check on 25G
pwittich Jun 2, 2024
dda7452
cleanup
pwittich Jun 2, 2024
eef0448
error checking
pwittich Jun 2, 2024
0930c95
minor tweaks
pwittich Jun 3, 2024
21c8631
allow for different pages for a command
pwittich Jun 3, 2024
3992ba4
cleanup
pwittich Jun 3, 2024
ba989b9
reduce scope and label active low
pwittich Jun 4, 2024
a6cce46
clean up comments
pwittich Jun 4, 2024
c154dbb
clang-format
pwittich Jun 4, 2024
0695e65
WIP
pwittich Jun 5, 2024
6299d1b
per device optical power
pwittich Jun 5, 2024
8ddabb6
add getopt* and byteswap as needed
pwittich Jun 6, 2024
42cd9a5
i2c comms with FF to 400 kHz
pwittich Jun 6, 2024
1a4baf3
new 3.3V FF command
pwittich Jun 7, 2024
9e1bd1f
logging
pwittich Jun 7, 2024
6389eee
update enable_3v8 for passing in mask of pairs
pwittich Jun 7, 2024
35e9390
clang-format
pwittich Jun 7, 2024
7e0cb1a
Update FireflyUtils.c
pwittich Jun 7, 2024
1f7ab84
fix byteswapp on optpow
pwittich Jun 11, 2024
6ce5e59
remove check on 4.0V
pwittich Jun 11, 2024
6b1f40a
housekeeping
pwittich Jun 11, 2024
011d9b9
more monitoring registers
pwittich Jun 11, 2024
338a8f1
clang-format
pwittich Jun 11, 2024
931193a
clean up constants usage
pwittich Jun 11, 2024
21bf341
Update FireflyUtils.c
pwittich Jun 11, 2024
00319b7
Update FireflyUtils.c
pwittich Jun 12, 2024
3bca61c
remove dead code
pwittich Jun 12, 2024
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
1 change: 1 addition & 0 deletions projects/cm_mcu/AlarmUtilities.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "AlarmUtilities.h"
#include "Tasks.h"
#include "MonitorTask.h"
#include "FireflyUtils.h"

#include "common/log.h"
#include "common/pinsel.h"
Expand Down
Loading