Skip to content

Commit

Permalink
Hey omi with the device's programmable button
Browse files Browse the repository at this point in the history
  • Loading branch information
@beastoin
beastoin committed Nov 25, 2024
1 parent d75facc commit 90e9f98
Show file tree
Hide file tree
Showing 14 changed files with 487 additions and 39 deletions.
0 ...le_sense_devkitv2-adafruit_module.overlay → .../xiao_ble_sense_devkitv2-adafruit.overlay
View file
File renamed without changes.
74 changes: 46 additions & 28 deletions Friend/firmware/firmware_v1.0/src/button.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,21 +214,23 @@ void check_button_level(struct k_work *work_item)
{
//If button is pressed for a long time.......
notify_long_tap();
//play_haptic_milli(10);
//Fire the long mode notify and enter a grace period
//turn off herre
if(!from_wakeup)
{
is_off = !is_off;
}
else
{
from_wakeup = false;
}
if (is_off)
{
bt_off();
turnoff_all();
}
// TODO: FIXME
//if(!from_wakeup)
//{
// is_off = !is_off;
//}
//else
//{
// from_wakeup = false;
//}
//if (is_off)
//{
// bt_off();
// turnoff_all();
//}
current_button_state = GRACE;
reset_count();
}
Expand All @@ -254,6 +256,20 @@ void check_button_level(struct k_work *work_item)
else if (inc_count_0 > 10)
{
notify_tap(); //Fire the notify and enter a grace period
if(!from_wakeup)
{
is_off = !is_off;
}
else
{
from_wakeup = false;
}
//Fire the notify and enter a grace period
if (is_off)
{
bt_off();
turnoff_all();
}
current_button_state = GRACE;
reset_count();
}
Expand All @@ -272,20 +288,22 @@ void check_button_level(struct k_work *work_item)
if (inc_count_1 > threshold)
{
notify_long_tap();
if(!from_wakeup)
{
is_off = !is_off;
}
else
{
from_wakeup = false;
}
//Fire the notify and enter a grace period
if (is_off)
{
bt_off();
turnoff_all();
}
//play_haptic_milli(10);
// TODO: FIXME
//if(!from_wakeup)
//{
// is_off = !is_off;
//}
//else
//{
// from_wakeup = false;
//}
////Fire the notify and enter a grace period
//if (is_off)
//{
// bt_off();
// turnoff_all();
//}
current_button_state = GRACE;
reset_count();
}
Expand Down Expand Up @@ -422,4 +440,4 @@ void turnoff_all()
void force_button_state(FSM_STATE_T state)
{
current_button_state = state;
}
}
70 changes: 70 additions & 0 deletions Friend/firmware/firmware_v1.0/src/speaker.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#include <zephyr/kernel.h>
#include <zephyr/bluetooth/uuid.h>
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/bluetooth/l2cap.h>
#include <zephyr/bluetooth/services/bas.h>
#include <zephyr/sys/printk.h>
#include <zephyr/device.h>
#include <zephyr/drivers/i2s.h>
Expand Down Expand Up @@ -39,6 +43,72 @@ struct gpio_dt_spec haptic_gpio_pin = {.port = DEVICE_DT_GET(DT_NODELABEL(gpio1)

struct gpio_dt_spec speaker_gpio_pin = {.port = DEVICE_DT_GET(DT_NODELABEL(gpio0)), .pin=4, .dt_flags = GPIO_INT_DISABLE};

// ble service
//

static void speaker_ccc_config_changed_handler(const struct bt_gatt_attr *attr, uint16_t value);
static ssize_t speaker_haptic_handler(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf, uint16_t len, uint16_t offset, uint8_t flags);

static struct bt_uuid_128 speaker_uuid = BT_UUID_INIT_128(BT_UUID_128_ENCODE(0xCAB1AB95, 0x2EA5, 0x4F4D, 0xBB56, 0x874B72CFC984));
static struct bt_uuid_128 speaker_haptic_uuid = BT_UUID_INIT_128(BT_UUID_128_ENCODE(0xCAB1AB96, 0x2EA5, 0x4F4D, 0xBB56, 0x874B72CFC984));

static struct bt_gatt_attr speaker_service_attr[] = {
BT_GATT_PRIMARY_SERVICE(&speaker_uuid),
BT_GATT_CHARACTERISTIC(&speaker_haptic_uuid.uuid, BT_GATT_CHRC_WRITE | BT_GATT_CHRC_NOTIFY, BT_GATT_PERM_WRITE, NULL, speaker_haptic_handler, NULL),
BT_GATT_CCC(speaker_ccc_config_changed_handler, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE),
};
static struct bt_gatt_service speaker_service = BT_GATT_SERVICE(speaker_service_attr);

void register_speaker_service()
{
bt_gatt_service_register(&speaker_service);
}

static void speaker_ccc_config_changed_handler(const struct bt_gatt_attr *attr, uint16_t value)
{
if (value == BT_GATT_CCC_NOTIFY)
{
LOG_INF("Client subscribed for notifications");
}
else if (value == 0)
{
LOG_INF("Client unsubscribed from notifications");
}
else
{
LOG_ERR("Invalid CCC value: %u", value);
}

}

static ssize_t speaker_haptic_handler(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf, uint16_t len, uint16_t offset, uint8_t flags)
{
LOG_INF("play the haptic");

uint8_t value = ((uint8_t*)buf)[0];
LOG_INF("value %d ", value);

if (value < 1 || value > 3)
{
return 0;
}

if (value == 1)
{
play_haptic_milli(20);
}
else if (value == 2)
{
play_haptic_milli(50);
}
else if (value == 3)
{
play_haptic_milli(500);
}

return 1;
}

int speaker_init()
{
LOG_INF("Speaker init");
Expand Down
4 changes: 3 additions & 1 deletion Friend/firmware/firmware_v1.0/src/speaker.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,6 @@ void play_haptic_milli(uint32_t duration);

void speaker_off();

#endif
void register_speaker_service();

#endif
2 changes: 1 addition & 1 deletion Friend/firmware/firmware_v1.0/src/storage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,4 +380,4 @@ int storage_init()
{
k_thread_create(&storage_thread, storage_stack, K_THREAD_STACK_SIZEOF(storage_stack), (k_thread_entry_t)storage_write, NULL, NULL, NULL, K_PRIO_PREEMPT(7), 0, K_NO_WAIT);
return 0;
}
}
8 changes: 3 additions & 5 deletions Friend/firmware/firmware_v1.0/src/transport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,10 +799,8 @@ int transport_start()
LOG_ERR("Speaker failed to start");
return 0;
}
else
{
LOG_INF("Speaker initialized");
}
LOG_INF("Speaker initialized");
register_speaker_service();


#endif
Expand Down Expand Up @@ -862,4 +860,4 @@ int broadcast_audio_packets(uint8_t *buffer, size_t size)
void accel_off()
{
gpio_pin_set_dt(&accel_gpio_pin, 0);
}
}
29 changes: 29 additions & 0 deletions app/lib/backend/http/api/messages.dart
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import 'dart:convert';
import 'dart:io';

import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:friend_private/backend/http/shared.dart';
import 'package:friend_private/backend/schema/message.dart';
import 'package:friend_private/env/env.dart';
import 'package:friend_private/utils/logger.dart';
import 'package:instabug_flutter/instabug_flutter.dart';
import 'package:path/path.dart';

Future<List<ServerMessage>> getMessagesServer() async {
// TODO: Add pagination
Expand Down Expand Up @@ -72,3 +75,29 @@ Future<ServerMessage> getInitialAppMessage(String? appId) {
}
});
}

Future<List<ServerMessage>> sendVoiceMessageServer(List<File> files) async {
var request = http.MultipartRequest(
'POST',
Uri.parse('${Env.apiBaseUrl}v1/voice-messages'),
);
for (var file in files) {
request.files.add(await http.MultipartFile.fromPath('files', file.path, filename: basename(file.path)));
}
request.headers.addAll({'Authorization': await getAuthHeader()});

try {
var streamedResponse = await request.send();
var response = await http.Response.fromStream(streamedResponse);
if (response.statusCode == 200) {
debugPrint('sendVoiceMessageServer response body: ${jsonDecode(response.body)}');
return ((jsonDecode(response.body) ?? []) as List<dynamic>).map((m) => ServerMessage.fromJson(m)).toList();
} else {
debugPrint('Failed to upload sample. Status code: ${response.statusCode} ${response.body}');
throw Exception('Failed to upload sample. Status code: ${response.statusCode}');
}
} catch (e) {
debugPrint('An error occurred uploadSample: $e');
throw Exception('An error occurred uploadSample: $e');
}
}
Loading

0 comments on commit 90e9f98

Please sign in to comment.