shark/hexapod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: shark:4478b11968ea3b956762dc161c204c6e381dfd0b
Branches Tags
shark:master
..
compare: shark:1a4ba3b8965977c1625139f7aaafea443ca0b389
Branches Tags
shark:master

No commits in common. "4478b11968ea3b956762dc161c204c6e381dfd0b" and "1a4ba3b8965977c1625139f7aaafea443ca0b389" have entirely different histories.
4478b11968 ... 1a4ba3b896

8 changed files with 10 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
README.md
View File

@ -25,8 +25,6 @@ The table below shows the difference between this project and the original one.
https://user-images.githubusercontent.com/471808/148647807-02e3e901-6181-4473-8ac4-3b5998fa8d17.mp4 https://user-images.githubusercontent.com/471808/148647807-02e3e901-6181-4473-8ac4-3b5998fa8d17.mp4
https://user-images.githubusercontent.com/471808/158099495-1caeb903-a2e6-4e8d-9f13-54728d7d255a.mp4
## Software ## Software
### Raspberry Pi ### Raspberry Pi

BIN
mechanism/Fusion360/body_bottom.f3d
View File

Binary file not shown.

1
software/android/.idea/gradle.xml generated
View File

@ -13,6 +13,7 @@
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>

7
software/android/app/build.gradle
View File

@ -4,12 +4,12 @@ plugins {
} }
android { android {
compileSdk 32 compileSdk 31
defaultConfig { defaultConfig {
applicationId "com.rookiedev.hexapod" applicationId "com.rookiedev.hexapod"
minSdk 30 minSdk 30
targetSdk 32 targetSdk 31
versionCode 3 versionCode 3
versionName "1.2" versionName "1.2"
@ -29,14 +29,13 @@ android {
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '1.8'
} }
namespace 'com.rookiedev.hexapod'
} }
dependencies { dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.6.0' implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.3'

3
software/android/app/src/main/AndroidManifest.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.rookiedev.hexapod">
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" /> <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" /> <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />

4
software/android/build.gradle
View File

@ -5,8 +5,8 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.2.0' classpath 'com.android.tools.build:gradle:7.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

2
software/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Feb 09 11:03:31 EST 2022 #Wed Feb 09 11:03:31 EST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

3
software/raspberry pi/hexapod.py
View File

@ -350,8 +350,7 @@ class Hexapod(Thread):
def save_config(self): def save_config(self):
try: try:
json.dump(self.config, open( json.dump(self.config, open('/home/pi/hexapod/software/raspberry pi/config.json', 'w+'), indent=4)
'/home/pi/hexapod/software/raspberry pi/config.json', 'w+'), indent=4)
except PermissionError as err: except PermissionError as err:
pass pass