Merge pull request #827 from FrameworkComputer/lotus.intrusion-count

fwk: Update more intrusion switch info

Author: kiram9

zephyr/program/lotus/lotus/src/input_module.c

@@ -273,8 +273,64 @@ static int inputdeck_cmd(int argc, const char **argv)
 
 			id = get_hardware_id(ADC_HUB_BOARD_ID);
 			mv = adc_read_channel(ADC_HUB_BOARD_ID);
-			ccprintf("    C deck status %d = %d %d mv\n", i, id, mv);
-
+			ccprintf("    C-Deck status %d = %d %d mV", i, id, mv);
+			switch (i) {
+			case TOP_ROW_0:
+				ccprintf(" [X - -    - -]");
+				break;
+			case TOP_ROW_1:
+				ccprintf(" [- X -    - -]");
+				break;
+			case TOP_ROW_2:
+				ccprintf(" [- - X    - -]");
+				break;
+			case TOP_ROW_3:
+				ccprintf(" [- - -    X -]");
+				break;
+			case TOP_ROW_4:
+				ccprintf(" [- - -    - X]");
+				break;
+			case TOUCHPAD:
+				ccprintf(" [Touchpad    ]");
+				break;
+			case TOP_ROW_NOT_CONNECTED:
+				ccprintf(" [Toprow disc.]");
+				break;
+			case HUBBOARD:
+				ccprintf("  [Hubboard    ]");
+				break;
+			default:
+				break;
+			}
+			switch (id) {
+			case INPUT_MODULE_SHORT:
+				ccprintf(" [Short]\n");
+				break;
+			case INPUT_MODULE_GENERIC_A:
+				ccprintf(" [Generic A]\n");
+				break;
+			case INPUT_MODULE_GENERIC_B:
+				ccprintf(" [Generic B]\n");
+				break;
+			case INPUT_MODULE_GENERIC_C:
+				ccprintf(" [Generic C]\n");
+				break;
+			case INPUT_MODULE_KEYBOARD_B:
+				ccprintf(" [Keyboard B]\n");
+				break;
+			case INPUT_MODULE_KEYBOARD_A:
+				ccprintf(" [Keyboard A]\n");
+				break;
+			case INPUT_MODULE_DISCONNECTED:
+				ccprintf(" [Disconnected]\n");
+				break;
+			case INPUT_MODULE_TOUCHPAD:
+				ccprintf(" [Touchpad]\n");
+				break;
+			default:
+				ccprintf(" [Reserved]\n");
+				break;
+			}
 		}
 
 	ccprintf("Input module Overcurrent Events: %d\n", oc_count);

zephyr/program/lotus/src/board_function.c

@@ -42,6 +42,8 @@ static uint8_t chassis_once_flag;
 
 static uint64_t chassis_open_hibernate_time;
 
+static uint8_t init = 1;
+
 int bios_function_status(uint16_t type, uint16_t addr, uint8_t flag)
 {
 	uint8_t status;
@@ -143,16 +145,29 @@ __overridable void project_chassis_function(enum gpio_signal signal)
 
 static void check_chassis_open(void)
 {
-	if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_chassis_open_l)) == 0
-			&& !chassis_once_flag) {
-
+	if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_chassis_open_l)) == 0) {
 		CPRINTS("Chassis was opened");
-		chassis_once_flag = 1;
-
 		/* Record the chassis was open status in bbram */
-		system_set_bbram(SYSTEM_BBRAM_IDX_CHASSIS_WAS_OPEN, 1);
+		if (!chassis_once_flag)
+			system_set_bbram(SYSTEM_BBRAM_IDX_CHASSIS_WAS_OPEN, 1);
 
-		/* Counter for chasis pin */
+		chassis_once_flag = 1;
+
+		if (init) {
+			system_get_bbram(SYSTEM_BBRAM_IDX_CHASSIS_VTR_OPEN,
+				&chassis_vtr_open_count);
+			if (chassis_vtr_open_count < 0xFF)
+				chassis_vtr_open_count++;
+			system_set_bbram(SYSTEM_BBRAM_IDX_CHASSIS_VTR_OPEN, chassis_vtr_open_count);
+		} else {
+			system_get_bbram(SYSTEM_BBRAM_IDX_CHASSIS_TOTAL,
+				&chassis_open_count);
+			if (chassis_open_count < 0xFF)
+				chassis_open_count++;
+			system_set_bbram(SYSTEM_BBRAM_IDX_CHASSIS_TOTAL, chassis_open_count);
+		}
+
+		/* Counter for chassis pin */
 		if (chipset_in_state(CHIPSET_STATE_ANY_OFF))
 			if (chassis_press_counter < 0xFF)
 				chassis_press_counter++;
@@ -185,7 +200,10 @@ static void bios_function_init(void)
 	set_detect_mode(flash_storage_get(FLASH_FLAGS_INPUT_MODULE_POWER));
 #endif
 	gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_chassis_open));
+
+	init = 1;
 	check_chassis_open();
+	init = 0;
 }
 DECLARE_HOOK(HOOK_INIT, bios_function_init, HOOK_PRIO_DEFAULT + 1);