Merge pull request #19 from FrameworkComputer/hx20mec152x

Hx20mec152x

Author: kiram9

.github/workflows/hx20.yml

@@ -0,0 +1,32 @@
+name: build hx20 firmware
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Build hx20 evt
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: install toolchain
+        run: sudo apt install gcc-arm-none-eabi libftdi1-dev
+      # Checks out a copy of your repository on the ubuntu-latest machine
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: build hx20 board
+        env:
+          BOARD: hx20
+          ORB: n
+        run: |
+          make -j BOARD=$BOARD HX20_ORB=$ORB CROSS_COMPILE=arm-none-eabi-
+          echo Built $BOARD ec
+      - name: file sha256
+        run: sha256sum build/hx20/ec.bin
+      - name: generate artifact version
+        run: |
+          echo "::set-env name=VERSION_NAME::$(date -u +'%Y-%m-%d-%H-%M-%S')_$(git rev-parse --short HEAD)"
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: hx20.${{env.VERSION_NAME}}.bin
+          path: build/hx20/ec.bin

.github/workflows/lint.yml

@@ -0,0 +1,38 @@
+name: lint code in pull request
+
+on:
+  pull_request:
+    types: [opened, edited, reopened]
+
+jobs:
+  build:
+    name: lint new changes
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: get checkpatch
+        run: |
+          wget "https://raw.githubusercontent.com/torvalds/linux/master/scripts/checkpatch.pl"
+          wget "https://raw.githubusercontent.com/torvalds/linux/master/scripts/spelling.txt"
+          chmod +x checkpatch.pl
+
+      - name: checkpatch
+        run: |
+          git diff origin/${{ github.base_ref }} | ./checkpatch.pl --mailback --no-tree --ignore MAINTAINERS,FILE_PATH_CHANGES - > checkpatch.txt || true
+          if [ -s checkpatch.txt ]; then
+            errors=$(cat checkpatch.txt)
+            errors="${errors//'%'/'%25'}"
+            errors="${errors//$'\n'/'%0A'}"
+            errors="${errors//$'\r'/'%0D'}"
+            echo "::error file=Checkpatch.txt::$errors"
+            exit=1
+          fi
+          if [ ${exit} == 1 ]; then
+            exit 1;
+          fi
+      - name: output
+        run: |
+          cat checkpatch.txt

board/hx20/battery.c

@@ -5,6 +5,8 @@
  * Battery pack vendor provided charging profile
  */
 
+#include "adc.h"
+#include "adc_chip.h"
 #include "battery.h"
 #include "battery_smart.h"
 #include "charge_state.h"
@@ -17,18 +19,18 @@
 #define PARAM_CUT_OFF_LOW  0x10
 #define PARAM_CUT_OFF_HIGH 0x00
 
-/* Battery info for BQ40Z55 */
+/* Battery info for BQ40Z50 */
 static const struct battery_info info = {
-	.voltage_max = 8700,        /* mV */
-	.voltage_normal = 7600,
+	.voltage_max = 17600,        /* mV */
+	.voltage_normal = 15400,
 	.voltage_min = 6000,
-	.precharge_current = 256,   /* mA */
+	.precharge_current = 72,   /* mA */
 	.start_charging_min_c = 0,
-	.start_charging_max_c = 46,
+	.start_charging_max_c = 47,
 	.charging_min_c = 0,
-	.charging_max_c = 60,
+	.charging_max_c = 52,
 	.discharging_min_c = 0,
-	.discharging_max_c = 60,
+	.discharging_max_c = 62,
 };
 
 const struct battery_info *battery_get_info(void)
@@ -56,175 +58,17 @@ int board_cut_off_battery(void)
 	return rv;
 }
 
-#ifdef CONFIG_CHARGER_PROFILE_OVERRIDE
-
-static int fast_charging_allowed = 1;
-
-/*
- * This can override the smart battery's charging profile. To make a change,
- * modify one or more of requested_voltage, requested_current, or state.
- * Leave everything else unchanged.
- *
- * Return the next poll period in usec, or zero to use the default (which is
- * state dependent).
- */
-int charger_profile_override(struct charge_state_data *curr)
+enum battery_present battery_is_present(void)
 {
-	/* temp in 0.1 deg C */
-	int temp_c = curr->batt.temperature - 2731;
-	/* keep track of last temperature range for hysteresis */
-	static enum {
-		TEMP_RANGE_1,
-		TEMP_RANGE_2,
-		TEMP_RANGE_3,
-		TEMP_RANGE_4,
-		TEMP_RANGE_5,
-	} temp_range = TEMP_RANGE_3;
-	/* keep track of last voltage range for hysteresis */
-	static enum {
-		VOLTAGE_RANGE_LOW,
-		VOLTAGE_RANGE_HIGH,
-	} voltage_range = VOLTAGE_RANGE_LOW;
-
-	/* Current and previous battery voltage */
-	int batt_voltage;
-	static int prev_batt_voltage;
+	enum battery_present bp;
+	int mv;
 
-	/*
-	 * Determine temperature range. The five ranges are:
-	 *   < 10C
-	 *   10-15C
-	 *   15-23C
-	 *   23-45C
-	 *   > 45C
-	 *
-	 * Add 0.2 degrees of hysteresis.
-	 * If temp reading was bad, use last range.
-	 */
-	if (!(curr->batt.flags & BATT_FLAG_BAD_TEMPERATURE)) {
-		if (temp_c < 99)
-			temp_range = TEMP_RANGE_1;
-		else if (temp_c > 101 && temp_c < 149)
-			temp_range = TEMP_RANGE_2;
-		else if (temp_c > 151 && temp_c < 229)
-			temp_range = TEMP_RANGE_3;
-		else if (temp_c > 231 && temp_c < 449)
-			temp_range = TEMP_RANGE_4;
-		else if (temp_c > 451)
-			temp_range = TEMP_RANGE_5;
-	}
+	mv = adc_read_channel(ADC_VCIN1_BATT_TEMP);
 
-	/*
-	 * If battery voltage reading is bad, use the last reading. Otherwise,
-	 * determine voltage range with hysteresis.
-	 */
-	if (curr->batt.flags & BATT_FLAG_BAD_VOLTAGE) {
-		batt_voltage = prev_batt_voltage;
-	} else {
-		batt_voltage = prev_batt_voltage = curr->batt.voltage;
-		if (batt_voltage < 8200)
-			voltage_range = VOLTAGE_RANGE_LOW;
-		else if (batt_voltage > 8300)
-			voltage_range = VOLTAGE_RANGE_HIGH;
-	}
+	if (mv == ADC_READ_ERROR)
+		return -1;
 
-	/*
-	 * If we are not charging or we aren't using fast charging profiles,
-	 * then do not override desired current and voltage.
-	 */
-	if (curr->state != ST_CHARGE || !fast_charging_allowed)
-		return 0;
+	bp = (mv < 3000 ? BP_YES : BP_NO);
 
-	/*
-	 * Okay, impose our custom will:
-	 * When battery is 0-10C:
-	 * CC at 486mA @ 8.7V
-	 * CV at 8.7V
-	 *
-	 * When battery is <15C:
-	 * CC at 1458mA @ 8.7V
-	 * CV at 8.7V
-	 *
-	 * When battery is <23C:
-	 * CC at 3402mA until 8.3V @ 8.7V
-	 * CC at 2430mA @ 8.7V
-	 * CV at 8.7V
-	 *
-	 * When battery is <45C:
-	 * CC at 4860mA until 8.3V @ 8.7V
-	 * CC at 2430mA @ 8.7V
-	 * CV at 8.7V until current drops to 450mA
-	 *
-	 * When battery is >45C:
-	 * CC at 2430mA @ 8.3V
-	 * CV at 8.3V (when battery is hot we don't go to fully charged)
-	 */
-	switch (temp_range) {
-	case TEMP_RANGE_1:
-		curr->requested_current = 486;
-		curr->requested_voltage = 8700;
-		break;
-	case TEMP_RANGE_2:
-		curr->requested_current = 1458;
-		curr->requested_voltage = 8700;
-		break;
-	case TEMP_RANGE_3:
-		curr->requested_voltage = 8700;
-		if (voltage_range == VOLTAGE_RANGE_HIGH)
-			curr->requested_current = 2430;
-		else
-			curr->requested_current = 3402;
-		break;
-	case TEMP_RANGE_4:
-		curr->requested_voltage = 8700;
-		if (voltage_range == VOLTAGE_RANGE_HIGH)
-			curr->requested_current = 2430;
-		else
-			curr->requested_current = 4860;
-		break;
-	case TEMP_RANGE_5:
-		curr->requested_current = 2430;
-		curr->requested_voltage = 8300;
-		break;
-	}
-
-	return 0;
-}
-
-/* Customs options controllable by host command. */
-#define PARAM_FASTCHARGE (CS_PARAM_CUSTOM_PROFILE_MIN + 0)
-
-enum ec_status charger_profile_override_get_param(uint32_t param,
-						  uint32_t *value)
-{
-	if (param == PARAM_FASTCHARGE) {
-		*value = fast_charging_allowed;
-		return EC_RES_SUCCESS;
-	}
-	return EC_RES_INVALID_PARAM;
+	return bp;
 }
-
-enum ec_status charger_profile_override_set_param(uint32_t param,
-						  uint32_t value)
-{
-	if (param == PARAM_FASTCHARGE) {
-		fast_charging_allowed = value;
-		return EC_RES_SUCCESS;
-	}
-	return EC_RES_INVALID_PARAM;
-}
-
-static int command_fastcharge(int argc, char **argv)
-{
-	if (argc > 1 && !parse_bool(argv[1], &fast_charging_allowed))
-		return EC_ERROR_PARAM1;
-
-	ccprintf("fastcharge %s\n", fast_charging_allowed ? "on" : "off");
-
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(fastcharge, command_fastcharge,
-			"[on|off]",
-			"Get or set fast charging profile");
-
-#endif	/* CONFIG_CHARGER_PROFILE_OVERRIDE */