hid: remove non-functional usb power state and poll real power state

pocket-reform-keyboard-fw/pocket-hid/src/keyboard.h

@@ -10,7 +10,6 @@
 #define PREF_HID_FW_REV "PREFHID20240416"
 
 void reset_keyboard_state(void);
-int get_usb_power_state(void);
 
 void led_set(uint32_t rgb);
 void led_task(uint32_t rgb);

pocket-reform-keyboard-fw/pocket-hid/src/main.c

@@ -69,7 +69,6 @@
 #define MAX_SCANCODES 6
 static uint8_t pressed_scancodes[MAX_SCANCODES] = {0,0,0,0,0,0};
 static int pressed_keys = 0;
-
 static volatile uint32_t led_value = 0;
 
 void hid_task(void);
@@ -189,22 +188,16 @@ int main(void)
 // Device callbacks
 //--------------------------------------------------------------------+
 
-static int usb_power_state = 0;
-
 // Invoked when device is mounted
 void tud_mount_cb(void)
 {
-  usb_power_state = 1;
+  // called
 }
 
 // Invoked when device is unmounted
 void tud_umount_cb(void)
 {
-  usb_power_state = 0;
+  // never called
-}
-
-int get_usb_power_state(void) {
-  return usb_power_state;
 }
 
 // Invoked when usb bus is suspended
@@ -212,14 +205,14 @@ int get_usb_power_state(void) {
 // Within 7ms, device must draw an average of current less than 2.5 mA from bus
 void tud_suspend_cb(bool remote_wakeup_en)
 {
-  usb_power_state = 0;
+  // never called
   (void) remote_wakeup_en;
 }
 
 // Invoked when usb bus is resumed
 void tud_resume_cb(void)
 {
-  usb_power_state = 1;
+  // never called
 }
 
 // RGB LEDS
@@ -437,7 +430,7 @@ int process_keyboard(uint8_t* resulting_scancodes) {
 
   // if device is off and user is pressing random keys,
   // show a hint for turning on the device
-  if (!get_usb_power_state() && !remote_get_power_state()) {
+  if (!remote_get_power_state()) {
     if (total_pressed>0 && !active_menu_mode && !hyper_key && !last_menu_key) {
       execute_menu_function(KEY_H);
     }
@@ -622,17 +615,6 @@ void hid_task(void)
   }
   start_ms += interval_ms;
 
-  if (tud_suspended()) {
-    usb_power_state = 0;
-  } else {
-    usb_power_state = 1;
-  }
-
-  // allow trackball backlight control even if there's no USB yet
-  if (!usb_power_state && remote_get_power_state()) {
-    poll_trackball();
-  }
-
   // Remote wakeup
   if (tud_suspended() && pressed_keys > 0)
   {
@@ -645,21 +627,20 @@ void hid_task(void)
   }
 
   hid_task_counter++;
+  if (hid_task_counter%1000 == 0) {
+    // quietly get voltages to update power state
+    remote_get_voltages(1);
+  }
   if (hid_task_counter%100 == 0) {
     refresh_menu_page();
 
     // power state debugging
-    /*if (usb_power_state) {
+    /*if (remote_get_power_state()) {
-      gfx_poke_cstr(0,0,"[usb on]");
+      gfx_poke_cstr(0,0,"[pwr on]");
     } else {
-      gfx_poke_cstr(0,0,"[usb off]");
+      gfx_poke_cstr(0,0,"[pwr off]");
     }
-    if (remote_get_power_state()) {
+    gfx_flush();*/
-      gfx_poke_cstr(10,0,"[pwr on]");
-    } else {
-      gfx_poke_cstr(10,0,"[pwr off]");
-    }*/
-    gfx_flush();
   }
 }
 

pocket-reform-keyboard-fw/pocket-hid/src/menu.c

@@ -70,7 +70,7 @@ void render_menu(int y) {
 // automatically refresh the current menu page if needed
 void refresh_menu_page() {
   if (current_menu_page == MENU_PAGE_BATTERY_STATUS) {
-    remote_get_voltages();
+    remote_get_voltages(0);
   } else if (current_menu_page == MENU_PAGE_MNT_LOGO && --logo_timeout_ticks <= 0) {
     reset_menu();
   }
@@ -129,7 +129,7 @@ int execute_menu_function(int keycode) {
   }
   else if (keycode == KEY_B) {
     current_menu_page = MENU_PAGE_BATTERY_STATUS;
-    remote_get_voltages();
+    remote_get_voltages(0);
     return 0;
   }
   else if (keycode == KEY_S) {

pocket-reform-keyboard-fw/pocket-hid/src/remote.c

@@ -134,7 +134,7 @@ int remote_get_status(void) {
   return ok;
 }
 
-int remote_get_voltages(void) {
+int remote_get_voltages(int quiet) {
   term_x = 0;
   term_y = 0;
 
@@ -181,6 +181,8 @@ int remote_get_voltages(void) {
     soc_power_on = 0;
   }
 
+  if (quiet) return ok;
+
   // plot
   gfx_clear();
   char str[32];

pocket-reform-keyboard-fw/pocket-hid/src/remote.h

@@ -12,7 +12,7 @@ void empty_serial(void);
 int remote_receive_string(int print);
 int remote_try_wakeup(void);
 int remote_try_command(const char* cmd, int print_response);
-int remote_get_voltages(void);
+int remote_get_voltages(int quiet);
 int remote_check_for_low_battery(void);
 int remote_get_status(void);
 int remote_turn_on_som(void);