Update examples

Author: loopj

examples/gecko/gcn-host/libjoybus_example.slcp

@@ -5,4 +5,5 @@ quality: production
 component:
   - id: emlib
   - id: dmadrv
+  - id: sleeptimer
   - id: udelay

examples/gecko/gcn-host/main.c

@@ -2,42 +2,76 @@
 #include "em_cmu.h"
 #include "em_gpio.h"
 
+#include "sl_sleeptimer.h"
 #include "sl_udelay.h"
 
 #include <joybus/joybus.h>
 #include <joybus/backend/gecko.h>
 
-#define JOYBUS_DATA_PORT  gpioPortD
-#define JOYBUS_DATA_PIN   3
-#define JOYBUS_TIMER      TIMER0
-#define JOYBUS_USART      USART0
+#define JOYBUS_PORT             gpioPortD
+#define JOYBUS_PIN              3
+#define JOYBUS_TIMER            TIMER0
+#define JOYBUS_USART            USART0
 
-#define LED_PORT      gpioPortA
-#define LED_PIN       4
+#define LED_PORT                gpioPortA
+#define LED_PIN                 4
 
+#define JOYBUS_POLL_INTERVAL_MS 15
+
+// Joybus instance
 struct joybus_gecko gecko_bus;
 struct joybus *bus = JOYBUS(&gecko_bus);
 
-static uint8_t response[JOYBUS_BLOCK_SIZE] = {0};
+// Buffer for Joybus responses
+static uint8_t joybus_response[JOYBUS_BLOCK_SIZE] = {0};
 
-static uint16_t last_buttons = 0;
-static uint16_t down_buttons = 0;
-static uint16_t up_buttons   = 0;
+// Polling mode
+enum { POLL_MODE_IDENTIFY, POLL_MODE_READ };
+static uint8_t poll_mode = POLL_MODE_IDENTIFY;
 
-static void identify_cb(struct joybus *bus, int result, void *user_data)
+void joybus_identify_cb(struct joybus *bus, int result, void *user_data)
 {
+  // Stay in identify mode on any Joybus error
+  if (result < 0)
+    return;
+
+  // Check it's a GameCube controller
+  uint16_t type = joybus_id_get_type(joybus_response);
+  if (!(type & JOYBUS_ID_GCN_DEVICE))
+    return;
+
+  // Check we've received data if it's a wireless controller
+  if ((type & JOYBUS_ID_GCN_WIRELESS) && !(type & JOYBUS_ID_GCN_WIRELESS_RECEIVED))
+    return;
+
+  // Check it's a standard controller
+  if (!(type & JOYBUS_ID_GCN_STANDARD))
+    return;
+
+  // Move to polling for input
+  poll_mode = POLL_MODE_READ;
 }
 
-static void read_cb(struct joybus *bus, int result, void *user_data)
+void joybus_read_cb(struct joybus *bus, int result, void *user_data)
 {
-  uint16_t buttons = ((response[1] << 8) | response[0]) & JOYBUS_GCN_BUTTON_MASK;
+  // Switch back to identify mode on any Joybus error
+  if (result < 0) {
+    poll_mode = POLL_MODE_IDENTIFY;
+    return;
+  }
 
-  down_buttons = (buttons ^ last_buttons) & buttons;
-  up_buttons   = (buttons ^ last_buttons) & last_buttons;
+  // Extract button states
+  uint16_t buttons = ((joybus_response[1] << 8) | joybus_response[0]) & JOYBUS_GCN_BUTTON_MASK;
 
-  last_buttons = buttons;
+  // Light the LED while the A button is held
+  if (buttons & JOYBUS_GCN_BUTTON_A) {
+    GPIO_PinOutSet(LED_PORT, LED_PIN);
+  } else {
+    GPIO_PinOutClear(LED_PORT, LED_PIN);
+  }
 }
 
+// Initialize system clocks
 static void clock_init()
 {
   // HFXO initialization
@@ -57,6 +91,20 @@ static void clock_init()
   CMU_ClockSelectSet(cmuClock_EM01GRPACLK, cmuSelect_HFXO);
 }
 
+// Poll Joybus for data
+static void poll_task(sl_sleeptimer_timer_handle_t *handle, void *data)
+{
+  switch (poll_mode) {
+    case POLL_MODE_IDENTIFY:
+      joybus_identify(bus, joybus_response, joybus_identify_cb, NULL);
+      break;
+
+    case POLL_MODE_READ:
+      joybus_gcn_read(bus, JOYBUS_GCN_ANALOG_MODE_3, JOYBUS_GCN_MOTOR_STOP, joybus_response, joybus_read_cb, NULL);
+      break;
+  }
+}
+
 int main()
 {
   // Initialize chip and clocks
@@ -67,27 +115,19 @@ int main()
   CMU_ClockEnable(cmuClock_GPIO, true);
   GPIO_PinModeSet(LED_PORT, LED_PIN, gpioModePushPull, 0);
 
-  // Initialize and enable the Joybus
-  joybus_gecko_init(&gecko_bus, JOYBUS_DATA_PORT, JOYBUS_DATA_PIN, JOYBUS_TIMER, JOYBUS_USART);
+  // Initialize Joybus
+  joybus_gecko_init(&gecko_bus, JOYBUS_PORT, JOYBUS_PIN, JOYBUS_TIMER, JOYBUS_USART);
   joybus_enable(bus);
-  sl_udelay_wait(100000);
-
-  // Ask any connected target for their ID
-  joybus_identify(bus, response, identify_cb, NULL);
-  sl_udelay_wait(100000);
 
-  while (1) {
-    // Read the controller state
-    joybus_gcn_read(bus, JOYBUS_GCN_ANALOG_MODE_3, JOYBUS_GCN_MOTOR_STOP, response, read_cb, NULL);
+  // Poll for Joybus data at regular intervals
+  sl_sleeptimer_timer_handle_t poll_timer;
+  sl_sleeptimer_init();
+  sl_sleeptimer_start_periodic_timer(&poll_timer, sl_sleeptimer_ms_to_tick(JOYBUS_POLL_INTERVAL_MS), poll_task, bus, 0,
+                                     SL_SLEEPTIMER_NO_HIGH_PRECISION_HF_CLOCKS_REQUIRED_FLAG);
 
-    // Toggle LED on PA4 based on A button state
-    if (last_buttons & JOYBUS_GCN_BUTTON_A) {
-      GPIO_PinOutSet(LED_PORT, LED_PIN);
-    } else {
-      GPIO_PinOutClear(LED_PORT, LED_PIN);
-    }
+  // No work to do in main loop
+  while (true)
+    ;
 
-    // Wait a bit before reading again
-    sl_udelay_wait(10000);
-  }
+  return 0;
 }

examples/gecko/gcn-target/main.c

@@ -15,13 +15,19 @@
 #define BTN_PORT          gpioPortC
 #define BTN_PIN           7
 
+// Joybus instance
 struct joybus_gecko gecko_bus;
 struct joybus *bus = JOYBUS(&gecko_bus);
 
+// GameCube controller target instance
 static struct joybus_gc_controller gc_controller;
 
-static void clock_init()
+// Initialize system
+static void system_init()
 {
+  // Chip errata
+  CHIP_Init();
+
   // HFXO initialization
   CMU_HFXOInit_TypeDef hfxoInit = CMU_HFXOINIT_DEFAULT;
   hfxoInit.ctuneXoAna           = 121;
@@ -39,15 +45,18 @@ static void clock_init()
   CMU_ClockSelectSet(cmuClock_EM01GRPACLK, cmuSelect_HFXO);
 }
 
-int main()
+// Initialize GPIO for button
+static void gpio_init()
 {
-  // Initialize chip and clocks
-  CHIP_Init();
-  clock_init();
-
-  // Set up GPIO for button
   CMU_ClockEnable(cmuClock_GPIO, true);
   GPIO_PinModeSet(BTN_PORT, BTN_PIN, gpioModeInput, 1);
+}
+
+int main()
+{
+  // Initialize system
+  system_init();
+  gpio_init();
 
   // Initialize the Joybus
   joybus_gecko_init(&gecko_bus, JOYBUS_DATA_PORT, JOYBUS_DATA_PIN, JOYBUS_TIMER, JOYBUS_USART);
@@ -59,9 +68,6 @@ int main()
   // Register the target on the bus
   joybus_target_register(bus, JOYBUS_TARGET(&gc_controller));
 
-  // Wait a bit before starting
-  sl_udelay_wait(100000);
-
   while (1) {
     // Clear previous button state
     gc_controller.input.buttons &= ~JOYBUS_GCN_BUTTON_MASK;

examples/pico-sdk/gcn-host/main.c

@@ -92,7 +92,7 @@ int main()
   joybus_rp2xxx_init(&rp2xxx_bus, JOYBUS_GPIO, pio0);
   joybus_enable(bus);
 
-  // Poll for Joybus data and send HID reports at regular intervals
+  // Poll for Joybus data at regular intervals
   struct repeating_timer poll_timer;
   add_repeating_timer_ms(JOYBUS_POLL_INTERVAL_MS, poll_task, NULL, &poll_timer);
 

src/backend/rp2xxx/joybus.c

@@ -225,7 +225,8 @@ static inline void target_byte_received(struct joybus *bus)
 
     data->state = BUS_STATE_TARGET_TX;
   } else if (rc > 0) {
-    // More bytes expected, set a timeout for the next byte
+    // More bytes expected
+    // Set a timeout for the next byte
     data->rx_timeout_alarm = add_alarm_in_us(JOYBUS_REPLY_TIMEOUT_US, target_rx_timeout, bus, true);
   } else {
     // Error handling command, or command not supported, switch back to idle/read mode