Skip to content

Fix source voltage compensation on R6B board #102

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

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Fix source voltage compensation on R6B board #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tfrog-motordriver/controlVelocity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ typedef struct _DriverState
uint32_t velcontrol;
uint32_t ping_request;
uint32_t odom_drop;
int32_t vsrc_max;
} DriverState;

#ifdef static_assert
Expand Down
15 changes: 14 additions & 1 deletion tfrog-motordriver/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,19 @@ int main()
driver_state.ifmode = 0;
driver_state.watchdog = 0;
driver_state.odom_drop = 0;
driver_state.vsrc_max = 0x3ff;
switch (driver_state.board_version)
{
case BOARD_R6A:
case BOARD_R4:
break;
case BOARD_R6B:
#if defined(tfrog_rev5)
driver_state.vsrc_max = 0x3ff * VSRC_CONV_B;
#endif
break;
}

// Driver loop
while (1)
{
Expand Down Expand Up @@ -1012,7 +1025,7 @@ int main()
driver_state.vsrc = Filter1st_Filter(&voltf, (int32_t)(analog[7] & 0x0FFF));
ADC_Start();

if (driver_param.vsrc_rated >= 0x03FF)
if (driver_param.vsrc_rated >= driver_state.vsrc_max)
{
driver_state.vsrc_factor = 32768;
}
Expand Down