Skip to content

Commit

Permalink
Merge remote-tracking branch 'modalai/modalai-1.12-dev' into modalai-…
Browse files Browse the repository at this point in the history
…v1.12.3-testing

 Conflicts:
	src/drivers/uart_esc/modalai_esc/modalai_esc.cpp
	src/drivers/uart_esc/modalai_esc/modalai_esc.hpp
  • Loading branch information
danielmohansahu committed Jun 16, 2022
2 parents 0a1ab9a + 36460bb commit 122bf05
Show file tree
Hide file tree
Showing 6 changed files with 411 additions and 97 deletions.
2 changes: 1 addition & 1 deletion msg/esc_report.msg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ uint32 esc_errorcount # Number of reported errors by ESC - if supported
int32 esc_rpm # Motor RPM, negative for reverse rotation [RPM] - if supported
float32 esc_voltage # Voltage measured from current ESC [V] - if supported
float32 esc_current # Current measured from current ESC [A] - if supported
uint8 esc_temperature # Temperature measured from current ESC [degC] - if supported
int8 esc_temperature # Temperature measured from current ESC [degC] - if supported
uint8 esc_address # Address of current ESC (in most cases 1-8 / must be set by driver)
uint8 esc_cmdcount # Counter of number of commands

Expand Down
Loading

0 comments on commit 122bf05

Please sign in to comment.