Skip to content

Commit

Permalink
Checkpoint for 2.4 release
Browse files Browse the repository at this point in the history
Fragments to demo event and temperature classes
Updated API calls to v1.3.*
  • Loading branch information
scaryghost committed Jan 6, 2015
1 parent 8979812 commit 48fddfe
Show file tree
Hide file tree
Showing 24 changed files with 1,710 additions and 681 deletions.
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# MetaWear Android App #

## About ##
This app provides an example of how to use the MetaWear API. It uses the sample BluetoothLeGatt app on the Android developer page and the Nordic nRF Toolbox app as references.

[http://developer.android.com/samples/BluetoothLeGatt/index.html](http://developer.android.com/samples/BluetoothLeGatt/index.html)
[https://play.google.com/store/apps/details?id=no.nordicsemi.android.nrftoolbox&hl=en](https://play.google.com/store/apps/details?id=no.nordicsemi.android.nrftoolbox&hl=en)

### Version ###
Current version is: 2.3

### Build ###
The API was created with Android Developer Tools v22.6.2-1085508. It is targeted for Android 4.4.2 (API 19) SDK with Android 4.3 (API 18) as the minimum required SDK and requires a JDK compiler compliance level of 1.7. To build the project, you will need to download the MetaWear API and configure the example app to include the API in the build path. More information on configuring the build is available in the "Getting Started" guide, available on the MbientLab website: [https://mbientlab.com/docs/](https://mbientlab.com/docs/).

By default, the app is configured to refer to the MetaWear API Eclipse project. You may change it to link to the jar instead if you do not plan on modifying the API code.
# MetaWear Android App #

## About ##
This app provides an example of how to use the MetaWear API. It uses the sample BluetoothLeGatt app on the Android developer page and the Nordic nRF Toolbox app as references.

[http://developer.android.com/samples/BluetoothLeGatt/index.html](http://developer.android.com/samples/BluetoothLeGatt/index.html)
[https://play.google.com/store/apps/details?id=no.nordicsemi.android.nrftoolbox&hl=en](https://play.google.com/store/apps/details?id=no.nordicsemi.android.nrftoolbox&hl=en)

### Version ###
Current version is: 2.3

### Build ###
The API was created with Android Developer Tools v22.6.2-1085508. It is targeted for Android 4.4.2 (API 19) SDK with Android 4.3 (API 18) as the minimum required SDK and requires a JDK compiler compliance level of 1.7. To build the project, you will need to download the MetaWear API and configure the example app to include the API in the build path. More information on configuring the build is available in the "Getting Started" guide, available on the MbientLab website: [https://mbientlab.com/docs/](https://mbientlab.com/docs/).

By default, the app is configured to refer to the MetaWear API Eclipse project. You may change it to link to the jar instead if you do not plan on modifying the API code.
22 changes: 22 additions & 0 deletions res/layout/fragment_device_info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,28 @@ contact MbientLab Inc, at www.mbientlab.com.
android:layout_weight="1" />

</TableRow>

<TableRow
android:id="@+id/tableRow8"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal" >

<TextView
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/action_text"
android:text="@string/label_remote_rssi" />

<TextView
android:id="@+id/remote_rssi"
android:layout_width="0dp"
android:layout_weight="1" />

</TableRow>
</TableLayout>

<Button
Expand Down
51 changes: 51 additions & 0 deletions res/layout/fragment_event.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/RelativeLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp"
tools:context=".EventFragment" >

<Spinner
android:id="@+id/spinner1"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />

<ScrollView
android:id="@+id/scrollView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/spinner1"
android:layout_alignLeft="@+id/spinner1"
android:layout_alignRight="@+id/spinner1"
android:layout_centerHorizontal="true"
android:layout_marginTop="50dp" >

<TextView
android:id="@+id/textView2"
android:layout_width="300dp"
android:layout_height="wrap_content" />
</ScrollView>

<Button
android:id="@+id/button1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/button2"
android:layout_below="@+id/scrollView1"
android:layout_marginTop="20dp"
android:text="Program" />

<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/button1"
android:layout_centerHorizontal="true"
android:text="Erase" />

</RelativeLayout>
39 changes: 31 additions & 8 deletions res/layout/fragment_haptic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,33 +37,57 @@ contact MbientLab Inc, at www.mbientlab.com.

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content"
android:weightSum="2" >

<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.50"
android:text="Duty Cycle" />

<EditText
android:id="@+id/editText2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:ems="10"
android:inputType="number"
android:hint="[0, 100] percent" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:weightSum="2" >

<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Pulse Width"
android:layout_weight="1.00" />
android:layout_weight="0.50"
android:text="Pulse Width" />

<EditText
android:id="@+id/editText1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.00"
android:layout_weight="1.5"
android:ems="10"
android:hint="Pulse Width (ms)"
android:hint="[0, 65535] ms"
android:inputType="number" >

<requestFocus />
</EditText>

</LinearLayout>

<LinearLayout
android:id="@+id/LinearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal" >
android:gravity="center_horizontal"
android:orientation="vertical" >

<Button
android:id="@+id/button1"
Expand All @@ -76,7 +100,6 @@ contact MbientLab Inc, at www.mbientlab.com.
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Run Buzzer" />

</LinearLayout>

</LinearLayout>
Loading

0 comments on commit 48fddfe

Please sign in to comment.