Modify data type of getIntV() and getExtV() to int32_t

Ultrawipf · Jul 16, 2024 · e8a1de2 · e8a1de2
1 parent cf9be52
commit e8a1de2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Firmware/FFBoard/Inc/voltagesense.h b/Firmware/FFBoard/Inc/voltagesense.h
@@ -9,8 +9,8 @@
 #define VOLTAGESENSE_H_
 #include "target_constants.h"
 
-uint16_t getIntV();
-uint16_t getExtV();
+int32_t getIntV();
+int32_t getExtV();
 void brakeCheck();
 
 /*

diff --git a/Firmware/FFBoard/Src/SerialFFB.cpp b/Firmware/FFBoard/Src/SerialFFB.cpp
@@ -74,7 +74,7 @@ void SerialFFB::set_gain(uint8_t gain){
  * Returns the index where the effect was created or -1 if it can not be created
  */
 int32_t SerialFFB::newEffect(uint8_t effectType){
-	uint32_t idx = this->effects_calc->find_free_effect(effectType);
+	int32_t idx = this->effects_calc->find_free_effect(effectType);
 	if(idx >= 0){
 		// Allocate effect
 		effects[idx].type = effectType;

diff --git a/Firmware/FFBoard/Src/voltagesense.cpp b/Firmware/FFBoard/Src/voltagesense.cpp
@@ -41,20 +41,20 @@ void setupBrakePin(uint32_t vdiffAct,uint32_t vdiffDeact,uint32_t vMax){
 	voltageDiffDeactivate = vdiffDeact;
 }
 
-uint16_t getIntV(){
+int32_t getIntV(){
 	return VSENSE_ADC_BUF[ADC_CHAN_VINT] * vSenseMult;
 }
 
-uint16_t getExtV(){
+int32_t getExtV(){
 	return VSENSE_ADC_BUF[ADC_CHAN_VEXT] * vSenseMult;
 }
 
 void brakeCheck(){
 	if(maxVoltage == 0 || brake_failure){
 		return;
 	}
-	uint16_t vint = getIntV();
-	uint16_t vext = getExtV();
+	int32_t vint = getIntV();
+	int32_t vext = getExtV();
 
 	if(vint < minVoltage && vext < minVoltage){
 		return; // Do not enable if device is unpowered (just measuring usb leakage)

diff --git a/Firmware/FFBoard/UserExtensions/Src/TMC4671.cpp b/Firmware/FFBoard/UserExtensions/Src/TMC4671.cpp
@@ -186,7 +186,7 @@ void TMC4671::restoreFlash(){
 }
 
 bool TMC4671::hasPower(){
-	uint16_t intV = getIntV();
+	int32_t intV = getIntV();
 	return (intV > 10000) && (getExtV() > 10000) && (intV < 78000);
 }