Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bluetooth #84

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Bluetooth #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
357b11d
try bluetooth connection
Krupskis Feb 11, 2024
b22cf7b
Bluetooth work
Krupskis Feb 19, 2024
2ba5e8f
Add mvp for bluetooth
Krupskis Feb 29, 2024
e92fec4
Merge remote-tracking branch 'origin/main' into Bluetooth
Krupskis Feb 29, 2024
925d678
Bluetooth
Krupskis Mar 4, 2024
507395b
bluetooth
Krupskis Mar 6, 2024
ef7542c
update
Krupskis Mar 6, 2024
f4f4395
Bluetooth Button
Krupskis Mar 6, 2024
6942cc2
NavBar fixes
Krupskis Mar 6, 2024
7440dc5
Merge branch 'main' into Bluetooth
Krupskis Mar 7, 2024
8140c3b
try nrf
Krupskis Mar 9, 2024
befb4cb
small changes
Krupskis Mar 19, 2024
957a1da
Merge branch 'main' into Bluetooth
Krupskis Mar 19, 2024
01a665c
sample rate to 8000
Krupskis Mar 19, 2024
13c28a5
add serial to wav script
Krupskis Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/node_modules
/.pnp
.pnp.js
venv

# testing
/coverage
Expand Down
1 change: 1 addition & 0 deletions app/android/app/capacitor.build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ android {

apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-community-bluetooth-le')
implementation project(':capacitor-preferences')

}
Expand Down
3 changes: 3 additions & 0 deletions app/android/capacitor.settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')

include ':capacitor-community-bluetooth-le'
project(':capacitor-community-bluetooth-le').projectDir = new File('../node_modules/@capacitor-community/bluetooth-le/android')

include ':capacitor-preferences'
project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')
7 changes: 6 additions & 1 deletion app/capacitor.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ const config: CapacitorConfig = {
appName: 'adeus',
webDir: 'out',
server: {
androidScheme: 'https',
androidScheme: 'https'
},
plugins: {
CapacitorHttp: {
enabled: true,
},
},
};

Expand Down
10 changes: 7 additions & 3 deletions app/ios/App/App.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@
baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 658U36Q86D;
Expand All @@ -353,8 +354,9 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = ai.adeus;
PRODUCT_BUNDLE_IDENTIFIER = app.mkrupskis;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -366,15 +368,17 @@
baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 658U36Q86D;
DEVELOPMENT_TEAM = Q892SK2RNM;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = ai.adeus;
PRODUCT_BUNDLE_IDENTIFIER = app.mkrupskis;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
6 changes: 5 additions & 1 deletion app/ios/App/App/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>adeus</string>
<string>adeus</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand All @@ -22,6 +22,10 @@
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>We require Bluetooth access to connect to nearby devices.</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>We require Bluetooth access to connect to nearby devices.</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
Expand Down
1 change: 1 addition & 0 deletions app/ios/App/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ install! 'cocoapods', :disable_input_output_paths => true
def capacitor_pods
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCommunityBluetoothLe', :path => '../../node_modules/@capacitor-community/bluetooth-le'
pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences'
end

Expand Down
8 changes: 7 additions & 1 deletion app/ios/App/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,34 @@
PODS:
- Capacitor (5.6.0):
- CapacitorCordova
- CapacitorCommunityBluetoothLe (3.1.1):
- Capacitor
- CapacitorCordova (5.6.0)
- CapacitorPreferences (5.0.7):
- Capacitor

DEPENDENCIES:
- "Capacitor (from `../../node_modules/@capacitor/ios`)"
- "CapacitorCommunityBluetoothLe (from `../../node_modules/@capacitor-community/bluetooth-le`)"
- "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
- "CapacitorPreferences (from `../../node_modules/@capacitor/preferences`)"

EXTERNAL SOURCES:
Capacitor:
:path: "../../node_modules/@capacitor/ios"
CapacitorCommunityBluetoothLe:
:path: "../../node_modules/@capacitor-community/bluetooth-le"
CapacitorCordova:
:path: "../../node_modules/@capacitor/ios"
CapacitorPreferences:
:path: "../../node_modules/@capacitor/preferences"

SPEC CHECKSUMS:
Capacitor: ebfc16cdb8116d04c101686b080342872da42d43
CapacitorCommunityBluetoothLe: 86ca83c89199336039bad94f45f8363114ae1464
CapacitorCordova: 931b48fcdbc9bc985fc2f16cec9f77c794a27729
CapacitorPreferences: 77ac427e98db83bace772455f8ba447430382c4c

PODFILE CHECKSUM: 769e120bf4dfe4ef1095b83775e36bafeeeb3cdd
PODFILE CHECKSUM: da5221e2db218790239ebdc591ce1525f4e8ad73

COCOAPODS: 1.15.2
17 changes: 17 additions & 0 deletions app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"android": "npm run app && npx cap open android"
},
"dependencies": {
"@capacitor-community/bluetooth-le": "^3.1.1",
"@capacitor/android": "^5.6.0",
"@capacitor/core": "^5.6.0",
"@capacitor/ios": "^5.6.0",
Expand Down
16 changes: 15 additions & 1 deletion app/src/components/Chat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { SupabaseClient } from '@supabase/supabase-js';
import { useMutation, useQuery } from '@tanstack/react-query';
import { Bluetooth } from 'lucide-react';
import Link from 'next/link';
import { useRouter } from 'next/router';
import { useEffect, useRef, useState } from 'react';
import { toast } from 'sonner';
import { useSupabaseConfig } from '../utils/useSupabaseConfig';
Expand All @@ -10,6 +13,7 @@ import NewConversationButton from './NewConversationButton';
import PromptForm from './PromptForm';
import SideMenu from './SideMenu';
import { ThemeToggle } from './ThemeToggle';
import { Button } from './ui/button';

export default function Chat({
supabaseClient,
Expand All @@ -18,6 +22,7 @@ export default function Chat({
}) {
const bottomRef = useRef<HTMLDivElement | null>(null);
const textareaRef = useRef<HTMLTextAreaElement | null>(null);
const router = useRouter();

const [entryData, setEntryData] = useState('');
const [messages, setMessages] = useState<Message[]>([]);
Expand Down Expand Up @@ -207,12 +212,21 @@ export default function Chat({
</div>
<div className="fixed right-4 top-4 flex space-x-4">
<NavMenu>
<LogoutButton supabaseClient={supabaseClient} />
<NewConversationButton
createNewConversation={() => {
newConversation.mutate();
}}
/>
<Button
Copy link
Collaborator

@Jacksonmills Jacksonmills Mar 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets make sure to use next/link Link for these. You can use asChild on Button so it renders just as the <a></a> tag and not <button><a></a></button>

e.g.

<Button
  ...
  + asChild
  - onClick={() => router.push('/')}
>
  + <Link href="/connect">
      <Bluetooth size={20} />
  + </Link>
</Button>

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh and then remove the useRouter if we arent needing it anymore

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we could definitely clean up the connect page and make it more of a fleshed out page
totally agree. ESP32 is still fairly unusable - high power consumption, requires soldering a mic on it, want to push out nrf PR and then polish the connect page.

asChild
size={'icon'}
className="bg-muted/20 text-muted-foreground hover:bg-muted/40 rounded-full"
>
<Link href="/connect">
<Bluetooth size={20} />
</Link>
</Button>
<LogoutButton supabaseClient={supabaseClient} />
<ThemeToggle />
</NavMenu>
</div>
Expand Down
Loading