fixed callback i2c for new lidarlite driver

avtoku · avtoku · commit 2bb1e998fec4 · 2026-01-07T12:19:10.000-08:00
diff --git a/boards/varmint_h7/pixracer_pro/specific/Callbacks.cpp b/boards/varmint_h7/pixracer_pro/specific/Callbacks.cpp
@@ -112,17 +112,13 @@ void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef * hspi) // All spi dma rx interr
 void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef * hi2c)
 {
   if (varmint.pitot_.isMy(hi2c)) varmint.pitot_.endDma();
-}
-
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c)
-{
-  if (varmint.range_.isMy(hi2c)) varmint.range_.endRxDma();
+  if (varmint.range_.isMy(hi2c)) varmint.range_.stateMachine();
   if (varmint.mag_.isMy(hi2c)) varmint.mag_.endRxDma();
 }
 
 void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c)
 {
-  if (varmint.range_.isMy(hi2c)) varmint.range_.endTxDma();
+  if (varmint.range_.isMy(hi2c)) varmint.range_.stateMachine();
   if (varmint.mag_.isMy(hi2c)) varmint.mag_.endTxDma();
 }
 
diff --git a/boards/varmint_h7/varmint_11X/specific/Callbacks.cpp b/boards/varmint_h7/varmint_11X/specific/Callbacks.cpp
@@ -115,20 +115,14 @@ void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef * hspi) // All spi dma rx interr
 void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef * hi2c)
 {
   if (varmint.pitot_.isMy(hi2c)) varmint.pitot_.endDma();
+  if (varmint.range_.isMy(hi2c)) varmint.range_.stateMachine();
 }
 
 void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c)
 {
-  if (varmint.range_.isMy(hi2c)) varmint.range_.endRxDma();
+  if (varmint.range_.isMy(hi2c)) varmint.range_.stateMachine();
 }
 
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c)
-{
-  if (varmint.range_.isMy(hi2c)) varmint.range_.endTxDma();
-}
-
-
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // UART Rx complete callbacks
 //

Original file line number	Diff line number	Diff line change
`@@ -112,17 +112,13 @@ void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef * hspi) // All spi dma rx interr`
`112`	`112`	`void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef * hi2c)`
`113`	`113`	`{`
`114`	`114`	`if (varmint.pitot_.isMy(hi2c)) varmint.pitot_.endDma();`
`115`		`-}`
`116`		`-`
`117`		`-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c)`
`118`		`-{`
`119`		`- if (varmint.range_.isMy(hi2c)) varmint.range_.endRxDma();`
	`115`	`+ if (varmint.range_.isMy(hi2c)) varmint.range_.stateMachine();`
`120`	`116`	`if (varmint.mag_.isMy(hi2c)) varmint.mag_.endRxDma();`
`121`	`117`	`}`
`122`	`118`
`123`	`119`	`void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c)`
`124`	`120`	`{`
`125`		`- if (varmint.range_.isMy(hi2c)) varmint.range_.endTxDma();`
	`121`	`+ if (varmint.range_.isMy(hi2c)) varmint.range_.stateMachine();`
`126`	`122`	`if (varmint.mag_.isMy(hi2c)) varmint.mag_.endTxDma();`
`127`	`123`	`}`
`128`	`124`
Original file line number	Diff line number	Diff line change
`@@ -115,20 +115,14 @@ void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef * hspi) // All spi dma rx interr`
`115`	`115`	`void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef * hi2c)`
`116`	`116`	`{`
`117`	`117`	`if (varmint.pitot_.isMy(hi2c)) varmint.pitot_.endDma();`
	`118`	`+ if (varmint.range_.isMy(hi2c)) varmint.range_.stateMachine();`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c)`
`121`	`122`	`{`
`122`		`- if (varmint.range_.isMy(hi2c)) varmint.range_.endRxDma();`
	`123`	`+ if (varmint.range_.isMy(hi2c)) varmint.range_.stateMachine();`
`123`	`124`	`}`
`124`	`125`
`125`		`-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c)`
`126`		`-{`
`127`		`- if (varmint.range_.isMy(hi2c)) varmint.range_.endTxDma();`
`128`		`-}`
`129`		`-`
`130`		`-`
`131`		`-`
`132`	`126`	`//////////////////////////////////////////////////////////////////////////////////////////`
`133`	`127`	`// UART Rx complete callbacks`
`134`	`128`	`//`