Skip to content

Commit

Permalink
Fix battery level reports, device name on ble adv, boot failed issue (#…
Browse files Browse the repository at this point in the history 
…1595)

- fix battery level reports
- fix device name adv
- clean the edge case which might lead to boot failed
  • Loading branch information
@beastoin
beastoin authored Dec 27, 2024
2 parents 13ccdb7 + f9274d2 commit a60d175
Show file tree
Hide file tree
Showing 3 changed files with 151 additions and 219 deletions.
2 changes: 1 addition & 1 deletion Friend/firmware/firmware_v1.0/prj_xiao_ble_sense_devkitv2-adafruit.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ CONFIG_BT_DIS_MODEL="Omi DevKit 2"
CONFIG_BT_DIS_MANUF="Based Hardware"
CONFIG_BT_DIS_FW_REV=y
CONFIG_BT_DIS_HW_REV=y
CONFIG_BT_DIS_FW_REV_STR="2.0.7"
CONFIG_BT_DIS_FW_REV_STR="2.0.8"
CONFIG_BT_DIS_HW_REV_STR="Seeed Xiao BLE Sense"

#
Expand Down
282 changes: 107 additions & 175 deletions Friend/firmware/firmware_v1.0/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "config.h"
#include "codec.h"
#include "button.h"
// #include "nfc.h"
#include "sdcard.h"
#include "storage.h"
#include "speaker.h"
Expand All @@ -20,7 +19,7 @@ LOG_MODULE_REGISTER(main, CONFIG_LOG_DEFAULT_LEVEL);

static void codec_handler(uint8_t *data, size_t len)
{
int err = broadcast_audio_packets(data, len);
int err = broadcast_audio_packets(data, len);
if (err)
{
LOG_ERR("Failed to broadcast audio packets: %d", err);
Expand All @@ -38,11 +37,10 @@ static void mic_handler(int16_t *buffer)

void bt_ctlr_assert_handle(char *name, int type)
{
LOG_INF("Bluetooth assert: %s (type %d)", name ? name : "NULL", type);
LOG_INF("Bluetooth assert: %s (type %d)", name ? name : "NULL", type);
}



bool is_connected = false;
bool is_charging = false;
extern bool is_off;
Expand Down Expand Up @@ -74,26 +72,10 @@ static void boot_led_sequence(void)
set_led_green(false);
set_led_blue(false);
}
void activate_everything_no_lights()
{
int err;

err = led_start();
err = transport_start();
err = mount_sd_card();
err = storage_init();
err = init_haptic_pin();
set_codec_callback(codec_handler);
err = codec_start();
set_mic_callback(mic_handler);
err = mic_start();
err = init_usb();

}

void set_led_state()
{
// Recording and connected state - BLUE
// Recording and connected state - BLUE

if(usb_charge)
{
Expand All @@ -113,193 +95,143 @@ void set_led_state()
}
if(is_off)
{
set_led_red(false);
set_led_blue(false);
set_led_red(false);
set_led_blue(false);
return;
}
if (is_connected)
{
set_led_blue(true);
set_led_red(false);
return;
}
if (is_connected)
{
set_led_blue(true);
set_led_red(false);
return;
}

// Recording but lost connection - RED
if (!is_connected)
{
set_led_red(true);
set_led_blue(false);
return;
}
// Recording but lost connection - RED
if (!is_connected)
{
set_led_red(true);
set_led_blue(false);
return;
}

}
bool from_wakeup = false;

// Main loop
int main(void)
{
int err;
// TODO: what does it mean ? disabled from_usb_event for now
// for system power off, we have no choice but to handle usb detect wakeup events. if off, and this was the reason, initialize, skip lightshow, start not recording
int err;
uint32_t reset_reas = NRF_POWER->RESETREAS;
NRF_POWER->DCDCEN=1;
NRF_POWER->DCDCEN0=1;

NRF_POWER->RESETREAS=1;
// bool from_usb_event = (reset_reas & VBUS_DETECT);
bool from_wakeup = (reset_reas & WAKEUP_DETECT);
// if (from_usb_event)
// {
// k_msleep(100);
// printf("from reset \n");
// is_off = true;

// // usb_charge = true;
// activate_everything_no_lights();
// // bt_disable();
// bt_off();
// }
//else if (from_wakeup)
if (from_wakeup)
LOG_INF("Friend device firmware starting...");
err = led_start();
if (err)
{

is_off = false;
usb_charge = false;
force_button_state(GRACE);
k_msleep(1000);
activate_everything_no_lights();
bt_on();
play_haptic_milli(100);

LOG_ERR("Failed to initialize LEDs: %d", err);
return err;
}
else
{
// Run the boot LED sequence
boot_led_sequence();
// Indicate transport initialization
set_led_green(true);
set_led_green(false);

LOG_INF("Friend device firmware starting...");
err = led_start();
if (err)
err = transport_start();
if (err)
{
LOG_ERR("Failed to start transport: %d", err);
// Blink green LED to indicate error
for (int i = 0; i < 5; i++)
{
LOG_ERR("Failed to initialize LEDs: %d", err);
return err;
set_led_green(!gpio_pin_get_dt(&led_green));
k_msleep(200);
}
// Run the boot LED sequence
boot_led_sequence();
// Indicate transport initialization
set_led_green(true);
set_led_green(false);
// return err;
}
play_boot_sound();
err = mount_sd_card();
if (err)
{
LOG_ERR("Failed to mount SD card: %d", err);
}
LOG_INF("result of mount:%d",err);

err = transport_start();
if (err)
{
LOG_ERR("Failed to start transport: %d", err);
// Blink green LED to indicate error
for (int i = 0; i < 5; i++)
{
set_led_green(!gpio_pin_get_dt(&led_green));
k_msleep(200);
}
set_led_green(false);
// return err;
}
play_boot_sound();
err = mount_sd_card();
if (err)
{
LOG_ERR("Failed to mount SD card: %d", err);
}
LOG_INF("result of mount:%d",err);

k_msleep(500);
err = storage_init();
if (err)
{
LOG_ERR("Failed to initialize storage: %d", err);
}
err = init_haptic_pin();
if (err)
{
LOG_ERR("Failed to initialize haptic pin: %d", err);
}
k_msleep(500);
err = storage_init();
if (err)
{
LOG_ERR("Failed to initialize storage: %d", err);
}
err = init_haptic_pin();
if (err)
{
LOG_ERR("Failed to initialize haptic pin: %d", err);
}

set_led_blue(true);
set_codec_callback(codec_handler);
err = codec_start();
if (err)
set_led_blue(true);
set_codec_callback(codec_handler);
err = codec_start();
if (err)
{
LOG_ERR("Failed to start codec: %d", err);
// Blink blue LED to indicate error
for (int i = 0; i < 5; i++)
{
LOG_ERR("Failed to start codec: %d", err);
// Blink blue LED to indicate error
for (int i = 0; i < 5; i++)
{
set_led_blue(!gpio_pin_get_dt(&led_blue));
k_msleep(200);
}
set_led_blue(false);
return err;
set_led_blue(!gpio_pin_get_dt(&led_blue));
k_msleep(200);
}
play_haptic_milli(500);
set_led_blue(false);
return err;
}
play_haptic_milli(500);
set_led_blue(false);

// Indicate microphone initialization
set_led_red(true);
set_led_green(true);
LOG_INF("Starting microphone initialization");
set_mic_callback(mic_handler);
err = mic_start();
if (err)
// Indicate microphone initialization
set_led_red(true);
set_led_green(true);
LOG_INF("Starting microphone initialization");
set_mic_callback(mic_handler);
err = mic_start();
if (err)
{
LOG_ERR("Failed to start microphone: %d", err);
// Blink red and green LEDs to indicate error
for (int i = 0; i < 5; i++)
{
LOG_ERR("Failed to start microphone: %d", err);
// Blink red and green LEDs to indicate error
for (int i = 0; i < 5; i++)
{
set_led_red(!gpio_pin_get_dt(&led_red));
set_led_green(!gpio_pin_get_dt(&led_green));
k_msleep(200);
}
set_led_red(false);
set_led_green(false);
return err;
set_led_red(!gpio_pin_get_dt(&led_red));
set_led_green(!gpio_pin_get_dt(&led_green));
k_msleep(200);
}
set_led_red(false);
set_led_green(false);
return err;
}
set_led_red(false);
set_led_green(false);

// save_offset(200);
// // Initialize NFC first
// LOG_INF("Initializing NFC...");
// err = nfc_init();
// if (err != 0) {
// LOG_ERR("Failed to initialize NFC: %d", err);
// // Consider whether to continue or return based on the severity of the error
// } else {
// LOG_INF("NFC initialized successfully");
// }

// Indicate successful initialization
err = init_usb();
if (err)
{
LOG_ERR("Failed to initialize power supply: %d", err);
}

// button_init();
// register_button_service();
// activate_button_work();


LOG_INF("Omi firmware initialized successfully\n");
set_led_blue(true);
k_msleep(1000);
set_led_blue(false);

// Indicate successful initialization
err = init_usb();
if (err)
{
LOG_ERR("Failed to initialize power supply: %d", err);
}

LOG_INF("Omi firmware initialized successfully\n");
set_led_blue(true);
k_msleep(1000);
set_led_blue(false);

// Main loop
printf("reset reas:%d\n",reset_reas);
while (1)
{
set_led_state();
k_msleep(500);
}
while (1)
{
set_led_state();
k_msleep(500);
}

// Unreachable
return 0;
// Unreachable
return 0;
}

Loading

0 comments on commit a60d175

Please sign in to comment.