Skip to content

Commit 1508e45

Browse files
authored
Merge pull request #12 from cslrfid/release-1.19.0
LNA Settings and Impinj Extensions
2 parents fa8ac13 + 6680f5a commit 1508e45

File tree

141 files changed

+4201
-2733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+4201
-2733
lines changed

.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

.idea/gradle.xml

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "com.csl.cs108ademoapp"
77
minSdkVersion 19
88
targetSdkVersion 28
9-
versionCode 22
10-
versionName "1.17.0"
9+
versionCode 24
10+
versionName "1.19.0"
1111
}
1212
compileOptions {
1313
sourceCompatibility JavaVersion.VERSION_1_7
@@ -16,7 +16,7 @@ android {
1616
}
1717

1818
dependencies {
19-
compile fileTree(include: ['*.jar'], dir: 'libs')
20-
compile project(':cs108library4a')
21-
compile 'com.android.support:design:28.0.0'
19+
implementation fileTree(include: ['*.jar'], dir: 'libs')
20+
implementation project(':cs108library4a')
21+
implementation 'com.android.support:design:28.0.0'
2222
}
-1.94 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

app/release/output.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/src/main/java/com/csl/cs108ademoapp/DrawerListContent.java

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ public enum DrawerPositions {
2020
ABOUT, CONNECT,
2121
INVENTORY, SEARCH, MULTIBANK,
2222
SETTING, FILTER, READWRITE, SECURITY, REGISTER,
23-
COLDCHAIN, BAPCARD, AXZON, RFMICRON, UCODE, UCODE8,
23+
COLDCHAIN, CTESIUS, AXZON, RFMICRON,
24+
UCODE, UCODE8,
25+
BAPCARD, IMPINVENTORY, AURASENSE,
2426
WEDGE, BLANK;
2527

2628
public static DrawerPositions toDrawerPosition(int x) {
@@ -35,13 +37,16 @@ public static DrawerPositions toDrawerPosition(int x) {
3537
case 7: return READWRITE;
3638
case 8: return SECURITY;
3739
case 9: return REGISTER;
38-
case 11: return COLDCHAIN;
39-
case 10: return BAPCARD;
40-
case 12: return AXZON;
41-
case 13: return RFMICRON;
40+
case 10: return COLDCHAIN;
41+
case 11: return AXZON;
42+
case 12: return RFMICRON;
43+
case 13: return CTESIUS;
4244
case 14: return UCODE;
4345
case 15: return UCODE8;
44-
case 16: return WEDGE;
46+
case 16: return BAPCARD;
47+
case 17: return IMPINVENTORY;
48+
case 18: return AURASENSE;
49+
case 19: return WEDGE;
4550
}
4651
return null;
4752
}
@@ -60,12 +65,15 @@ public static DrawerPositions toDrawerPosition(int x) {
6065
addItem(new DrawerItem("8", "Security", R.drawable.dl_access));
6166
addItem(new DrawerItem("9", "Register Tag", R.drawable.dl_rr));
6267
addItem(new DrawerItem("10", "Cold Chain CS8300", R.drawable.dl_loc));
63-
addItem(new DrawerItem("11", "CS9010 BAP ID Card", R.drawable.dl_loc));
64-
addItem(new DrawerItem("12", "Axzon", R.drawable.dl_loc));
65-
addItem(new DrawerItem("13", "Temperature / Humidity", R.drawable.dl_loc));
68+
addItem(new DrawerItem("11", "Axzon", R.drawable.dl_loc));
69+
addItem(new DrawerItem("12", "Axzon Magnus", R.drawable.dl_loc));
70+
addItem(new DrawerItem("13", "CTESIUS Temp", R.drawable.dl_loc));
6671
addItem(new DrawerItem("14", "UCODE DNA", R.drawable.dl_loc));
6772
addItem(new DrawerItem("15", "UCODE 8", R.drawable.dl_loc));
68-
addItem(new DrawerItem("16", "Wedge", R.drawable.dl_rr));
73+
addItem(new DrawerItem("16", "CS9010 BAP ID Card", R.drawable.dl_loc));
74+
addItem(new DrawerItem("17", "Impinj FastID", R.drawable.dl_loc));
75+
addItem(new DrawerItem("18", "Aura-sense", R.drawable.dl_loc));
76+
addItem(new DrawerItem("19", "Wedge", R.drawable.dl_rr));
6977
}
7078

7179
private static void addItem(DrawerItem item) {

0 commit comments

Comments
 (0)