3 Commits b16e83cf10 ... dcf111f552

Tác giả SHA1 Thông báo Ngày
  namrota ghosh dcf111f552 function name updated from getBatteryMeasurement to controllerGetBatteryMeasurement 11 tháng trước cách đây
  namrota ghosh 90a262ffde function name updated from controller_SetCurrent to controllerSetCurrent 11 tháng trước cách đây
  namrota ghosh cf90a82700 function name updated from controller_SetCurrent to controllerSetCurrent 11 tháng trước cách đây
4 tập tin đã thay đổi với 10 bổ sung10 xóa
  1. 1 1
      main.c
  2. 5 5
      src/cc_cv_charging.c
  3. 2 2
      src/controller/controller.c
  4. 2 2
      src/controller/controller.h

+ 1 - 1
main.c

@@ -120,7 +120,7 @@ int main(void)
 
             //GET battery measurement from the Target
             printf("Reading Battery Measurement for slot %d\n", slot_id);
-            getBatteryMeasurement(slot_id);
+            controllerGetBatteryMeasurement(slot_id);
 
             //Reading battery state:
             Battery_StateCondition(slot_id);

+ 5 - 5
src/cc_cv_charging.c

@@ -164,7 +164,7 @@ void CC_CV_ControlCharging(uint8_t slot_id) {
     // PRE CHARGE STATE: Battery Voltage is lesser than 3000 mVolts
     case STATE_PRE_CHARGE:
       Battery_enableCharging(slot_id);
-      controller_SetCurrent(slot_id, charge_current);
+      controllerSetCurrent(slot_id, charge_current);
       printf("PRE CHARGING: Slot %d at %d mA.\n", slot_id, charge_current);
       chargeCurrent_initialized= false;
       break;
@@ -173,7 +173,7 @@ void CC_CV_ControlCharging(uint8_t slot_id) {
     // reaches to (MAXIMUM_VOLTAGE(4200)-BATTERY_THRESHOLD(20))= 4180 mV
     case STATE_CC_CHARGING:
       Battery_enableCharging(slot_id);
-      controller_SetCurrent(slot_id, charge_current);
+      controllerSetCurrent(slot_id, charge_current);
       printf("CC CHARGING: Slot %d, Current: %d mA, Voltage: %d mV.\n", slot_id, batt_current, batt_voltage);
       chargeCurrent_initialized= false;
       break;
@@ -192,7 +192,7 @@ void CC_CV_ControlCharging(uint8_t slot_id) {
         if(cvChargingPhaseCurrent >= batt_cutoff_current){
             printf("DAC CV Current: %d, Battery Voltage: %d, Battery Current: %d\n", cvChargingPhaseCurrent, batt_voltage, batt_current);
             cvChargingPhaseCurrent-= 5; 
-            controller_SetCurrent(slot_id, cvChargingPhaseCurrent);         
+            controllerSetCurrent(slot_id, cvChargingPhaseCurrent);         
         }else{
             printf("Battery Current: %d\n", batt_current);
             chargeCurrent_initialized= false;
@@ -207,7 +207,7 @@ void CC_CV_ControlCharging(uint8_t slot_id) {
     case STATE_DISCHARGING:
       Battery_enableCharging(slot_id);
       Battery_enableDischarging(slot_id);
-      controller_SetCurrent(slot_id, (-1 * charge_current));
+      controllerSetCurrent(slot_id, (-1 * charge_current));
       printf("DISCHARGING: Slot %d at %d mA.\n", slot_id, batt_current);
       chargeCurrent_initialized= false;
       //Safety Check
@@ -225,7 +225,7 @@ void CC_CV_ControlCharging(uint8_t slot_id) {
         Battery_disableCharging(slot_id);
         Battery_disableDischarging(slot_id);
         printf("Final Discharge with charge current:%d\n", charge_current);
-        controller_SetCurrent(slot_id, 0);
+        controllerSetCurrent(slot_id, 0);
       }else{
         battery->battery_charging_state= STATE_CC_CHARGING;
       }

+ 2 - 2
src/controller/controller.c

@@ -12,7 +12,7 @@
 Format: command + ((slot_id) + data (optional))
 */
 //Send command to set charge and discharge current to the target
-void controller_SetCurrent(uint8_t slot_id, int16_t current_mA){
+void controllerSetCurrent(uint8_t slot_id, int16_t current_mA){
 
     //For dynamic addressing:
     uint8_t target_address= TARGET_BASE_ADDRESS + ((slot_id & 0b00000100) >> 2);
@@ -101,7 +101,7 @@ void controller_EvaluateBatterySlotState(uint8_t slot_id, BatteryMeasurement *me
 
 
 // Following code worked with ADC as the target with now clocking issues:
-bool getBatteryMeasurement(uint8_t slot_id){
+bool controllerGetBatteryMeasurement(uint8_t slot_id){
     BatteryMeasurement measurement;
 
     //Dynamic addressing:

+ 2 - 2
src/controller/controller.h

@@ -18,7 +18,7 @@ typedef enum{
 }mcu_I2C_command;
 
 uint8_t detect_target_address();
-void controller_SetCurrent(uint8_t slot_id, int16_t current_mA);
+void controllerSetCurrent(uint8_t slot_id, int16_t current_mA);
 void controller_EvaluateBatterySlotState(uint8_t slot_id, BatteryMeasurement *measurement);
-bool getBatteryMeasurement(uint8_t slot_id);
+bool controllerGetBatteryMeasurement(uint8_t slot_id);
 #endif