Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 129 → Rev 123

/DUBwise/src/Android/bin/DUBwise-unsigned.apk
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/DUBwise/src/Android/bin/DUBwise-debug.apk
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/DUBwise/src/Android/AndroidManifest.xml
1,8 → 1,7
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.ligi">
<application android:label="@string/app_name">
<activity android:icon="@drawable/icon" android:name=".DUBwise" android:label="@string/app_name">
<application>
<activity android:icon="@drawable/icon" android:name=".DUBwise" android:label="DUBwise">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
/DUBwise/src/Android/build.xml
1,45 → 1,22
<?xml version="1.0" ?>
<project name="DUBwise" default="debug">
<!-- SDK Locations -->
<property name="sdk-folder" value="/home/ligi/bin/android-sdk-linux_x86-0.9_beta" />
<property name="android-tools" value="/home/ligi/bin/android-sdk-linux_x86-0.9_beta/tools" />
<!-- Application Package Name -->
<property name="application-package" value="org.ligi" />
<project name="DUBwise" default="package">
<property name="sdk-folder" value="/home/ligi/bin/android" />
<property name="android-tools" value="/home/ligi/bin/android/tools" />
<property name="android-framework" value="${android-tools}/lib/framework.aidl" />
 
<!-- The intermediates directory -->
<!-- Eclipse uses "bin" for its own output, so we do the same. -->
<property name="outdir" value="bin" />
<!-- ************************************************************************************* -->
 
<!-- No user servicable parts below. -->
 
<property name="android-framework" value="${android-tools}/lib/framework.aidl" />
 
<!-- Input directories -->
<property name="resource-dir" value="res" />
<property name="asset-dir" value="assets" />
<property name="srcdir" value="src" />
<condition property="srcdir-ospath"
value="${basedir}\${srcdir}"
else="${basedir}/${srcdir}" >
<os family="windows"/>
</condition>
 
<property name="external-libs" value="libs" />
<condition property="external-libs-ospath"
value="${basedir}\${external-libs}"
else="${basedir}/${external-libs}" >
<os family="windows"/>
</condition>
 
<!-- Output directories -->
<property name="outdir-classes" value="${outdir}/classes" />
<condition property="outdir-classes-ospath"
value="${basedir}\${outdir-classes}"
else="${basedir}/${outdir-classes}" >
<os family="windows"/>
</condition>
 
<!-- Create R.java in the source directory -->
<property name="outdir-r" value="src" />
47,58 → 24,22
<!-- Intermediate files -->
<property name="dex-file" value="classes.dex" />
<property name="intermediate-dex" value="${outdir}/${dex-file}" />
<condition property="intermediate-dex-ospath"
value="${basedir}\${intermediate-dex}"
else="${basedir}/${intermediate-dex}" >
<os family="windows"/>
</condition>
 
<!-- The final package file to generate -->
<property name="resources-package" value="${outdir}/${ant.project.name}.ap_" />
<condition property="resources-package-ospath"
value="${basedir}\${resources-package}"
else="${basedir}/${resources-package}" >
<os family="windows"/>
</condition>
<property name="out-package" value="${outdir}/${ant.project.name}.apk" />
 
<property name="out-debug-package" value="${outdir}/${ant.project.name}-debug.apk" />
<condition property="out-debug-package-ospath"
value="${basedir}\${out-debug-package}"
else="${basedir}/${out-debug-package}" >
<os family="windows"/>
</condition>
 
<property name="out-unsigned-package" value="${outdir}/${ant.project.name}-unsigned.apk" />
<condition property="out-unsigned-package-ospath"
value="${basedir}\${out-unsigned-package}"
else="${basedir}/${out-unsigned-package}" >
<os family="windows"/>
</condition>
 
<!-- Tools -->
<condition property="aapt" value="${android-tools}/aapt.exe" else="${android-tools}/aapt" >
<os family="windows"/>
</condition>
<condition property="aidl" value="${android-tools}/aidl.exe" else="${android-tools}/aidl" >
<os family="windows"/>
</condition>
<condition property="adb" value="${android-tools}/adb.exe" else="${android-tools}/adb" >
<os family="windows"/>
</condition>
<condition property="dx" value="${android-tools}/dx.bat" else="${android-tools}/dx" >
<os family="windows"/>
</condition>
<condition property="apk-builder" value="${android-tools}/apkbuilder.bat" else="${android-tools}/apkbuilder" >
<os family="windows"/>
</condition>
 
<property name="aapt" value="${android-tools}/aapt" />
<property name="aidl" value="${android-tools}/aidl" />
<property name="dx" value="${android-tools}/dx" />
<property name="adb" value="${android-tools}/adb" />
<property name="android-jar" value="${sdk-folder}/android.jar" />
<property name="zip" value="zip" />
 
<!-- Rules -->
 
<!-- Create the output directories if they don't exist yet. -->
<target name="dirs">
<echo>Creating output directories if needed...</echo>
<mkdir dir="${outdir}" />
<mkdir dir="${outdir-classes}" />
</target>
105,9 → 46,9
 
<!-- Generate the R.java file for this project's resources. -->
<target name="resource-src" depends="dirs">
<echo>Generating R.java / Manifest.java from the resources...</echo>
<echo>Generating R.java...</echo>
<exec executable="${aapt}" failonerror="true">
<arg value="package" />
<arg value="compile" />
<arg value="-m" />
<arg value="-J" />
<arg value="${outdir-r}" />
122,7 → 63,6
 
<!-- Generate java classes from .aidl files. -->
<target name="aidl" depends="dirs">
<echo>Compiling aidl files into Java classes...</echo>
<apply executable="${aidl}" failonerror="true">
<arg value="-p${android-framework}" />
<arg value="-I${srcdir}" />
137,22 → 77,19
<javac encoding="ascii" target="1.5" debug="true" extdirs=""
srcdir="."
destdir="${outdir-classes}"
bootclasspath="${android-jar}">
<classpath>
<fileset dir="${external-libs}" includes="*.jar"/>
</classpath>
</javac>
bootclasspath="${android-jar}" />
</target>
 
<!-- Convert this project's .class files into .dex files. -->
<target name="dex" depends="compile">
<echo>Converting compiled files and external libraries into ${outdir}/${dex-file}...</echo>
<apply executable="${dx}" failonerror="true" parallel="true">
<exec executable="${dx}" failonerror="true">
<arg value="-JXmx384M" />
<arg value="--dex" />
<arg value="--output=${intermediate-dex-ospath}" />
<arg path="${outdir-classes-ospath}" />
<fileset dir="${external-libs}" includes="*.jar"/>
</apply>
<arg value="--output=${basedir}/${intermediate-dex}" />
<arg value="--locals=full" />
<arg value="--positions=lines" />
<arg path="${basedir}/${outdir-classes}" />
</exec>
</target>
 
<!-- Put the project's resources into the output package file. -->
161,6 → 98,7
<exec executable="${aapt}" failonerror="true">
<arg value="package" />
<arg value="-f" />
<arg value="-c" />
<arg value="-M" />
<arg value="AndroidManifest.xml" />
<arg value="-S" />
169,8 → 107,7
<arg value="${asset-dir}" />
<arg value="-I" />
<arg value="${android-jar}" />
<arg value="-F" />
<arg value="${resources-package}" />
<arg value="${out-package}" />
</exec>
</target>
 
180,6 → 117,7
<exec executable="${aapt}" failonerror="true">
<arg value="package" />
<arg value="-f" />
<arg value="-c" />
<arg value="-M" />
<arg value="AndroidManifest.xml" />
<arg value="-S" />
187,8 → 125,7
<!-- No assets directory -->
<arg value="-I" />
<arg value="${android-jar}" />
<arg value="-F" />
<arg value="${resources-package}" />
<arg value="${out-package}" />
</exec>
</target>
 
203,67 → 140,38
<antcall target="package-res-${res-target}" />
</target>
 
<!-- Package the application and sign it with a debug key.
This is the default target when building. It is used for debug. -->
<target name="debug" depends="dex, package-res">
<echo>Packaging ${out-debug-package}, and signing it with a debug key...</echo>
<exec executable="${apk-builder}" failonerror="true">
<arg value="${out-debug-package-ospath}" />
<arg value="-z" />
<arg value="${resources-package-ospath}" />
<arg value="-f" />
<arg value="${intermediate-dex-ospath}" />
<arg value="-rf" />
<arg value="${srcdir-ospath}" />
<arg value="-rj" />
<arg value="${external-libs-ospath}" />
</exec>
<!-- Put the project's .class files into the output package file. -->
<target name="package-java" depends="compile, package-res">
<echo>Packaging java...</echo>
<jar destfile="${out-package}"
basedir="${outdir-classes}"
update="true" />
</target>
 
<!-- Package the application without signing it.
This allows for the application to be signed later with an official publishing key. -->
<target name="release" depends="dex, package-res">
<echo>Packaging ${out-unsigned-package} for release...</echo>
<exec executable="${apk-builder}" failonerror="true">
<arg value="${out-unsigned-package-ospath}" />
<arg value="-u" />
<arg value="-z" />
<arg value="${resources-package-ospath}" />
<arg value="-f" />
<arg value="${intermediate-dex-ospath}" />
<arg value="-rf" />
<arg value="${srcdir-ospath}" />
<arg value="-rj" />
<arg value="${external-libs-ospath}" />
<!-- Put the project's .dex files into the output package file.
Use the "zip" command, available on most un*x/Linux/MacOS systems,
to create the new package (Ant 1.7 has an internal 'zip' command,
however Ant 1.6.5 lacks it and is still widely installed.)
-->
<target name="package-dex" depends="dex, package-res">
<echo>Packaging dex...</echo>
<exec executable="${zip}" failonerror="true">
<arg value="-qj" />
<arg value="${out-package}" />
<arg value="${intermediate-dex}" />
</exec>
<echo>It will need to be signed with jarsigner before being published.</echo>
</target>
 
<!-- Install the package on the default emulator -->
<target name="install" depends="debug">
<echo>Installing ${out-debug-package} onto default emulator...</echo>
<exec executable="${adb}" failonerror="true">
<arg value="install" />
<arg value="${out-debug-package}" />
</exec>
</target>
<!-- Create the package file for this project from the sources. -->
<target name="package" depends="package-dex" />
 
<target name="reinstall" depends="debug">
<echo>Installing ${out-debug-package} onto default emulator...</echo>
<!-- Create the package and install package on the default emulator -->
<target name="install" depends="package">
<echo>Sending package to default emulator...</echo>
<exec executable="${adb}" failonerror="true">
<arg value="install" />
<arg value="-r" />
<arg value="${out-debug-package}" />
<arg value="${out-package}" />
</exec>
</target>
 
<!-- Uinstall the package from the default emulator -->
<target name="uninstall">
<echo>Uninstalling ${application-package} from the default emulator...</echo>
<exec executable="${adb}" failonerror="true">
<arg value="uninstall" />
<arg value="${application-package}" />
</exec>
</target>
 
</project>
/DUBwise/src/Android/src/org/ligi/DUBwiseMapView.java
File deleted
/DUBwise/src/Android/src/org/ligi/DUBwiseStatusVoice.java
File deleted
/DUBwise/src/Android/src/org/ligi/DUBwise.java
32,11 → 32,9
{
private SharedPreferences mPrefs;
public boolean fullscreen;
public boolean do_sound=true;
 
public MKCommunicator mk;
public DUBwiseStatusVoice voice;
 
 
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle icicle)
47,14 → 45,13
Log.d("DUBWise-V","starting");
mk=new MKCommunicator(this);
voice=new DUBwiseStatusVoice(this);
mk.connect_to("s","test");
Log.d("DUBWise-V","version " + mk.version.major);
if (fullscreen)
{
// this.requestWindowFeature(Window.FEATURE_NO_TITLE);
//this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_NO_STATUS_BAR,
//WindowManager.LayoutParams.FLAG_NO_STATUS_BAR);
this.requestWindowFeature(Window.FEATURE_NO_TITLE);
this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_NO_STATUS_BAR,
WindowManager.LayoutParams.FLAG_NO_STATUS_BAR);
}
setContentView(new DUBwiseView(this));
/DUBwise/src/Android/src/org/ligi/DUBwiseView.java
26,7 → 26,6
import android.view.*;
 
import android.graphics.Region.Op;
import android.graphics.Bitmap.*;
 
// not working atm - import org.bluez.*;
 
174,23 → 173,34
Matrix matrix = new Matrix();
float x_scale,y_scale;
if (y_scale_!=0f)
y_scale= (getHeight()*y_scale_ )/orig.getHeight();
y_scale= (getHeight()*y_scale_ )/orig.height();
else // take x_scale
y_scale=(getWidth()*x_scale_ )/orig.getWidth();
y_scale=(getWidth()*x_scale_ )/orig.width();
 
if (x_scale_!=0f)
x_scale= (getWidth()*x_scale_ )/orig.getWidth();
x_scale= (getWidth()*x_scale_ )/orig.width();
else
x_scale= (getHeight()*y_scale_ )/orig.getHeight();
x_scale= (getHeight()*y_scale_ )/orig.height();
 
matrix.postScale(x_scale , y_scale);
return Bitmap.createBitmap(orig, 0, 0,(int)( orig.getWidth()),(int)( orig.getHeight()), matrix,true);//BitmapContfig.ARGB_8888 );
return Bitmap.createBitmap(orig, 0, 0,(int)( orig.width()),(int)( orig.height()), matrix, true);
}
 
 
public boolean onKeyDown(int keyCode, KeyEvent event)
{
/* try
{
MediaPlayer mp = MediaPlayer.create(root, R.raw.voice_sample_1);
mp.prepare();
mp.start();
}
catch ( Exception e)
{
}
*/
 
if ( keyCode==KeyEvent.KEYCODE_BACK)
{
268,8 → 278,7
break;
 
case MAINMENU_TELEMETRY:
chg_state(STATEID_FLIGHTVIEW);
// root.setContentView(new DUBwiseMapView(root));
chg_state(STATEID_FLIGHTVIEW);
break;
case MAINMENU_RAWDEBUG:
301,7 → 310,7
@Override public boolean onTouchEvent(MotionEvent event) {
 
 
if ((event.getAction() ==MotionEvent.ACTION_UP)&&(event.getY()<bt_on_img.getHeight()))
if ((event.getAction() ==MotionEvent.ACTION_UP)&&(event.getY()<bt_on_img.height()))
{
if ( state==STATEID_MAINMENU)
root.finish();
333,7 → 342,7
{
if (event.getY()>lcd_top)
{
act_menu_select=(int)((event.getY()-lcd_top)/lcd_tiles_img.getHeight());
act_menu_select=(int)((event.getY()-lcd_top)/lcd_tiles_img.height());
calc_lcd();
}
}
343,7 → 352,7
{
if (event.getY()>lcd_top)
{
act_menu_select=(int)((event.getY()-lcd_top)/lcd_tiles_img.getHeight());
act_menu_select=(int)((event.getY()-lcd_top)/lcd_tiles_img.height());
menu_reaction();
}
}
399,14 → 408,14
public void calc_lcd()
{
 
lcd_top=getHeight()-lcd_lines.length*lcd_tiles_img.getHeight();
lcd_top=getHeight()-lcd_lines.length*lcd_tiles_img.height();
Paint paint = mPaint;
lcd_img= Bitmap.createBitmap(getWidth(),lcd_lines.length*lcd_tiles_img.getHeight()+100,Bitmap.Config.ARGB_8888);
lcd_img= Bitmap.createBitmap(getWidth(),lcd_lines.length*lcd_tiles_img.height()+100,false);
Canvas lcd_canvas=new Canvas();
 
lcd_canvas.setBitmap(lcd_img);
lcd_canvas.setDevice(lcd_img);
lcd_canvas.drawColor(Color.WHITE);
int char_width=(int)(lcd_tiles_img.getWidth()/LCD_CHAR_COUNT);
int char_width=(int)(lcd_tiles_img.width()/LCD_CHAR_COUNT);
for ( int lcd_line=0 ; lcd_line < lcd_lines.length ; lcd_line++)
for (int char_pos=0;char_pos<20;char_pos++)
{
418,9 → 427,9
if ((menu_active)&&(act_menu_select==lcd_line)&& (char_pos==0))
act_char=30;
lcd_canvas.clipRect(new RectF(char_pos*char_width,lcd_tiles_img.getHeight()*lcd_line,(char_pos+1)*char_width,lcd_tiles_img.getHeight()*(lcd_line+1)),Op.REPLACE );
lcd_canvas.clipRect(new RectF(char_pos*char_width,lcd_tiles_img.height()*lcd_line,(char_pos+1)*char_width,lcd_tiles_img.height()*(lcd_line+1)),Op.REPLACE );
lcd_canvas.drawBitmap(lcd_tiles_img,(char_pos-act_char)*(char_width),lcd_tiles_img.getHeight()*(lcd_line) , paint);
lcd_canvas.drawBitmap(lcd_tiles_img,(char_pos-act_char)*(char_width),lcd_tiles_img.height()*(lcd_line) , paint);
 
}
436,8 → 445,8
if (auto_next_state==-1)
switch(state)
{
case STATEID_FLIGHTVIEW:
root.mk.trigger_debug_data();
lcd_lines=root.mk.LCD.get_act_page();
calc_lcd();
if (state_intro_frame<200)
493,8 → 502,8
paint.setARGB(255,0,0,0);
canvas.drawBitmap(bg_img,pos,0 , paint);
 
if ((bg_img.getWidth()+pos)<(getWidth()))
canvas.drawBitmap(bg_img,pos+bg_img.getWidth(),0 , paint);
if ((bg_img.width()+pos)<(getWidth()))
canvas.drawBitmap(bg_img,pos+bg_img.width(),0 , paint);
 
 
switch ( state )
501,7 → 510,6
{
case STATEID_EDIT_PARAMS:
case STATEID_FLIGHTVIEW:
 
paint.setARGB(state_intro_frame ,0,0,0);
canvas.drawBitmap(lcd_img,0,lcd_top , paint);
break;
571,21 → 579,6
break;
 
case STATEID_KEYCONTROL:
canvas.rotate((root.mk.debug_data.analog[18]*(-90))/3000,getWidth()/2,getHeight()/2);
paint.setARGB(state_intro_frame,177,129,0);
// roll rect
canvas.drawRect(-getWidth(),getHeight()/2,2*getWidth(),3*getHeight()/2,paint);
 
int bar_height=20;
// nick rect
paint.setARGB(state_intro_frame,0,200,0);
canvas.drawRoundRect(new RectF(getWidth()/3,getHeight()/2 -bar_height/2 + root.mk.debug_data.analog[17]*getHeight()/(3*3000) ,2*getWidth()/3, getHeight()/2+ root.mk.debug_data.analog[17]*getHeight()/(3*3000)+bar_height),5,5,paint);
 
 
 
canvas.restore();
 
paint.setARGB(state_intro_frame,0,0,255);
// canvas.drawRoundRect(new RectF(getWidth()/2-getWidth()/8,getHeight()/2-getWidth()/8,getWidth()/2+getWidth()/8,getHeight()/2+getWidth()/8),5,5,paint);
 
643,11 → 636,11
paint.setARGB(255,255,255,255);
// icon indicating QC is connected
// !!FIXME!! -10 by screensize
canvas.drawBitmap(icon_img,getWidth()-icon_img.getWidth(),-10 , paint);
canvas.drawBitmap(icon_img,getWidth()-icon_img.width(),-10 , paint);
if (root.mk.ready())
canvas.drawBitmap(bt_on_img,getWidth()-icon_img.getWidth()-bt_on_img.getWidth()-5,5 , paint);
canvas.drawBitmap(bt_on_img,getWidth()-icon_img.width()-bt_on_img.width()-5,5 , paint);
else
canvas.drawBitmap(bt_off_img,getWidth()-icon_img.getWidth()-bt_on_img.getWidth()-5,5 , paint);
canvas.drawBitmap(bt_off_img,getWidth()-icon_img.width()-bt_on_img.width()-5,5 , paint);
 
 
paint.setARGB(255,0,0,0);
/DUBwise/src/Android/src/org/ligi/MKCommunicator.java
208,23 → 208,7
send_command(0,'a',params);
}
 
 
 
public void trigger_debug_data()
{
int[] params=new int[1];
params[0]=0;
 
while(sending)
{try { Thread.sleep(50); }
catch (Exception e) { }
}
 
send_command(0,'c',params);
}
 
 
public void trigger_LCD(int key)
/DUBwise/src/Android/src/org/ligi/R.java
21,19 → 21,19
public static final int main=0x7f030000;
}
public static final class raw {
public static final int voice_sample_01=0x7f040000;
public static final int voice_sample_02=0x7f040001;
public static final int voice_sample_03=0x7f040002;
public static final int voice_sample_04=0x7f040003;
public static final int voice_sample_05=0x7f040004;
public static final int voice_sample_06=0x7f040005;
public static final int voice_sample_07=0x7f040006;
public static final int voice_sample_08=0x7f040007;
public static final int voice_sample_09=0x7f040008;
public static final int voice_sample_10=0x7f040009;
public static final int voice_sample_11=0x7f04000a;
public static final int voice_sample_12=0x7f04000b;
public static final int voice_sample_13=0x7f04000c;
public static final int voice_sample_1=0x7f040000;
public static final int voice_sample_10=0x7f040001;
public static final int voice_sample_11=0x7f040002;
public static final int voice_sample_12=0x7f040003;
public static final int voice_sample_13=0x7f040004;
public static final int voice_sample_2=0x7f040005;
public static final int voice_sample_3=0x7f040006;
public static final int voice_sample_4=0x7f040007;
public static final int voice_sample_5=0x7f040008;
public static final int voice_sample_6=0x7f040009;
public static final int voice_sample_7=0x7f04000a;
public static final int voice_sample_8=0x7f04000b;
public static final int voice_sample_9=0x7f04000c;
public static final int voice_sample_komma=0x7f04000d;
public static final int voice_sample_volt=0x7f04000e;
}