Merge pull request #100 from WattRex/feature/MID_PWR

feature/MID_PWR Added define to convert to dW from mSI
WattRex · Jul 1, 2023 · 233df54 · 233df54
2 parents d8f5fab + 4ec168a
commit 233df54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/firmware/Sources/MID/MID_PWR/mid_pwr.c b/firmware/Sources/MID/MID_PWR/mid_pwr.c
@@ -157,7 +157,7 @@ extern uint32_t HAL_PWM_period;
 
 static SOA_e _checkSOA(const int16_t I, const uint16_t V, const MID_REG_limit_s limits){
 	SOA_e res = SOA_ok;
-	int16_t power = (int16_t)(((int32_t)I * (int32_t)V) /100000); // 10^-3(mW) *10^-3 (mW) / 10^-5 -> dW
+	int16_t power = (int16_t)(((int32_t)I * (int32_t)V) /MID_PWR_TO_dW); // 10^-3(mW) *10^-3 (mW) / 10^-5 -> dW
 	if (power > limits.lsPwrMax)
 		res = SOA_over_pwr;
 	else if (power < limits.lsPwrMin)
@@ -270,7 +270,7 @@ MID_PWR_result_e MID_PwrApplyCtrl(const int16_t ref, const uint16_t V_LS, const
 	int16_t new_duty;
 	switch (control_mode) { //first PI, if needed (in Pwr and V refs)
 		case MID_PWR_MODE_CP:
-			actual_power = (int16_t)(((int32_t)I_LS * (int32_t)V_LS)  /100000); // dW
+			actual_power = (int16_t)(((int32_t)I_LS * (int32_t)V_LS)  /MID_PWR_TO_dW); // dW
 			res = _calculatePI(ref, actual_power, MID_PWR_MODE_CP, limits, &curr_ref);
 			break;
 		case MID_PWR_MODE_CV:

diff --git a/firmware/Sources/MID/MID_PWR/mid_pwr.h b/firmware/Sources/MID/MID_PWR/mid_pwr.h
@@ -19,7 +19,7 @@
 /**********************************************************************************/
 /*                     Definition of local symbolic constants                     */
 /**********************************************************************************/
-
+#define MID_PWR_TO_dW 100000// 10^-3(mW) *10^-3 (mW) / 10^-5 -> dW
 /**********************************************************************************/
 /*                    Definition of local function like macros                    */
 /**********************************************************************************/