summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e6acb2a)
raw | patch | inline | side by side (parent: e6acb2a)
| author | Ole Andreas Torvmark <ole@situne.no> | |
| Wed, 31 Aug 2022 10:37:07 +0000 (12:37 +0200) | ||
| committer | Ole Andreas Torvmark <ole@situne.no> | |
| Wed, 31 Aug 2022 10:37:07 +0000 (12:37 +0200) |
- CC26x2RB
- CC26x2R7
- CC1352P7
- CC1352P
- CC2652P
- CC2651P3
* Updated to latest Gradle Plugin
- CC26x2R7
- CC1352P7
- CC1352P
- CC2652P
- CC2651P3
* Updated to latest Gradle Plugin
33 files changed:
diff --git a/.gitignore b/.gitignore
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,33 @@
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_23_1_1.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_23_1_1.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:appcompat-v7-23.1.1">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/477246a56392daf0fe4b9490df520f44/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/477246a56392daf0fe4b9490df520f44/jars/classes.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.1.1/appcompat-v7-23.1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.1.1/appcompat-v7-23.1.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_23_1_1_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_23_1_1_aar.xml
index 01dd8be61552fbf950b3930282feb580f6261cdb..8686184f7174439eea38707f2a22216b53d766b4 100644 (file)
<library name="Gradle: com.android.support:appcompat-v7:23.1.1@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/bf98eec46cf4e268a3d0542af06e2588/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0024d5b1d8d94613b57654f795a50480/transformed/appcompat-v7-23.1.1/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/bf98eec46cf4e268a3d0542af06e2588/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-23.1.1.aar/bf98eec46cf4e268a3d0542af06e2588/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0024d5b1d8d94613b57654f795a50480/transformed/appcompat-v7-23.1.1/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/0024d5b1d8d94613b57654f795a50480/transformed/appcompat-v7-23.1.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/0024d5b1d8d94613b57654f795a50480/transformed/appcompat-v7-23.1.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.1.1/appcompat-v7-23.1.1-javadoc.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/appcompat-v7/23.1.1/cbcf5a41837dafa42a43f8fbc6cc93e23a4c5985/appcompat-v7-23.1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.1.1/appcompat-v7-23.1.1-sources.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/appcompat-v7/23.1.1/df71f1e47e6fa62c328e2d3ffb7032a09f1bdd68/appcompat-v7-23.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.constraint:constraint-layout-1.0.2">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/f89c4cfda756ac4ac48f1f8a7e045c8d/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/f89c4cfda756ac4ac48f1f8a7e045c8d/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2_aar.xml
index 7f030bde8cf13dd6ce30dbf32988eb633de705cf..3ca478e325f72957c56f4f0fe316c7b8afbc2704 100644 (file)
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/316956488a6dea10e82597c1c97abaf5/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.0.2.aar/316956488a6dea10e82597c1c97abaf5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b11c46b63d1932fcea6b3ce23f7f68d3/transformed/constraint-layout-1.0.2/AndroidManifest.xml" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b11c46b63d1932fcea6b3ce23f7f68d3/transformed/constraint-layout-1.0.2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b11c46b63d1932fcea6b3ce23f7f68d3/transformed/constraint-layout-1.0.2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.constraint:constraint-layout-solver:1.0.2@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/Library/Android/sdk/extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2/constraint-layout-solver-1.0.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_23_1_1_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_23_1_1_jar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-annotations:23.1.1@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.1.1/support-annotations-23.1.1.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.1.1/support-annotations-23.1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.1.1/support-annotations-23.1.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_25_4_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_25_4_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-annotations:25.4.0@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/25.4.0/f6a2fc748ae3769633dea050563e1613e93c135e/support-annotations-25.4.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/25.4.0/3a8a4f1ea5cbc84340614473805239fc873b6e8e/support-annotations-25.4.0-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_23_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_v4_23_1_1.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support:support-v4-23.1.1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-23.1.1.aar/26832b8bf9a8735af647eb45a1ef78c3/jars/libs/internal_impl-23.1.1.jar!/" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-23.1.1.aar/26832b8bf9a8735af647eb45a1ef78c3/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-23.1.1.aar/26832b8bf9a8735af647eb45a1ef78c3/res" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.1.1/support-v4-23.1.1-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.1.1/support-v4-23.1.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_23_1_1_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_23_1_1_aar.xml
index 7833fb4b458b09146c0c1f507e4b279e2b998768..2eb6d40f610bab8fb98b45273952d21944cba5fb 100644 (file)
<library name="Gradle: com.android.support:support-v4:23.1.1@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-23.1.1.aar/c568b0a67cb4faaa71b788ceee2faf9d/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2c065c5f8f5249b73877861e6f858635/transformed/support-v4-23.1.1/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-23.1.1.aar/c568b0a67cb4faaa71b788ceee2faf9d/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-23.1.1.aar/c568b0a67cb4faaa71b788ceee2faf9d/jars/libs/internal_impl-23.1.1.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-23.1.1.aar/c568b0a67cb4faaa71b788ceee2faf9d/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/97a9dc366622cbd5f894ecbb157fb333/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2c065c5f8f5249b73877861e6f858635/transformed/support-v4-23.1.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/2c065c5f8f5249b73877861e6f858635/transformed/support-v4-23.1.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2c065c5f8f5249b73877861e6f858635/transformed/support-v4-23.1.1/jars/libs/internal_impl-23.1.1.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/2c065c5f8f5249b73877861e6f858635/transformed/support-v4-23.1.1/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.1.1/support-v4-23.1.1-javadoc.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-v4/23.1.1/a8554982514898a7ffbb7599a6044c6edbbdde72/support-v4-23.1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.1.1/support-v4-23.1.1-sources.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/support-v4/23.1.1/39ce0458436f4a5672e5ee910666464a0b529e/support-v4-23.1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_1.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test.espresso:espresso-core-3.0.1">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.1.aar/751b6512d0b86f8cf44efd49f70f7100/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.1.aar/751b6512d0b86f8cf44efd49f70f7100/jars/classes.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/3.0.1/2745fc2c78d3751db6c92cdc15dc760a08a8b145/espresso-core-3.0.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_1_aar.xml
index 193c07c984519c9864d97f45833599691f600970..e1a29cd1b01fa3089b91b7088c551cba53d531fd 100644 (file)
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.1.aar/58a2aa5cd6e43d0d525698d37d9bcae0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.1.aar/58a2aa5cd6e43d0d525698d37d9bcae0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e69a41af1b180af4a996ae03d34f72bf/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d106a6fce5b69a9b5727bfcce017054b/transformed/espresso-core-3.0.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d106a6fce5b69a9b5727bfcce017054b/transformed/espresso-core-3.0.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d106a6fce5b69a9b5727bfcce017054b/transformed/espresso-core-3.0.1/AndroidManifest.xml" />
</CLASSES>
- <JAVADOC />
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/3.0.1/1b1e7d702208711e2f872d32e52539fb21427d77/espresso-core-3.0.1-javadoc.jar!/" />
+ </JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/3.0.1/2745fc2c78d3751db6c92cdc15dc760a08a8b145/espresso-core-3.0.1-sources.jar!/" />
</SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_1.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.1">
- <CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.1.aar/3772676696180e1c1b65363530b23211/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.1.aar/3772676696180e1c1b65363530b23211/jars/classes.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/3.0.1/4c14f82b83be0714e7483f0b6b7d379120412a61/espresso-idling-resource-3.0.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_1_aar.xml
index 64e2c5689bac1c32bd8a5e8cced721294f9e55be..62fb8ddcc3219604f47e0fe25576fc87d84ae1c7 100644 (file)
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_1_aar.xml
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.1.aar/91d4df6860caaef742ea206aa0abc4dc/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.1.aar/91d4df6860caaef742ea206aa0abc4dc/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08aac044c9ac47bc4399ac30348791b5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/926b7c067523c24f7fc0fd489b76e968/transformed/espresso-idling-resource-3.0.1/AndroidManifest.xml" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/926b7c067523c24f7fc0fd489b76e968/transformed/espresso-idling-resource-3.0.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/926b7c067523c24f7fc0fd489b76e968/transformed/espresso-idling-resource-3.0.1/res" />
</CLASSES>
- <JAVADOC />
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/3.0.1/ed0ebc5b4b9fa9942d7bc80dd366f3e3e83efbc6/espresso-idling-resource-3.0.1-javadoc.jar!/" />
+ </JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/3.0.1/4c14f82b83be0714e7483f0b6b7d379120412a61/espresso-idling-resource-3.0.1-sources.jar!/" />
</SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_rules_1_0_1.xml b/.idea/libraries/Gradle__com_android_support_test_rules_1_0_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test:rules-1.0.1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-1.0.1.aar/fa2892828fe575de161c7d26969f33a2/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-1.0.1.aar/fa2892828fe575de161c7d26969f33a2/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/rules/1.0.1/8d0aaa918b00c7ef6487610c9175276de6df953e/rules-1.0.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_test_rules_1_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_test_rules_1_0_1_aar.xml
index 8ca219d1f55cd11f7024521f4a70ae65e386c5e6..a88352bacd5f1498284abf114be736bea3554fb3 100644 (file)
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-1.0.1.aar/dfa19da0ac7cec092225bf4a5f1c30dc/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/rules-1.0.1.aar/dfa19da0ac7cec092225bf4a5f1c30dc/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1cfa066a22cac9c68fc18e5bcac0d4e3/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d2dc04b8e588913c463964f0c05aa8f2/transformed/rules-1.0.1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d2dc04b8e588913c463964f0c05aa8f2/transformed/rules-1.0.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d2dc04b8e588913c463964f0c05aa8f2/transformed/rules-1.0.1/AndroidManifest.xml" />
</CLASSES>
- <JAVADOC />
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/rules/1.0.1/7969301d0d9cfa3bd123ce685ef7a918db9eaa4d/rules-1.0.1-javadoc.jar!/" />
+ </JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/rules/1.0.1/8d0aaa918b00c7ef6487610c9175276de6df953e/rules-1.0.1-sources.jar!/" />
</SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_1.xml b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.android.support.test:runner-1.0.1">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.1.aar/9f80d061829560d0ded2ee2d2ce5354d/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.1.aar/9f80d061829560d0ded2ee2d2ce5354d/res" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/runner/1.0.1/e4982dfc89a3866d17243e1cde41241387a2103e/runner-1.0.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_1_aar.xml b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_1_aar.xml
index b37b0b55e61dfc026ef6ebb320807528e637e9df..fcb1257d8d1c2d36135340cdf1586857aebcdb20 100644 (file)
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.1.aar/0dc13ebd5bc2103e67e83572347f3ce5/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.1.aar/0dc13ebd5bc2103e67e83572347f3ce5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ee406f113c0767474fef07d03ad13c5/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d6472897be03b26ee785d06c1cf8b1b0/transformed/runner-1.0.1/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d6472897be03b26ee785d06c1cf8b1b0/transformed/runner-1.0.1/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d6472897be03b26ee785d06c1cf8b1b0/transformed/runner-1.0.1/AndroidManifest.xml" />
</CLASSES>
- <JAVADOC />
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/runner/1.0.1/e5f060e12febde28cb32882042faacd7e51e7397/runner-1.0.1-javadoc.jar!/" />
+ </JAVADOC>
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/runner/1.0.1/e4982dfc89a3866d17243e1cde41241387a2103e/runner-1.0.1-sources.jar!/" />
</SOURCES>
diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/2.0.1/516c03b21d50a644d538de0f0369c620989cd8f0/jsr305-2.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: com.squareup:javawriter:2.1.1@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/67ff45d9ae02e583d0f9b3432a5ebbe05c30c966/javawriter-2.1.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup/javawriter/2.1.1/5b31387d839a5cdaf5b6de3990da01f7f2b963c5/javawriter-2.1.1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: javax.inject:javax.inject:1@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/a00123f261762a7c5e0ec916a2c7c8298d29c400/javax.inject-1-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: junit:junit:4.12@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: net.sf.kxml:kxml2:2.3.0@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.kxml/kxml2/2.3.0/ccbc77a5fd907ef863c29f3596c6f54ffa4e9442/kxml2-2.3.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.kxml/kxml2/2.3.0/309cd2cff7260e465792fda3dcbb063b730d8050/kxml2-2.3.0-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.hamcrest:hamcrest-core:1.3@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/5de0c73fef18917cd85d0ab70bb23818685e4dfd/hamcrest-integration-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-integration/1.3/ae7787a563e6a1b1f17fd4ac43be3a3c8830cfda/hamcrest-integration-1.3-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="libraryTable">
- <library name="Gradle: org.hamcrest:hamcrest-library:1.3@jar">
- <CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/47a7ee46628ab7133129cd7cef1e92657bc275e/hamcrest-library-1.3-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index da4b6649da3b8a94ad718c273581cc6a905e37c9..1f65ab4dcdc3e46fffcfc66d46b8b77f279bcb40 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
defaultConfig {
applicationId "com.ti.ti_oad_example"
minSdkVersion 22
- targetSdkVersion 22
+ targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/com/ti/ti_oad_example/TIOADExampleActivity.java b/app/src/main/java/com/ti/ti_oad_example/TIOADExampleActivity.java
index be315ccd5864481246947f28ee05d991fdcbfbd5..2ae4b826fd49da2855a37bf005d4315ab6e2ca32 100644 (file)
}
});
if (finalStatus == TIOADEoadDefinitions.oadStatusEnumeration.tiOADClientReady) {
- showFileSelector();
- //client.start("ble5_project_zero_cc26x2r1lp_app_FlashROM_Release_oad.bin");
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ TextView oadChipType = (TextView) findViewById(R.id.oad_chip_type);
+ oadChipType.setText(TIOADEoadDefinitions.oadChipTypePrettyPrint(client.getTIOADEoadDeviceID()));
+ }
+ });
+ showFileSelector();
+ //client.start("ble5_project_zero_cc26x2r1lp_app_FlashROM_Release_oad.bin");
}
if (finalStatus == TIOADEoadDefinitions.oadStatusEnumeration.tiOADClientFileIsNotForDevice) {
showAlert(finalStatus);
diff --git a/app/src/main/res/layout/activity_tioad_example.xml b/app/src/main/res/layout/activity_tioad_example.xml
index a0a64276dd54c182994de4885a6da9309fd779f2..28688fd625b7ed7e47212a351345022dbafddda1 100644 (file)
android:textAlignment="textEnd" />
</LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="20dp"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/textView8"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="Chip Type:" />
+
+ <TextView
+ android:id="@+id/oad_chip_type"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:textAlignment="viewEnd" />
+ </LinearLayout>
+
<TextView
android:id="@+id/textView15"
android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index a868baa3d09478692bf445c1f0df2096cf582c30..fcafdd46345818a46172f904cb837e01e9d85862 100644 (file)
--- a/build.gradle
+++ b/build.gradle
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.4.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
index 52b5c5c2c5dcd4b9dfec415302cfdc12e7fd76d3..a34a1e8eab8d2e8d62827882588437f761709246 100644 (file)
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/ti_oad/build.gradle b/ti_oad/build.gradle
index 53c3d15bbee2b842a6ae0b8e1fd8e6fc230ebdae..a37000b3b636e99ebe991e7892a3d3a8e36d3f57 100644 (file)
--- a/ti_oad/build.gradle
+++ b/ti_oad/build.gradle
defaultConfig {
minSdkVersion 22
targetSdkVersion 22
- versionCode 1
- versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/ti_oad/src/main/java/com/ti/ti_oad/TIOADEoadDefinitions.java b/ti_oad/src/main/java/com/ti/ti_oad/TIOADEoadDefinitions.java
index b6ca5d2bbf09d6df6e7227c3cc0ebc9a7cf89cb9..addf140ad4adf9953493428b898d073264e64693 100644 (file)
tiOADChipTypeCC1312,
tiOADChipTypeCC1352,
tiOADChipTypeCC1352P,
+ tiOADChipTypeCC2652P,
+ tiOADChipTypeCC2652RB,
+ tiOADChipTypeCC2652PB,
+ tiOADChipTypeCC1311R3,
+ tiOADChipTypeCC1311P3,
+ tiOADChipTypeCC2651R3,
+ tiOADChipTypeCC2651P3,
+ tiOADChipTypeCC2641R3,
+ tiOADChipTypeCC1312R7,
+ tiOADChipTypeUnusedOne,
+ tiOADChipTypeCC1352R7,
+ tiOADChipTypeCC1352P7,
+ tiOADChipTypeCC2652R7,
+ tiOADChipTypeCC2652P7,
+ tiOADChipTypeCC2652R5,
+ tiOADChipTypeCC1314R10,
+ tiOADChipTypeCC1354P10,
+ tiOADChipTypeCC1354R10,
+ tiOADChipTypeCC2654P10,
+ tiOADChipTypeCC2654R10,
+ tiOADChipTypeCC2674P10,
+ tiOADChipTypeCC2674R10,
+ tiOADChipTypeCC2672R3,
+ tiOADChipTypeCC2672P3,
}
public enum oadChipFamily {
static public byte[] oadImageInfoFromChipType (byte[] chipTypeVector) {
oadChipType chipType = oadChipType.values()[chipTypeVector[0]];
switch (chipType) {
- case tiOADChipTypeCC2640R2:
- return TI_OAD_IMG_INFO_CC2640R2;
- case tiOADChipTypeCC2642:
- case tiOADChipTypeCC2652:
- return TI_OAD_IMG_INFO_CC26X2R1;
- case tiOADChipTypeCC1352:
- case tiOADChipTypeCC1352P:
- return TI_OAD_IMG_INFO_CC13XR1;
- default:
- return new byte[8];
+ case tiOADChipTypeCC2640R2:
+ return TI_OAD_IMG_INFO_CC2640R2;
+ case tiOADChipTypeCC2642:
+ case tiOADChipTypeCC2652:
+ case tiOADChipTypeCC2652RB:
+ case tiOADChipTypeCC2652R7:
+ case tiOADChipTypeCC2652P7:
+ case tiOADChipTypeCC2652P:
+ case tiOADChipTypeCC2651P3:
+ case tiOADChipTypeCC2651R3:
+ return TI_OAD_IMG_INFO_CC26X2R1;
+ case tiOADChipTypeCC1352:
+ case tiOADChipTypeCC1352P:
+ case tiOADChipTypeCC1352R7:
+ case tiOADChipTypeCC1352P7:
+ return TI_OAD_IMG_INFO_CC13XR1;
+ default:
+ return new byte[8];
}
}
return "CC2650";
case tiOADChipTypeCC2652:
return "CC2652";
+ case tiOADChipTypeCC2652RB:
+ return "CC2652RB";
+ case tiOADChipTypeCC2652R7:
+ return "CC2652R7";
+ case tiOADChipTypeCC2652P7:
+ return "CC2652P7";
+ case tiOADChipTypeCC2652P:
+ return "CC2652P";
+ case tiOADChipTypeCC2651P3:
+ return "CC2651P3";
+ case tiOADChipTypeCC2652R5:
+ return "CC2652R5";
+ case tiOADChipTypeCC1352R7:
+ return "CC1352R7";
+ case tiOADChipTypeCC1352P7:
+ return "CC1352P7";
+ case tiOADChipTypeCC1354P10:
+ return "CC1354P10";
+ case tiOADChipTypeCC1354R10:
+ return "CC1354R10";
+ case tiOADChipTypeCC2641R3:
+ return "CC2641R3";
+ case tiOADChipTypeCC2651R3:
+ return "CC2651R3";
+ case tiOADChipTypeCC2652PB:
+ return "CC2652PB";
+ case tiOADChipTypeCC2654P10:
+ return "CC2654P10";
+ case tiOADChipTypeCC2654R10:
+ return "CC2654R10";
+ case tiOADChipTypeCC2672P3:
+ return "CC2672P3";
+ case tiOADChipTypeCC2674P10:
+ return "CC2674P10";
case tiOADChipTypeCustomOne:
case tiOADChipTypeCustomTwo:
return "Custom";