2021-08-24 / ct_chen

Actions:
1. Webservice fix bug in "Charging" tab missing meter ic data for AX series and set RWD for all guns

Files:
1. EVSE/Modularization/WebService.c
   EVSE/rootfs/var/www/set_charging.php

EVSE/Modularization/WebService.c

@@ -2492,6 +2492,23 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo1,"SystemStatus",SystemStatus[0]);
 			json_object_object_add(ChargingInfo1,"EvBatterytargetCurrent",EvBatterytargetCurrent[0]);
 			json_object_object_add(ChargingInfo1,"PowerConsumption",PowerConsumption[0]);
+			if(strcmp(IsDO, "AX") == 0){
+				json_object_object_add(ChargingInfo1,"isCalibratedVaGain",isCalibratedVaGain[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedVbGain",isCalibratedVbGain[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedVcGain",isCalibratedVcGain[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedVaOffset",isCalibratedVaOffset[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedVbOffset",isCalibratedVbOffset[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedVcOffset",isCalibratedVcOffset[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedCaGain",isCalibratedCaGain[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedCbGain",isCalibratedCbGain[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedCcGain",isCalibratedCcGain[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedCaOffset",isCalibratedCaOffset[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedCbOffset",isCalibratedCbOffset[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedCcOffset",isCalibratedCcOffset[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedPa",isCalibratedPa[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedPb",isCalibratedPb[0]);
+				json_object_object_add(ChargingInfo1,"isCalibratedPc",isCalibratedPc[0]);
+			}
 			json_object_object_add(jobj2,"ChargingInfo1",ChargingInfo1);
 		}
 		if(connectorType2 != 0){
@@ -2513,6 +2530,23 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo2,"SystemStatus",SystemStatus[1]);
 			json_object_object_add(ChargingInfo2,"EvBatterytargetCurrent",EvBatterytargetCurrent[1]);
 			json_object_object_add(ChargingInfo2,"PowerConsumption",PowerConsumption[1]);
+			if(strcmp(IsDO, "AX") == 0){
+				json_object_object_add(ChargingInfo2,"isCalibratedVaGain",isCalibratedVaGain[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedVbGain",isCalibratedVbGain[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedVcGain",isCalibratedVcGain[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedVaOffset",isCalibratedVaOffset[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedVbOffset",isCalibratedVbOffset[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedVcOffset",isCalibratedVcOffset[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedCaGain",isCalibratedCaGain[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedCbGain",isCalibratedCbGain[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedCcGain",isCalibratedCcGain[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedCaOffset",isCalibratedCaOffset[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedCbOffset",isCalibratedCbOffset[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedCcOffset",isCalibratedCcOffset[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedPa",isCalibratedPa[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedPb",isCalibratedPb[1]);
+				json_object_object_add(ChargingInfo2,"isCalibratedPc",isCalibratedPc[1]);
+			}
 			json_object_object_add(jobj2,"ChargingInfo2",ChargingInfo2);
 		}
 		if(connectorType3 != 0){
@@ -2534,6 +2568,23 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo3,"SystemStatus",SystemStatus[2]);
 			json_object_object_add(ChargingInfo3,"EvBatterytargetCurrent",EvBatterytargetCurrent[2]);
 			json_object_object_add(ChargingInfo3,"PowerConsumption",PowerConsumption[2]);
+			if(strcmp(IsDO, "AX") == 0){
+				json_object_object_add(ChargingInfo3,"isCalibratedVaGain",isCalibratedVaGain[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedVbGain",isCalibratedVbGain[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedVcGain",isCalibratedVcGain[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedVaOffset",isCalibratedVaOffset[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedVbOffset",isCalibratedVbOffset[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedVcOffset",isCalibratedVcOffset[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedCaGain",isCalibratedCaGain[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedCbGain",isCalibratedCbGain[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedCcGain",isCalibratedCcGain[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedCaOffset",isCalibratedCaOffset[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedCbOffset",isCalibratedCbOffset[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedCcOffset",isCalibratedCcOffset[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedPa",isCalibratedPa[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedPb",isCalibratedPb[2]);
+				json_object_object_add(ChargingInfo3,"isCalibratedPc",isCalibratedPc[2]);
+			}
 			json_object_object_add(jobj2,"ChargingInfo3",ChargingInfo3);
 		}
 		if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0){

EVSE/rootfs/var/www/set_charging.php

@@ -1611,10 +1611,10 @@ CORE STYLES ABOVE - NO TOUCHY
 										<div class="form-group" style="display:block">
 											<label>Meter IC Calibration Status</label>
 											<span style="display:block">
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VaGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VaGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VaGain" <?php echo $obj['ChargingInfo2']['isCalibratedVaGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1622,10 +1622,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VbGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VbGain" data-size="" data-style="rounded">
 														<input  disabled type="checkbox" id="VbGain" <?php echo $obj['ChargingInfo2']['isCalibratedVbGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1633,10 +1633,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VcGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VcGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VcGain" <?php echo $obj['ChargingInfo2']['isCalibratedVcGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1646,10 +1646,10 @@ CORE STYLES ABOVE - NO TOUCHY
 												</span>
 											</span>
 											<span class="" style="display:block">
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VaOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VaOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VaOffset" <?php echo $obj['ChargingInfo2']['isCalibratedVaOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1657,10 +1657,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VbOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VbOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VbOffset" <?php echo $obj['ChargingInfo2']['isCalibratedVbOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1668,10 +1668,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VcOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VcOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VcOffset" <?php echo $obj['ChargingInfo2']['isCalibratedVcOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1681,10 +1681,10 @@ CORE STYLES ABOVE - NO TOUCHY
 												</span>
 											</span>
 											<span class="" style="display:block">
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CaGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CaGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CaGain" <?php echo $obj['ChargingInfo2']['isCalibratedCaGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1692,10 +1692,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CbGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CbGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CbGain" <?php echo $obj['ChargingInfo2']['isCalibratedCbGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1703,10 +1703,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CcGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CcGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CcGain" <?php echo $obj['ChargingInfo2']['isCalibratedCcGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1716,10 +1716,10 @@ CORE STYLES ABOVE - NO TOUCHY
 												</span>
 											</span>
 											<span class="" style="display:block">
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CaOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CaOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CaOffset" <?php echo $obj['ChargingInfo2']['isCalibratedCaOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1727,10 +1727,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CbOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CbOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CbOffset" <?php echo $obj['ChargingInfo2']['isCalibratedCbOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1738,10 +1738,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CcOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CcOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CcOffset" <?php echo $obj['ChargingInfo2']['isCalibratedCcOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1751,10 +1751,10 @@ CORE STYLES ABOVE - NO TOUCHY
 												</span>
 											</span>
 											<span class="" style="display:block">
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>Pa</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="Pa" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="Pa" <?php echo $obj['ChargingInfo2']['isCalibratedPa']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1762,10 +1762,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>Pb</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="Pb" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="Pb" <?php echo $obj['ChargingInfo2']['isCalibratedPb']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1773,10 +1773,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>Pc</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="Pc" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="Pc" <?php echo $obj['ChargingInfo2']['isCalibratedPc']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1882,10 +1882,10 @@ CORE STYLES ABOVE - NO TOUCHY
 										<div class="form-group" style="display:block">
 											<label>Meter IC Calibration Status</label>
 											<span style="display:block">
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VaGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VaGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VaGain" <?php echo $obj['ChargingInfo3']['isCalibratedVaGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1893,10 +1893,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VbGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VbGain" data-size="" data-style="rounded">
 														<input  disabled type="checkbox" id="VbGain" <?php echo $obj['ChargingInfo3']['isCalibratedVbGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1904,10 +1904,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VcGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VcGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VcGain" <?php echo $obj['ChargingInfo3']['isCalibratedVcGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1917,10 +1917,10 @@ CORE STYLES ABOVE - NO TOUCHY
 												</span>
 											</span>
 											<span class="" style="display:block">
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VaOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VaOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VaOffset" <?php echo $obj['ChargingInfo3']['isCalibratedVaOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1928,10 +1928,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VbOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VbOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VbOffset" <?php echo $obj['ChargingInfo3']['isCalibratedVbOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1939,10 +1939,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>VcOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="VcOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="VcOffset" <?php echo $obj['ChargingInfo3']['isCalibratedVcOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1952,10 +1952,10 @@ CORE STYLES ABOVE - NO TOUCHY
 												</span>
 											</span>
 											<span class="" style="display:block">
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CaGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CaGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CaGain" <?php echo $obj['ChargingInfo3']['isCalibratedCaGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1963,10 +1963,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 ">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CbGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CbGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CbGain" <?php echo $obj['ChargingInfo3']['isCalibratedCbGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1974,10 +1974,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CcGain</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CcGain" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CcGain" <?php echo $obj['ChargingInfo3']['isCalibratedCcGain']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1987,10 +1987,10 @@ CORE STYLES ABOVE - NO TOUCHY
 												</span>
 											</span>
 											<span class="" style="display:block">
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CaOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CaOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CaOffset" <?php echo $obj['ChargingInfo3']['isCalibratedCaOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -1998,10 +1998,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CbOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CbOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CbOffset" <?php echo $obj['ChargingInfo3']['isCalibratedCbOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -2009,10 +2009,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>CcOffset</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="CcOffset" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="CcOffset" <?php echo $obj['ChargingInfo3']['isCalibratedCcOffset']==1?"checked":"";?>>
 														<span class="toggle">
@@ -2022,10 +2022,10 @@ CORE STYLES ABOVE - NO TOUCHY
 												</span>
 											</span>
 											<span class="" style="display:block">
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>Pa</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="Pa" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="Pa" <?php echo $obj['ChargingInfo3']['isCalibratedPa']==1?"checked":"";?>>
 														<span class="toggle">
@@ -2033,10 +2033,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>Pb</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="Pb" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="Pb" <?php echo $obj['ChargingInfo3']['isCalibratedPb']==1?"checked":"";?>>
 														<span class="toggle">
@@ -2044,10 +2044,10 @@ CORE STYLES ABOVE - NO TOUCHY
 														</span>
 													</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label>Pc</label>
 												</span>
-												<span class="col-lg-2 pull-left">
+												<span class="col-lg-2 col-md-2 col-sm-6 col-xs-6">
 													<label class="toggle-switchy" for="Pc" data-size="" data-style="rounded">
 														<input disabled type="checkbox" id="Pc" <?php echo $obj['ChargingInfo3']['isCalibratedPc']==1?"checked":"";?>>
 														<span class="toggle">