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

ADBMS Integration #138

Merged
merged 34 commits into from
Jan 25, 2025
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
60650d1
133 adbms submodule
Sabramz Nov 18, 2024
89b9d97
133 more copying
Sabramz Nov 18, 2024
004e83d
133 it works
Sabramz Nov 18, 2024
fe7b35e
133 debugging
Sabramz Nov 18, 2024
331f9dd
133 working prints
Sabramz Nov 18, 2024
a7bff61
adbms functions for config registers, get rid of some LTC code, start…
Sabramz Nov 21, 2024
ccff5e0
adbms reworking code for daisy chaining
Sabramz Nov 27, 2024
d1b4701
adbms wrapper written **untested**
Sabramz Dec 8, 2024
c671679
adbms cleaning up old functions
Sabramz Dec 8, 2024
f0a2a60
adbms balancing config changes
Sabramz Dec 14, 2024
e611107
adbms add chips to acc_data_t and make functions compatible with new …
Sabramz Dec 25, 2024
6791c57
adbms changing GPIO modes and integrating balancing functions with adbms
Sabramz Dec 26, 2024
93379f0
adbms cleaning up balancing and removing LTC driver from make file
Sabramz Dec 26, 2024
5a42a6b
adbms more cleanup of 22A code and starting on analyzer for alpha and…
Sabramz Jan 1, 2025
61e424e
adbms therms cleanup and changes for alpha and beta stacks
Sabramz Jan 6, 2025
540f19b
adbms functions for configuring chips
Sabramz Jan 6, 2025
591fe50
forgot to build
Sabramz Jan 6, 2025
a0e9240
adbms debugging volts and therms
Sabramz Jan 11, 2025
8a7b085
adbms therms mapping and temperature calculation, cleanup legacy code
Sabramz Jan 14, 2025
a3d12bc
adbms cleanup, add TODOs for future work
Sabramz Jan 14, 2025
5becce5
adbms cleanup, add TODOs for future work
Sabramz Jan 14, 2025
74ae15d
Set up task and send function for debug mode per cell data
Sabramz Jan 14, 2025
a44b476
debug mode create task and CAN message functions
Sabramz Jan 17, 2025
6e34ff5
adbms S vs C ADC comparison and PEC error count
Sabramz Jan 18, 2025
eda79ab
Merge branch 'per-cell-CAN' into 133-adbms-integration
Sabramz Jan 18, 2025
0c881b1
adbms debug mode stuff
Sabramz Jan 18, 2025
6f56377
adbms change debug mode CAN messages to use bit fields
Sabramz Jan 20, 2025
3dafe3b
General changes/improvements (#151)
jr1221 Jan 25, 2025
7e75f6a
Merge branch 'develop' into 133-adbms-integration
jr1221 Jan 25, 2025
b9218f2
fixups
jr1221 Jan 25, 2025
3426aaa
fmt
jr1221 Jan 25, 2025
89db8b6
segment reboot every 45 seconds
jr1221 Jan 25, 2025
a189aa7
fmt
jr1221 Jan 25, 2025
d02da4a
fmt
jr1221 Jan 25, 2025
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
Prev Previous commit
Next Next commit
fmt
jr1221 committed Jan 25, 2025
commit 3426aaabc3afae276115556ed28ce95ef5892e7d
28 changes: 14 additions & 14 deletions Core/Inc/can_handler.h
Original file line number Diff line number Diff line change
@@ -40,17 +40,17 @@
#define NOISE_SIZE 6
#define DEBUG_CANID 0x702

#define ALPHA_CELL_CANID 0x6FA
#define BETA_CELL_CANID 0x6FB
#define CELL_MSG_SIZE 7
#define BETA_STAT_A_CANID 0x6FD
#define BETA_STAT_A_SIZE 8
#define BETA_STAT_B_CANID 0x6FE
#define BETA_STAT_B_SIZE 8
#define ALPHA_STAT_A_CANID 0x6FC
#define ALPHA_STAT_A_SIZE 7
#define ALPHA_STAT_B_CANID 0x6FF
#define ALPHA_STAT_B_SIZE 7
#define ALPHA_CELL_CANID 0x6FA
#define BETA_CELL_CANID 0x6FB
#define CELL_MSG_SIZE 7
#define BETA_STAT_A_CANID 0x6FD
#define BETA_STAT_A_SIZE 8
#define BETA_STAT_B_CANID 0x6FE
#define BETA_STAT_B_SIZE 8
#define ALPHA_STAT_A_CANID 0x6FC
#define ALPHA_STAT_A_SIZE 7
#define ALPHA_STAT_B_CANID 0x6FF
#define ALPHA_STAT_B_SIZE 7

typedef struct {
uint32_t prev_tick;
@@ -74,9 +74,9 @@ typedef enum {
RL_MSG_COUNT
} rate_lim_t;

#define DEBUG_SIZE 8
#define FAULT_TIMER_CANID 0x6FF
#define FAULT_TIMER_SIZE 4
#define DEBUG_SIZE 8
#define FAULT_TIMER_CANID 0x6FF
#define FAULT_TIMER_SIZE 4

void can_receive_callback(CAN_HandleTypeDef *hcan);