Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions SenseHatDriverDemo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
compileSdkVersion 28
defaultConfig {
applicationId "com.eon.androidthings.sensehat"
minSdkVersion 26
targetSdkVersion 26
minSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -20,14 +20,14 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'

implementation 'com.android.support:support-annotations:25.4.0'
implementation 'androidx.annotation:annotation:1.0.1'

compileOnly 'com.google.android.things:androidthings:+'
compileOnly 'com.google.android.things:androidthings:1.0'
implementation project(path: ':SenseHatDriverLibrary')

implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.eon.androidthings.sensehatdriverlibrary.SenseHat;
import com.eon.androidthings.sensehatdriverlibrary.devices.LedMatrix;
import com.eon.androidthings.sensehat.demos.JoystickDemo;
import com.eon.androidthings.sensehat.demos.TextScrollDemo;
import com.eon.androidthings.sensehat.demos.LedDrawingDemo;
import com.eon.androidthings.sensehat.uitils.NetworkUtils;

import org.apache.commons.lang3.exception.ExceptionUtils;
Expand All @@ -41,7 +41,7 @@
public class HomeActivity extends Activity {

private JoystickDemo joystickDemo;
private TextScrollDemo textScrollDemo;
private LedDrawingDemo ledDrawingDemo;

private TextView cursorCoordTextView;
private TextView cursorColorTextView;
Expand Down Expand Up @@ -82,7 +82,7 @@ protected void onCreate(Bundle savedInstanceState) {

/** Text-Scrolling
*/
this.textScrollDemo = new TextScrollDemo(sensorManager, this.getAssets());
this.ledDrawingDemo = new LedDrawingDemo(this);

/**
* Humidity and temperature demo...
Expand Down Expand Up @@ -118,7 +118,7 @@ public void onAccuracyChanged(Sensor sensor, int accuracy) {
senseHat.addHumidityTempatureSensorListener(humidityListener, temperatureListener);

/** Simple Joystick demo*/
this.joystickDemo = new JoystickDemo(sensorManager, new IGui() {
this.joystickDemo = new JoystickDemo(new IGui() {
@Override
public void setCursorInformations(final String xCoord, final String yCoord, final String color)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

import android.graphics.Bitmap;
import android.graphics.Color;
import android.hardware.SensorManager;

import com.eon.androidthings.sensehat.gui.IGui;
import com.eon.androidthings.sensehatdriverlibrary.SenseHat;
import com.eon.androidthings.sensehatdriverlibrary.devices.JoystickDirectionEnum;
import com.eon.androidthings.sensehatdriverlibrary.devices.JoystickListener;
import com.eon.androidthings.sensehatdriverlibrary.devices.LedMatrix;
import com.eon.androidthings.sensehat.gui.IGui;

import java.io.IOException;

Expand All @@ -29,7 +28,7 @@ public class JoystickDemo {

private IGui gui;

public JoystickDemo(SensorManager sensorManager, IGui gui) throws IOException {
public JoystickDemo(IGui gui) throws IOException {
this.gui = gui;

SenseHat senseHat = SenseHat.getInstance();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package com.eon.androidthings.sensehat.demos;

import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Rect;

import com.eon.androidthings.sensehat.R;
import com.eon.androidthings.sensehatdriverlibrary.SenseHat;
import com.eon.androidthings.sensehatdriverlibrary.devices.LedMatrix;
import com.eon.androidthings.sensehatdriverlibrary.devices.fonts.BlackWhiteFont;
import com.eon.androidthings.sensehatdriverlibrary.devices.fonts.LEDFont;

import java.io.IOException;

/**
* LED Drawing Demo
*/

public class LedDrawingDemo {

public LedDrawingDemo(final Context context) throws IOException {

//SenseHat.init(sensorManager);
// final LEDFont font = new MultiColorFont(assetmanager);
final LEDFont font = new BlackWhiteFont(context.getAssets());

// Draw one letter on the LED Matrix
// Bitmap letterBitmap = font.getBitmapForLetter('a');
// SenseHat.getInstance().getLedMatrix().draw(letterBitmap);

// infinity text scrolling
new Thread(new Runnable() {
@Override
public void run() {
try {
final LedMatrix ledMatrix = SenseHat.getInstance().getLedMatrix();
// Render icon and text once and re-use.
final Bitmap iconBitmap = createIconBitmap(context.getResources());
// TODO At the moment only uppercase letters are working
final Bitmap sentenceBitmap = font.getBitmapForSentence(" HELLO RASPI ");
do {
// Rotate iconBitmap a few times
for (int rotation = 0; rotation < 12; rotation++) {
ledMatrix.draw(iconBitmap, rotation);
Thread.sleep(500);
}
// Scroll the text on screen.
for (int currentX = 0; currentX < sentenceBitmap.getWidth() - LedMatrix.WIDTH; currentX++) {
// Using the currentX value, draw a specific segment of the sentenceBitmap.
ledMatrix.draw(
sentenceBitmap, currentX, 0, LedMatrix.WIDTH, LedMatrix.HEIGHT);
Thread.sleep(100);
}
} while (true);
} catch (Exception e) {
// TODO ExceptionHandling
e.printStackTrace();
}
}
}).start();
}

Bitmap createIconBitmap(final Resources resources) {
// Setting up result canvas
final Bitmap result = Bitmap.createBitmap(
LedMatrix.WIDTH, LedMatrix.HEIGHT, Bitmap.Config.ARGB_8888, true);
final Canvas canvas = new Canvas(result);
// Background color and canvas Paint
canvas.drawColor(Color.BLUE);
final Paint paint = new Paint();
paint.setColorFilter(new PorterDuffColorFilter(Color.GREEN, PorterDuff.Mode.SRC_IN));
// Icon bitmap read
final Bitmap icon = BitmapFactory.decodeResource(resources, R.drawable.led_icon_android);
final Rect srcRect = new Rect(0, 0, icon.getWidth(), icon.getHeight());
final Rect dstRect = new Rect(0, 0, canvas.getWidth(), canvas.getHeight());
// Draw icon and recycle source bitmap
canvas.drawBitmap(icon, srcRect, dstRect, paint);
icon.recycle();
return result;
}

}

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions SenseHatDriverLibrary/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 26
compileSdkVersion 28

defaultConfig {
minSdkVersion 26
targetSdkVersion 26
minSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

}

Expand All @@ -25,10 +25,10 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'

compileOnly 'com.google.android.things:androidthings:+'
compileOnly 'com.google.android.things:androidthings:1.0'
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package com.eon.androidthings.sensehatdriverlibrary.devices;

import android.support.annotation.IntDef;
import android.support.annotation.VisibleForTesting;

import com.eon.androidthings.sensehatdriverlibrary.utils.I2CDeviceRegistry;
import com.google.android.things.pio.I2cDevice;

import java.io.IOException;

import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;

/**
* I2C Address 0x5f: HTS221 Humidity/Temperature
*/
Expand Down
Loading