WebSVN - Projects - Path Comparison - /DUBwise/ Rev 517 and /DUBwise/ Rev 516

Ignore whitespace Rev 517 → Rev 516

/DUBwise/trunk/j2me/WM_BUILD
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /DUBwise/trunk/j2me/build.props
 ,14 → 1,7
-bin_path=176x220/cldc11/new_en_speedy_tts/bluetooth_on/fileapi_on/devicecontrol_on/jsr179
 devicecontrol=on
 cldc11=on
 fileapi=on
-openlapi=off
-screensize=176x220
-jsr179=on
+screensize=240x320
 bluetooth=on
-version_patch=17
-version_minor=53
-version_major=0
-voice_mode=new_en_speedy_tts
-location=on
-basename=DUBwise-176x220-new_en_speedy_tts-no_firmwares-LocationAPI-CLDC11-FileAPI-BluetoothAPI-DeviceControl-J2MEMap
+voice_mode=en_speedy
+basename=DUBwise-240x320-cldc11-en_speedy-all_firmwares-bluetooth_on-fileapi_on-devicecontrol_on

 /DUBwise/trunk/j2me/build.rb
 ,0 → 1,207
+#!/usr/bin/env ruby
+# little ruby script to build DUBwise
+#
+# Author: Marcus -LiGi- Bueschleb
+#
+# see README for further Infos
+resdir="res/"
+if ARGV.include?("-l")
+  puts "regenerating language strings"
+  p `cd res ; ruby lang_gen.rb ; cd ..`
+  ARGV.delete("-l")
+end
+if ARGV.include?("-i")
+  puts "regenerating images"
+  p `cd res ; ruby image_gen.rb ; cd ..`
+  ARGV.delete("-i")
+end
+if ARGV.length==2
+  bindir=ARGV[1]
+  puts `rm -rf #{bindir}`
+else
+  bindir="bin"
+end
+ ARGV<<"" if ARGV==[]
+case ARGV[0]
+ when "loeti"
+  screensizes=["176x220"]
+  voice_modes=["en_speedy"]
+  bluetooth_modes=["on"]
+  devicecontrol_modes=["on"]
+  fileapi_modes=["off"]
+  cldc11_modes=["off"]
+firmware_modes=["no_firmwares"]
+ when "p910"
+  screensizes=["200x300"]
+  voice_modes=["en_speedy"]
+  bluetooth_modes=["off"]
+  devicecontrol_modes=["off"]
+  fileapi_modes=["off"]
+  cldc11_modes=["off"]
+ when "test"
+  screensizes=["240x320"]
+  voice_modes=["en_speedy"]
+  bluetooth_modes=["on"]
+  devicecontrol_modes=["on"]
+  fileapi_modes=["on"]
+  cldc11_modes=["on"]
+  #firmware_modes=["fc_mk3mag_firmwares"]
+  #firmware_modes=["all_firmwares"]
+  firmware_modes=["no_firmwares"]
+ when "wtk"
+  screensizes=["240x320"]
+  voice_modes=["en_wav"]
+  bluetooth_modes=["on"]
+  devicecontrol_modes=["on"]
+  fileapi_modes=["on"]
+  cldc11_modes=["on"]
+  #firmware_modes=["fc_mk3mag_firmwares"]
+  #firmware_modes=["all_firmwares"]
+  firmware_modes=["all_firmwares"]
+ when "bltest"
+  screensizes=["240x320"]
+  voice_modes=["en_speedy"]
+  bluetooth_modes=["on"]
+  devicecontrol_modes=["on"]
+  fileapi_modes=["on"]
+  cldc11_modes=["on"]
+  firmware_modes=["all_firmwares"]
+ when "test2"
+  screensizes=["176x220"]
+  voice_modes=["en_speedy"]
+  bluetooth_modes=["on"]
+  devicecontrol_modes=["on"]
+  fileapi_modes=["on"]
+  cldc11_modes=["on"]
+  firmware_modes=["all_firmwares"]
+ when "off"
+  screensizes=["240x320"]
+  voice_modes=["en_speedy"]
+  bluetooth_modes=["off"]
+  devicecontrol_modes=["off"]
+  fileapi_modes=["off"]
+  cldc11_modes=["off"]
+ when "alloff"
+  screensizes=["128x128","176x220","200x300","240x320","340x400","480x640"]
+  voice_modes=["no_voice","de_tts","de_64kbit_tts","en_speedy","en_wav","de_wav"]
+  bluetooth_modes=["off"]
+  devicecontrol_modes=["off"]
+  fileapi_modes=["off"]
+  cldc11_modes=["off"]
+ when "n80"
+  bluetooth_modes=["on"]
+  screensizes=["340x400"]
+  voice_modes=["en_speedy"]
+  fileapi_modes=["on"]
+  devicecontrol_modes=["on"]
+  cldc11_modes=["on"]
+  firmware_modes=["all_firmwares"]
+ when "common"
+  screensizes=["128x128","176x220","200x300","240x320","340x400","480x640"]
+  voice_modes=["no_voice","de_tts","de_64kbit_tts","en_speedy","en_wav","de_wav"]
+  bluetooth_modes=["on"]
+  fileapi_modes=["on"]
+  devicecontrol_modes=["on"]
+  cldc11_modes=["on"]
+  firmware_modes=["all_firmwares"]
+ else
+#  screensizes=["128x128","176x220","200x300","240x320","340x400","480x640"]
+#  voice_modes=["no_voice","de_tts","de_64kbit_tts","en_speedy","en_wav","de_wav"]
+#  bluetooth_modes=["on","off"]
+#  fileapi_modes=["on","off"]
+# devicecontrol_modes=["on","off"]
+#  cldc11_modes=["on","off"]
+#  firmware_modes=["no_firmwares","fc_mk3mag_firmware","all_firmwares"]
+  puts "no valid profile given"
+  exit
+end
+puts `mv build.props build.props.bak`
+puts `ant clean`
+puts `mkdir #{bindir}`
+propertys={}
+firmware_modes.each {|firmware|
+cldc11_modes.each { |cldc11|
+devicecontrol_modes.each { |devicecontrol|
+  fileapi_modes.each { |fileapi|
+      bluetooth_modes.each { |bluetooth|
+        screensizes.each { |screensize|
+          voice_modes.each { |voice_mode|
+            p "cleaning ressources"
+            p `rm -rf tmp/res`
+            p `mkdir tmp/res`
+            p `cp -v res/images_by_screensize/#{screensize}/* tmp/res/`
+            p `cp -v res/langpacks/* tmp/res/`
+              p `cp -v res/firmwares/#{firmware}/* tmp/res/`
+            propertys["screensize"]=screensize
+            p "voice_mode" + voice_mode
+            p "Screensize " + screensize
+            propertys["voice_mode"]=voice_mode
+            propertys["bluetooth"]=bluetooth
+            propertys["fileapi"]=fileapi
+            propertys["devicecontrol"]=devicecontrol
+            propertys["cldc11"]=cldc11
+              propertys["basename"]="DUBwise-#{screensize}-#{cldc11=="on"?"cldc11":"cldc10"}-#{voice_mode}-#{firmware}-bluetooth_#{bluetooth}-fileapi_#{fileapi}-devicecontrol_#{devicecontrol}"
+            p `cp -v res/voice_samples_by_name/#{voice_mode}/* tmp/res/`
+          prefs_file= File.new("build.props","w")
+          propertys.each_pair {|name,value|
+            p "writing props " + name+"="+value+"\n"
+            prefs_file <<       name+"="+value+"\n"
+          }
+          prefs_file.close
+          `ant build`.each_line {       |l| puts l }
+          `mkdir -p #{bindir}/#{screensize}/#{cldc11=="on"?"cldc11":"cldc10"}/#{voice_mode}/bluetooth_#{bluetooth}/fileapi_#{fileapi}/devicecontrol_#{devicecontrol}`
+#          `mv build/bin/#{propertys["basename"]}* #{bindir}/#{screensize}/#{cldc11=="on"?"cldc11":"cldc10"}/#{voice_mode}/bluetooth_#{bluetooth}/fileapi_#{fileapi}/devicecontrol_#{devicecontrol}`
+          `mkdir -p #{bindir}/#{screensize}/#{cldc11=="on"?"cldc11":"cldc10"}/#{voice_mode}/bluetooth_#{bluetooth}/fileapi_#{fileapi}/devicecontrol_#{devicecontrol}`
+          `mv build/bin/#{propertys["basename"]}* #{bindir}/#{screensize}/#{cldc11=="on"?"cldc11":"cldc10"}/#{voice_mode}/bluetooth_#{bluetooth}/fileapi_#{fileapi}/devicecontrol_#{devicecontrol}`
+        }
+      }
+    }
+  }
+}
+}
+}
+    puts `mv -v  build.props.bak build.props`
 Property changes:
 Added: svn:executable
 +*
 \ No newline at end of property

 /DUBwise/trunk/j2me/build.xml
 ,13 → 1,11
 <project name="DUBwise" basedir=".">
-        <property name="wtk.home" value="/home/ligi/bin/wtk_2.5.2"/>
+        <property name="wtk.home" value="/home/ligi/tools/WTK2.2/"/>
         <property name="project_name" value="DUBwise"/>                            <!-- jar filename -->
+        <property name="project_version" value="0.53"/>
         <property file="build.props"/>
-        <property name="project_version" value="${version_major}.${version_minor}"/>
         <property name="res_dir" location="tmp/res"/>
         <property name="build_dir" location="${basedir}/build/"/>
         <property name="lib_dir" location="${basedir}/lib/"/>
 ,28 → 14,22
         <property name="preprocessed_src_dir" location="${basedir}/tmp/pp_src/"/>
-        <taskdef  classpath="${lib_dir}/antlr.jar;${lib_dir}/preprocessor-bin.jar;${lib_dir}/antenna.jar"  resource="antenna.properties"/>
-        <taskdef classpath="" resource="antenna.properties"/>
+        <taskdef resource="antenna.properties"  classpath="${lib_dir}/antenna.jar"/>
         <property name="wtk.midp.version" value="2.0"/>
         <property name="wtk.cldc.version" value="1.0"/>
-        <property name="wtk.midpapi" value="${classes}"/>
-        <target name="preprocess_lib">
-                <wtkpreprocess version="3" device="Generic/Java" srcdir="${shrared_src_dir}" destdir="${preprocessed_src_dir}" symbols="cldc11=${cldc11},j2me=true" verbose="false" debuglevel="error" />
-        </target>
+        <property name="wtk.midpapi" value="${lib_dir}/classes_with_fileapi_and_jsr179.zip"/>
         <target name="build">
+                <wtkpreprocess version="2" srcdir="${src_dir}" destdir="${preprocessed_src_dir}" symbols="VERSION=${project_version},voice_mode=${voice_mode},bluetooth=${bluetooth},fileapi=${fileapi},devicecontrol=${devicecontrol},cldc11=${cldc11},j2me=true,jsr179=on" verbose="false"/>
-                <wtkpreprocess version="3" device="Generic/Java" srcdir="${src_dir}" destdir="${preprocessed_src_dir}" symbols="VERSION=${project_version},VERSION_MAJOR=${version_major},VERSION_MINOR=${version_minor},VERSION_PATCH=${version_patch},voice_mode=${voice_mode},bluetooth=${bluetooth},fileapi=${fileapi},devicecontrol=${devicecontrol},cldc11=${cldc11},j2me=true,jsr179=${jsr179},j2memap=${j2memap},openlapi=${openlapi},location=${location}" verbose="false" />
+                <wtkpreprocess version="2" srcdir="${shrared_src_dir}" destdir="${preprocessed_src_dir}" symbols="VERSION=${project_version},voice_mode=${voice_mode},bluetooth=${bluetooth},fileapi=${fileapi},devicecontrol=${devicecontrol},cldc11=${cldc11},j2me=true,jsr179=on" verbose="false"/>
-                <wtkbuild destdir="${build_dir}/classes" srcdir="${preprocessed_src_dir}" target="1.1" preverify="true" classpath="${libs}" >
-                </wtkbuild>
+                <wtkbuild destdir="${build_dir}/classes" srcdir="${preprocessed_src_dir}" target="1.1" preverify="true"/>
                 <wtkjad
                        jadfile="${build_dir}/bin/${basename}.jad"
                        jarfile="${build_dir}/bin/${basename}.jar"
 ,8 → 50,7
                             jadfile="${build_dir}/bin/${basename}.jad"
                             basedir="${build_dir}/classes"
                             manifest="${build_dir}/bin/MANIFEST.MF"
-                            libclasspath="${libs}"
-                            obfuscate="${obfuscate}"
+                            obfuscate="false"
                             preverify="true">
                         <fileset dir="${res_dir}/">
                                 <include name="*"/>
 ,45 → 57,11
                         </fileset>
                 </wtkpackage>
+                <!-- !!TODO!! just zip if flag set -->
+                <zip destfile="${build_dir}/deploy.zip" basedir="${build_dir}/bin/" includes="**/*"/>
         </target>
-        <target name="only_jar">
-                <!-- !!TODO!! Remove Icon JAD entry if no icon is there -->
-                <wtkjad
-                       jadfile="${build_dir}/bin/${basename}.jad"
-                       jarfile="${build_dir}/bin/${basename}.jar"
-                       update="false"
-                       manifest="${build_dir}/bin/MANIFEST.MF"
-                       name="${project_name}"
-                       vendor="LiGi"
-                       version="${project_version}">
-                  <attribute name="MIDletX-No-Command" value="true"/>
- <attribute name="MIDlet-Icon" value="i.png"/>
-                  <midlet name="${project_name}" class="${project_name}" icon="i.png" />
-                <!-- !!TODO!! Remove Icon JAD entry if no icon is there -->
-                </wtkjad>
-                <wtkpackage
-                            jarfile="${build_dir}/bin/${basename}.jar"
-                            jadfile="${build_dir}/bin/${basename}.jad"
-                            basedir="${build_dir}/classes"
-                            manifest="${build_dir}/bin/MANIFEST.MF"
-                            libclasspath="${libs}"
-                            obfuscate="true"
-                            preverify="true">
-                        <fileset dir="${res_dir}/">
-                                <include name="*"/>
-                        </fileset>
-                </wtkpackage>
-        </target>
         <target name="clean">
                 <delete dir="${build_dir}"/>

/DUBwise/trunk/j2me/lib/antlr-runtime-3.0.1.jar
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/trunk/j2me/lib/openlapi-0.9.11.jar
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/trunk/j2me/lib/preprocessor-bin.jar
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/DUBwise/trunk/j2me/lib/antenna.jar.latest_bak
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/trunk/j2me/lib/tmp/J2meMap_lib_cldc10.jar
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/trunk/j2me/lib/tmp/J2meMap_lib_cldc11.jar
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/trunk/j2me/lib/J2meMap_lib_cldc11.jar
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/trunk/j2me/lib/J2meMap_lib_cldc10.jar
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/trunk/j2me/lib/preprocessor-bin-1.2.jar
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/trunk/j2me/lib/antlr.jar
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/DUBwise/trunk/j2me/lib/antlr-2.7.7.jar
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/trunk/j2me/lib/antenna-bin-1.1.0-beta.jar
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/trunk/j2me/lib/openlapi-jsr179-0.9.11.jar
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/trunk/j2me/res/wm_zip_base/res/dubwise_icon.dll
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/trunk/j2me/res/image_gen.rb
3,5 → 3,5
p `convert -verbose -geometry 160x66! symbols.png images_by_screensize/200x300/symbols.png`
p `convert -verbose -geometry 160x66! symbols.png images_by_screensize/240x320/symbols.png`
p `convert -verbose -geometry 160x66! symbols.png images_by_screensize/340x400/symbols.png`
p `convert -verbose -geometry 320x132! symbols.png images_by_screensize/480x640/symbols.png`
p `convert -verbose -geometry 160x66! symbols.png images_by_screensize/480x640/symbols.png`

/DUBwise/trunk/j2me/res/images_by_screensize/128x128/symbols.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/DUBwise/trunk/j2me/res/images_by_screensize/176x220/symbols.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/DUBwise/trunk/j2me/res/images_by_screensize/200x300/symbols.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/DUBwise/trunk/j2me/res/images_by_screensize/240x320/symbols.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/DUBwise/trunk/j2me/res/images_by_screensize/340x400/symbols.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/DUBwise/trunk/j2me/res/images_by_screensize/480x640/symbols.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /DUBwise/trunk/j2me/res/lang_base
 ,145 → 1,137
 LANG0;English
 LANG1;Deutsch
-LANG2;French
-CONN;Connection;Verbindung;connexion
-SETTINGS;Tool Settings;Einstellungen;Reglages
-SELECT_FIRMWARE;Select Firmware;Firmware auswählen;Selection firmware
-DEBUG;Debug;Debug;Debogage
-MOTORTEST;Motor-Test;Motor-Test;Essai Moteur
-ABOUT;About;Über;A propos de
-EDIT_SETTINGS;Edit Settings;Parameter ändern;Edition Reglages
-COPY_TO_MOBILE;Copy all to Mobile;Kopie aufs Handy;Tt copier > mobile
-LOAD_FROM_MOBILE;Load from Mobile;laden vom Handy;Charger du mobile
-REINITIALIZE_ALL;Reinitialize all;Alle zurücksetzen;Remise a zero
-BACK;Back;Zurück;Retour
-QUIT;Quit;Beenden;Quitter
-REMOTE_CAM;Remote Cam;Kammeraauslösung;Deplacer APN
-FLASH_FIRMWARE;Flash Firmware;Firmware Flashen;Maj Firmware
-SWITCH_NAVI;switch to navi;wecheseln zur Navi;Basculer vers navi
-SWITCH_MK3MAG;switch to MK3MAG;wecheseln zum MK3MAG;Basculer vers MK3MAG
-SWITCH_FC;switch to FC;wechseln zur FC;Basculer vers FC
-VIEW_GPS;view GPS-Data;view GPS-Data;Voir donnees GPS
+CONN;Connection;Verbindung
+SETTINGS;Tool Settings;Einstellungen
+SELECT_FIRMWARE;Select Firmware;Firmware auswählen
+DEBUG;Debug
+MOTORTEST;Motor-Test
+ABOUT;About;Über
+EDIT_SETTINGS;Edit Settings;Parameter ändern
+COPY_TO_MOBILE;Copy all to Mobile;Kopie aufs Handy
+LOAD_FROM_MOBILE;Load from Mobile;laden vom Handy
+REINITIALIZE_ALL;Reinitialize all;Alle zurücksetzen
+BACK;Back;Zurück
+QUIT;Quit;Beenden
+REMOTE_CAM;Remote Cam;Kammeraauslösung
+FLASH_FIRMWARE;Flash Firmware;Firmware Flashen
+SWITCH_NAVI;switch to navi;wecheseln zur Navi
+SWITCH_MK3MAG;switch to MK3MAG;wecheseln zum MK3MAG
+SWITCH_FC;switch to FC;wechseln zur FC
+VIEW_GPS;view GPS-Data
 LCD;LCD
-GRAPH;Graph;Graph;Graphique
-DEBUG_VALUES;Debug Values;Debug Werte;Deboguer donnees
-KEYCONTROL;Key-Control;Tastensteuerung;Touches controles
-RCDATA;view RC-data;Werte der Funke;Voir donnees RC
-FLIGHTSETTINGS;Flight Settings;Flugeinstellungen;Reglages vol
-HORIZON;Artificial Horizon;Künstl. Horizont;Horizon artificiel
-VIEW_ERRORS;view Errors;Fehler anschaun;Voir les erreurs
-USERINTERFACE;User Interface;Nutzerinterface;Interface utilisateur
+GRAPH;Graph
+DEBUG_VALUES;Debug Values;Debug Werte
+KEYCONTROL;Key-Control;Tastensteuerung
+RCDATA;view RC-data;Werte der Funke
+FLIGHTSETTINGS;Flight Settings;Flugeinstellungen
+HORIZON;Artificial Horizon;Künstl. Horizont
+VIEW_ERRORS;view Errors;Fehler anschaun
+USERINTERFACE;User Interface;Nutzerinterface
 GPS;GPS
-SPECIALKEYS;Special Keys;Spezielle Tasten;Touches speciales
-VOICE;Voice;Sprachausgabe;Voix
-OTHER;Other;Anderes;Autres
-ALTITUDE;Altitude;Höhe;Altitude
-CAMERA;Camera;Kammera;Appareil Photo
-CHANNELS;Chanels;Kanäle;Canaux
-CONFIGURATION;Configuration;Konfiguration;Configuration
-GYRO;Gyro;Gyroskope;Gyroscope
+SPECIALKEYS;Special Keys;Spezielle Tasten
+VOICE;Voice;Sprachausgabe
+OTHER;Other;Anderes
+ALTITUDE;Altitude;Höhe
+CAMERA;Camera;Kammera
+CHANNELS;Chanels;Kanäle
+CONFIGURATION;Configuration;Konfiguration
+GYRO;Gyro;Gyroskope
 LOOP;Looping
 NAVI;Navi
-OUTPUT;Output;Ausgänge;Sortie
-STICK;Sticks;Sticks;Manches
-USERPARAMS;Userparams;Nutzerparameter;Param. Utilisateur
-EDIT_CONTENT;Edit Content;Einstellungen;Edition contenu
-RENAME;Rename;Umbenennen;Renommer
-SAVE_AS;Save As;Speichern unter;Enregistrer sous
-SAVE;Save;Speichern;Enregistrer
-REREAD;Read Again;Erneut lesen;Relire
-PACKET_TRAFFIC;Packet Traffic;Paketfluss;Traffic
-VIEW_DATA;view Data;Rohdaten ansehen;Voir les donnees
-CONNECT_BT;Connect via BT;verbinden via BT;Connexion BT
-CONNECT_TCP;Connect via TCP/IP;verbinden via IP;Connexion TCP/IP
-CONNECT_COM;Connect via COM;verbinden via COM;Connexion COM
-SET_PROXY;Set Proxy;Proxy einstellen;Reglage PROXY
-ON;On;An;Marche
-OFF;Off;Aus;Arret
-DARK;Dark;Dunkel;Sombre
-LIGHT;Light;Hell;Lumineux
+OUTPUT;Output;Ausgänge
+STICK;Sticks
+USERPARAMS;Userparams;Nutzerparameter
+EDIT_CONTENT;Edit Content;Einstellungen
+RENAME;Rename;Umbenennen
+SAVE_AS;Save As;Speichern unter
+SAVE;Save;Speichern
+REREAD;Read Again;Erneut lesen
+PACKET_TRAFFIC;Packet Traffic;Paketfluss
+VIEW_DATA;view Data;Rohdaten ansehen
+CONNECT_BT;Connect via BT;verbinden via BT
+CONNECT_TCP;Connect via TCP/IP;verbinden via IP
+CONNECT_COM;Connect via COM;verbinden via COM
+SET_PROXY;Set Proxy;Proxy einstellen
+ON;On;An
+OFF;Off;Aus
+DARK;Dark;Dunkel
+LIGHT;Light;Hell
 KMH;km/h
 MPH;mp/h
 CMS;cm/s
-DECIMAL;Decimal;Dezimal;Decimal
-MINSEC;min sec;minuten sekunden;Min sec
-NONE_ASSIGNED;none assigned;keiner zugewiesen;Non assigne
-LANGUAGE;Language;Sprache;Langue
-SKIN;Skin;Skin;Apparence
-FULLSCREEN;Fullscreen;Vollbild;Plein ecran
-SCROLLBG;Scroll Background;Bewegter Hintergr;Defil arriere plan
-PERMALIGHT;Permanent Light;Dauerhaft Hell;Eclairage permanent
+DECIMAL;Decimal;Dezimal
+MINSEC;min sec;minuten sekunden
+NONE_ASSIGNED;none assigned;keiner zugewiesen
+LANGUAGE;Language;Sprache
+SKIN;Skin
+FULLSCREEN;Fullscreen;Vollbild
+SCROLLBG;Scroll Background;Bewegter Hintergr.
+PERMALIGHT;Permanent Light;Dauerhaft Hell
 GPSFORMAT;GPS-Format
-SPEEDFORMAT;Speed Format;Geschwindigkeiten;Vitesse
-NICK;Nick;Nick;Tangage
-ROLL;Roll;Roll;Roulis
-GIER;Gier;Gier;Lacet
-GASINCREASE;Gas increase;Schuberhöhung;Augmenter les gaz
-HEIGHTINCREASE;Height Increase;Höhenerhöhung;Augm. la hauteur
-BACKTOMAINMENU;Back to Mainmenu;Zum Hauptmenü;Revenir menu pri.
-CLEAR;Clear;Löschen;Effacer
-LEGEND;Legend;Legende;Legende
-SCALEGRID;Scale;Skala;Echelle
-VOLTS;Volts;Spannung;Volts
-DELAYINS;Delay in Seconds;Zeitabstand;Delai en secondes
-VOLUME;Volume;Lautstärke;Volume
-SOUND;Sound;Audio;Son
+SPEEDFORMAT;Speed Format;Geschwindigkeiten
+NICK;Nick
+ROLL;Roll
+GIER;Gier
+GASINCREASE;Gas increase;Schuberhöhung
+HEIGHTINCREASE;Height Increase;Höhenerhöhung
+BACKTOMAINMENU;Back to Mainmenu;Zum Hauptmenü
+CLEAR;Clear;Löschen
+LEGEND;Legend;Legende
+SCALEGRID;Scale;Skala
+VOLTS;Volts;Spannung
+DELAYINS;Delay in Seconds;Zeitabstand
+VOLUME;Volume;Lautstärke
+SOUND;Sound;Audio
 VIBRA;Vibration
-REMOTECAMSTICK;Remote Cam Stick;Kammera Stick;Deplac. Manche APN
-ALWAYSRELOADPARAMS;100% Param Reload;Param. immer laden;Remise Param. 100%
-EXPERTMODE;Expert-Mode;Expertenmodus;Mode expert
-MINACCELERATE;Min. Accelerate;Minimale Beschleunigung;Acceleration mini
-BAROD;Barometric D;Barometrisches D;D barometrique
-SETPOINT;Setpoint;Setpoint;Point réglage
-ALTITUDEP;Altitude P;Höhe P;Altitude
-GAIN;Gain;Verstärkung;Gain
+REMOTECAMSTICK;Remote Cam Stick;Kammera Stick
+ALWAYSRELOADPARAMS;100% Param Reload;Param. immer laden
+EXPERTMODE;Expert-Mode;Expertenmodus
+MINACCELERATE;Min. Accelerate;Minimale Beschleunigung
+BAROD;Barometric D;Barometrisches D
+SETPOINT;Setpoint
+ALTITUDEP;Altitude P;Höhe P
+GAIN;Gain;Verstärkung
 ZACC;Z-Acc
-SWITCH3;3-Way Switch;3 Wege Schalter;Interrupt. 3 voies
-SERVOCONTROL;Servo Control;Servo Kontrolle;Servo
-SERVONICKCONTROL;Servo Control Nick
-SERVOROLLCONTROL;Servo Control Roll
-NICKCOMP;Nick compensation;Nick-Kompensierung;Compensation tang.
-ROLLCOMP;Roll compensation
-SERVONICKMIN;Servo Nick min
-SERVONICKMAX;Servo Nick max
-SERVOROLLMIN;Servo Roll min
-SERVOROLLMAX;Servo Roll max
-REFRESHRATE;Refresh Rate;Aktualisierungsrate;Rafraichir le taux
-INVERTDIRECTION;Inverse Direction;Inverse Direction;Inverser direction
-INVERTDIRECTIONROLL;Inverse Roll
-INVERTDIRECTIONNICK;Inverse Nick
-ACCELERATE;Accelerate;Gas;Accelerer
-POTI1;Poti1;Poti1;Potentiometre 1
-POTI2;Poti2;Poti2;Potentiometre 2
-POTI3;Poti3;Poti3;Potentiometre 3
-POTI4;Poti4;Poti4;Potentiometre 4
-ALTITUDECONTROL;Altitude Control;Höhen Kontrolle;Controle altitude
-SWITCHFORSETPOINT;Switch for Setpoint;Höhenschalter;Interr. Setpoint
-HEADINGHOLD;Heading Hold;Heading Hold;Tenue de cap
-COMPASACTIVE;Compas Avtive;Kompass aktiv;Boussole Active
-COMPASFIX;Compas Fix;Compas Fix;Fix Boussole
-COUPLING;Coupling;Achskopplung;Accrochage
-COUPLING2;Coupling2;Achskopplung2;Accrochage 2
-COUPLINGYAWCORRECT;Coupling Yaw Correct;Coupling Yaw Correct;Corr. Accr. Lacet
-YAWRATELIMITER;Yaw Rate Limiter;Drehratenbegrenzer;Limite Taux lacet
-YAWPOSFEEDBACK;Yaw pos. feedback;Yaw pos. feedback;Inform. Lacet +
-YAWNEGFEEDBACK;Yaw neg. feedback;Yaw neg. feedback;Inform. Lacet -
-ACCGYROFACTOR;ACC/Gyro Factor;ACC/Gyro Faktor;Facteur Acc. Gyro
+SWITCH3;3-Way Switch;3 Wege Schalter
+SERVOCONTROL;Servo Control;Servo Kontrolle
+NICKCOMP;Nick compensation;Nick-Kompensierung
+SERVOMIN;Servo min
+SERVOMAX;Servo max
+REFRESHRATE;Refresh Rate;Aktualisierungsrate
+INVERTDIRECTION;Inverse Direction
+ACCELERATE;Accelerate;Gas
+POTI1;Poti1
+POTI2;Poti2
+POTI3;Poti3
+POTI4;Poti4
+ALTITUDECONTROL;Altitude Control;Höhen Kontrolle
+SWITCHFORSETPOINT;Switch for Setpoint;Höhenschalter
+HEADINGHOLD;Heading Hold
+COMPASACTIVE;Compas Avtive;Kompass aktiv
+COMPASFIX;Compas Fix
+COUPLING;Coupling;Achskopplung
+COUPLING2;Coupling2;Achskopplung2
+COUPLINGYAWCORRECT;Coupling Yaw Correct
+YAWRATELIMITER;Yaw Rate Limiter;Drehratenbegrenzer
+YAWPOSFEEDBACK;Yaw pos. feedback
+YAWNEGFEEDBACK;Yaw neg. feedback
+ACCGYROFACTOR;ACC/Gyro Factor;ACC/Gyro Faktor
 PRATE;P-Rate
 IRATE;I-Rate
 ACCGYROCOMP;ACC/Gyro Comp.
-DRIFTCOMP;Drift-Compensation;Drift-Kompensation;Compens. derive
-DYNAMICSTABILITY;Dynamic Stability;Stabilite dynam.
-GASLIMIT;Gas-Limit;Gas-Limit;Gaz Max.
-THRESHOLD;Threshold;Schwellwert;Seuil
+DRIFTCOMP;Drift-Compensation;Drift-Kompensation
+DYNAMICSTABILITY;Dynamic Stability
+GASLIMIT;Gas-Limit
+THRESHOLD;Threshold;Schwellwert
 HYSTERESE;Hysterese
-TURNOVERNICK;TurnOver Nick;TurnOver Nick;Rafraich. tangage
-TURNOVERROLL;TurnOver Roll;TurnOver Roll;Rafraich. Roulis
-UP;Up;Hoch;Haut
-DOWN;Down;Runter;Bas
-LEFT;Links;Links;Liens
-RIGHT;Rechts;Rechts;Droite
-MODECONTROL;Mode Control;Modus Kontrolle;Controle Mode
-GPSGAIN;GPS-Gain;GPS-Verstärkung;Gain GPS
+TURNOVERNICK;TurnOver Nick
+TURNOVERROLL;TurnOver Roll
+UP;Up;Hoch
+DOWN;Down;Runter
+LEFT;Links;Links
+RIGHT;Rechts;Rechts
+MODECONTROL;Mode Control;Modus Kontrolle
+GPSGAIN;GPS-Gain;GPS-Verstärkung
 GPSP;GPS-P
 GPSPLIMIT;GPS-P Limit
 GPSI;GPS-I
 ,26 → 140,26
 GPSDLIMIT;GPS-D Limit
 GPSACC;GPS-ACC
 DRATE;D-Rate
-SATMIN;Satelite minimum;minimale Sateliten;Satellites mini
-STICKTHRESHOLD;Stick Threshold;Stick-Schwellwert;Seuil Manche
-WINDCORRECT;Wind Correction;Wind Korrektur;Correction vent
-SPEEDCOMP;Speed Compensation;Geschwindikeitskompensation;Compensat. vitesse
-OPERATIONRADIUS;Operation-Radius;Operationsradius;Rayon operationnel
-ANGLELIMIT;Angle-Limit;Winkellimitation;Limite inclinaison
-MINGAS;Min-Gas;Gas minimal:Gaz mini
-MAXGAS;Max-Gas;Gas maximal;Gaz maxi
-COMPASEFFECT;Compas effect;Kompass Effekt;Effet boussole
-VOLTAGEWARNING;Voltage Warning;Spannungswarnung;Alerte tension
-DISTRESSGAS;Distress Gas;Notgas;Panne de Gaz
-DISTRESSGASTIME;Distress Gas Time;Notgas Zeit;Temps alerte gaz
-J16BITMASK;J16 Bitmask
-J17BITMASK;J17 Bitmask
-J16TIMING;J16 Timing;J16 Timing;Chronom. J16
-J17TIMING;J17 Timing;J17 Timing;Chronom. J17
-NICKROLLP;Nick/Roll P;Nick/Roll P;Tangage/Roulis P
-NICKROLLD;Nick/Roll D;Nick/Roll D;Tangage/Roulis D
-GIERP;Gier P;Gier P;Lacet P
-EXTERNCONTROL;Extern Control;Extern Control;Controle externe
+SATMIN;Satelite minimum;minimale Sateliten
+STICKTHRESHOLD;Stick Threshold;Stick-Schwellwert
+WINDCORRECT;Wind Correction;Wind Korrektur
+SPEEDCOMP;Speed Compensation;Geschwindikeitskompensation
+OPERATIONRADIUS;Operation-Radius;Operationsradius
+ANGLELIMIT;Angle-Limit;Winkellimitation
+MINGAS;Min-Gas;Gas minimal
+MAXGAS;Max-Gas;Gas maximal
+COMPASEFFECT;Compas effect;Kompass Effekt
+VOLTAGEWARNING;Voltage Warning;Spannungswarnung
+DISTRESSGAS;Distress Gas;Notgas
+DISTRESSGASTIME;Distress Gas Time;Notgas Zeit
+J16BITMASK;J16 Bitmask;Bitmaske J16
+J17BITMASK;J17 Bitmask;Bitmaske J17
+J16TIMING;J16 Timing
+J17TIMING;J17 Timing
+NICKROLLP;Nick/Roll P
+NICKROLLD;Nick/Roll D
+GIERP;Gier P
+EXTERNCONTROL;Extern Control
 PARAM1;Param 1
 PARAM2;Param 2
 PARAM3;Param 3
 ,34 → 168,33
 PARAM6;Param 6
 PARAM7;Param 7
 PARAM8;Param 8
-NOTREADYET;Not read yet;Noch nicht gelesen;Pas encore lu
-PHLOGINTIME;PH Login Time;PH einloggzeit;Temps connexion PH
-PARAMSINCOMPATIBLE;Params Incompatible;Parameter inkompatibel;Param. incompat.
-NOPARAMSONMOBILE;No Params on Mobile;No Params on Mobile;Pas param. teleph
-PARAMWRITEOK;Parameter Write OK;Parameter geschrieben;Ecrit. Param. OK
-SAVEDSETTINGS;Saved Settings;Parameter geschrieben;Sauveg. Reglages
-SETTINGSUNDOOK;Settings Undo OK;;Settings Undo OK;Annul. Reglages ok
-INCOMPATIBLEDEVICE;incompatible Device;incompatible Device;Periph. incompat.
-PARAMRESETOK;Param Reset Success!;Param Reset Success!;RAZ Param. OK
-WRITINGPARAMS;writing params;writing params;Ecriture param.
-GRAPHINTERVAL;Interval;Interval;Intervale
-ALTIMETER;Altimeter;Altimeter;Altimetre
+NOTREADYET;Not read yet;Noch nicht gelesen
+PHLOGINTIME;PH Login Time;PH einloggzeit
+PARAMSINCOMPATIBLE;Params Incompatible;Parameter inkompatibel
+NOPARAMSONMOBILE;No Params on Mobile
+PARAMWRITEOK;Parameter Write OK;Parameter geschrieben
+SAVEDSETTINGS;Saved Settings;Parameter geschrieben
+SETTINGSUNDOOK;Settings Undo OK
+INCOMPATIBLEDEVICE;incompatible Device
+PARAMRESETOK;Param Reset Success!
+WRITINGPARAMS;writing params
+GRAPHINTERVAL;Interval
+ALTIMETER;Altimeter
 COCKPIT;Cockpit
-INVERTNICK;Invert Nick;Nick Invertieren;Inverser Tangage
-INVERTROLL;Invert Roll;Roll Invertieren;Inverser Roulis
-SHOWFLIGHTTIME;Show Flight Time;Show Flight Time;Temps de vol
-SHOWALTITUDE;Show Altitude;Show Altitude;Afficher altitude
-UNITS;Units;Einheiten;Unites
-DEVMODE;Developer Mode;Entwicklermodus;Mode developpeur
-DISCONNECT;Disconnect;Verbindungsabriss;Deconnecter
-INSTANTERRORSHOW;Instant Error-Msg;Instant Error-Msg;Msg erreur inst.
-FORCERECONNECT;Reconnect;Reconnect;Reconnecter
-EDIT;Edit;Ändern;Editer
-ALTSTEPS;Altimeter Stepping;Altimeter Stepping;Etapes d'altimetre
-LOADPLAIN;Load Plain;Load Plain;Charger classique
-LOADFANCY;Load Fancy;Load Fancy;Charger fantaisie
-TIMING;Timing;Timing;Chronometre
-PRIMARYABO;Primary Data Abo;Primary Data Abo;Vitess. donnees 1
-SECONDARYABO;Secondary Data Abo;Secondary Data Abo;Vitess. donnees 2
-DEFAULTABO;Default Data Abo;Default Data Abo;Vit. donnees def.
-BIGFONTS;Big Fonts;Grosse Fonts;Big Fonts
+INVERTNICK;Invert Nick;Nick Invertieren
+INVERTROLL;Invert Roll;Roll Invertieren
+SHOWFLIGHTTIME;Show Flight Time
+SHOWALTITUDE;Show Altitude
+UNITS;Units;Einheiten
+DEVMODE;Developer Mode;Entwicklermodus
+DISCONNECT;Disconnect;Verbindungsabriss
+INSTANTERRORSHOW;Instant Error-Msg
+FORCERECONNECT;Reconnect
+EDIT;Edit;Ändern
+ALTSTEPS;Altimeter Stepping
+LOADPLAIN;Load Plain
+LOADFANCY;Load Fancy
+TIMING;Timing
+PRIMARYABO;Primary Data Abo
+SECONDARYABO;Secondary Data Abo
+DEFAULTABO;Default Data Abo

 /DUBwise/trunk/j2me/res/langpacks/l
 ,145 → 1,137
 English
 Deutsch
-French
-Connection;Verbindung;connexion
-Tool Settings;Einstellungen;Reglages
-Select Firmware;Firmware auswählen;Selection firmware
-Debug;Debug;Debogage
-Motor-Test;Motor-Test;Essai Moteur
-About;Über;A propos de
-Edit Settings;Parameter ändern;Edition Reglages
-Copy all to Mobile;Kopie aufs Handy;Tt copier > mobile
-Load from Mobile;laden vom Handy;Charger du mobile
-Reinitialize all;Alle zurücksetzen;Remise a zero
-Back;Zurück;Retour
-Quit;Beenden;Quitter
-Remote Cam;Kammeraauslösung;Deplacer APN
-Flash Firmware;Firmware Flashen;Maj Firmware
-switch to navi;wecheseln zur Navi;Basculer vers navi
-switch to MK3MAG;wecheseln zum MK3MAG;Basculer vers MK3MAG
-switch to FC;wechseln zur FC;Basculer vers FC
-view GPS-Data;view GPS-Data;Voir donnees GPS
+Connection;Verbindung
+Tool Settings;Einstellungen
+Select Firmware;Firmware auswählen
+Debug
+Motor-Test
+About;Über
+Edit Settings;Parameter ändern
+Copy all to Mobile;Kopie aufs Handy
+Load from Mobile;laden vom Handy
+Reinitialize all;Alle zurücksetzen
+Back;Zurück
+Quit;Beenden
+Remote Cam;Kammeraauslösung
+Flash Firmware;Firmware Flashen
+switch to navi;wecheseln zur Navi
+switch to MK3MAG;wecheseln zum MK3MAG
+switch to FC;wechseln zur FC
+view GPS-Data
 LCD
-Graph;Graph;Graphique
-Debug Values;Debug Werte;Deboguer donnees
-Key-Control;Tastensteuerung;Touches controles
-view RC-data;Werte der Funke;Voir donnees RC
-Flight Settings;Flugeinstellungen;Reglages vol
-Artificial Horizon;Künstl. Horizont;Horizon artificiel
-view Errors;Fehler anschaun;Voir les erreurs
-User Interface;Nutzerinterface;Interface utilisateur
+Graph
+Debug Values;Debug Werte
+Key-Control;Tastensteuerung
+view RC-data;Werte der Funke
+Flight Settings;Flugeinstellungen
+Artificial Horizon;Künstl. Horizont
+view Errors;Fehler anschaun
+User Interface;Nutzerinterface
 GPS
-Special Keys;Spezielle Tasten;Touches speciales
-Voice;Sprachausgabe;Voix
-Other;Anderes;Autres
-Altitude;Höhe;Altitude
-Camera;Kammera;Appareil Photo
-Chanels;Kanäle;Canaux
-Configuration;Konfiguration;Configuration
-Gyro;Gyroskope;Gyroscope
+Special Keys;Spezielle Tasten
+Voice;Sprachausgabe
+Other;Anderes
+Altitude;Höhe
+Camera;Kammera
+Chanels;Kanäle
+Configuration;Konfiguration
+Gyro;Gyroskope
 Looping
 Navi
-Output;Ausgänge;Sortie
-Sticks;Sticks;Manches
-Userparams;Nutzerparameter;Param. Utilisateur
-Edit Content;Einstellungen;Edition contenu
-Rename;Umbenennen;Renommer
-Save As;Speichern unter;Enregistrer sous
-Save;Speichern;Enregistrer
-Read Again;Erneut lesen;Relire
-Packet Traffic;Paketfluss;Traffic
-view Data;Rohdaten ansehen;Voir les donnees
-Connect via BT;verbinden via BT;Connexion BT
-Connect via TCP/IP;verbinden via IP;Connexion TCP/IP
-Connect via COM;verbinden via COM;Connexion COM
-Set Proxy;Proxy einstellen;Reglage PROXY
-On;An;Marche
-Off;Aus;Arret
-Dark;Dunkel;Sombre
-Light;Hell;Lumineux
+Output;Ausgänge
+Sticks
+Userparams;Nutzerparameter
+Edit Content;Einstellungen
+Rename;Umbenennen
+Save As;Speichern unter
+Save;Speichern
+Read Again;Erneut lesen
+Packet Traffic;Paketfluss
+view Data;Rohdaten ansehen
+Connect via BT;verbinden via BT
+Connect via TCP/IP;verbinden via IP
+Connect via COM;verbinden via COM
+Set Proxy;Proxy einstellen
+On;An
+Off;Aus
+Dark;Dunkel
+Light;Hell
 km/h
 mp/h
 cm/s
-Decimal;Dezimal;Decimal
-min sec;minuten sekunden;Min sec
-none assigned;keiner zugewiesen;Non assigne
-Language;Sprache;Langue
-Skin;Skin;Apparence
-Fullscreen;Vollbild;Plein ecran
-Scroll Background;Bewegter Hintergr;Defil arriere plan
-Permanent Light;Dauerhaft Hell;Eclairage permanent
+Decimal;Dezimal
+min sec;minuten sekunden
+none assigned;keiner zugewiesen
+Language;Sprache
+Skin
+Fullscreen;Vollbild
+Scroll Background;Bewegter Hintergr.
+Permanent Light;Dauerhaft Hell
 GPS-Format
-Speed Format;Geschwindigkeiten;Vitesse
-Nick;Nick;Tangage
-Roll;Roll;Roulis
-Gier;Gier;Lacet
-Gas increase;Schuberhöhung;Augmenter les gaz
-Height Increase;Höhenerhöhung;Augm. la hauteur
-Back to Mainmenu;Zum Hauptmenü;Revenir menu pri.
-Clear;Löschen;Effacer
-Legend;Legende;Legende
-Scale;Skala;Echelle
-Volts;Spannung;Volts
-Delay in Seconds;Zeitabstand;Delai en secondes
-Volume;Lautstärke;Volume
-Sound;Audio;Son
+Speed Format;Geschwindigkeiten
+Nick
+Roll
+Gier
+Gas increase;Schuberhöhung
+Height Increase;Höhenerhöhung
+Back to Mainmenu;Zum Hauptmenü
+Clear;Löschen
+Legend;Legende
+Scale;Skala
+Volts;Spannung
+Delay in Seconds;Zeitabstand
+Volume;Lautstärke
+Sound;Audio
 Vibration
-Remote Cam Stick;Kammera Stick;Deplac. Manche APN
-% Param Reload;Param. immer laden;Remise Param. 100%
-Expert-Mode;Expertenmodus;Mode expert
-Min. Accelerate;Minimale Beschleunigung;Acceleration mini
-Barometric D;Barometrisches D;D barometrique
-Setpoint;Setpoint;Point réglage
-Altitude P;Höhe P;Altitude
-Gain;Verstärkung;Gain
+Remote Cam Stick;Kammera Stick
+% Param Reload;Param. immer laden
+Expert-Mode;Expertenmodus
+Min. Accelerate;Minimale Beschleunigung
+Barometric D;Barometrisches D
+Setpoint
+Altitude P;Höhe P
+Gain;Verstärkung
 Z-Acc
--Way Switch;3 Wege Schalter;Interrupt. 3 voies
-Servo Control;Servo Kontrolle;Servo
-Servo Control Nick
-Servo Control Roll
-Nick compensation;Nick-Kompensierung;Compensation tang.
-Roll compensation
-Servo Nick min
-Servo Nick max
-Servo Roll min
-Servo Roll max
-Refresh Rate;Aktualisierungsrate;Rafraichir le taux
-Inverse Direction;Inverse Direction;Inverser direction
-Inverse Roll
-Inverse Nick
-Accelerate;Gas;Accelerer
-Poti1;Poti1;Potentiometre 1
-Poti2;Poti2;Potentiometre 2
-Poti3;Poti3;Potentiometre 3
-Poti4;Poti4;Potentiometre 4
-Altitude Control;Höhen Kontrolle;Controle altitude
-Switch for Setpoint;Höhenschalter;Interr. Setpoint
-Heading Hold;Heading Hold;Tenue de cap
-Compas Avtive;Kompass aktiv;Boussole Active
-Compas Fix;Compas Fix;Fix Boussole
-Coupling;Achskopplung;Accrochage
-Coupling2;Achskopplung2;Accrochage 2
-Coupling Yaw Correct;Coupling Yaw Correct;Corr. Accr. Lacet
-Yaw Rate Limiter;Drehratenbegrenzer;Limite Taux lacet
-Yaw pos. feedback;Yaw pos. feedback;Inform. Lacet +
-Yaw neg. feedback;Yaw neg. feedback;Inform. Lacet -
-ACC/Gyro Factor;ACC/Gyro Faktor;Facteur Acc. Gyro
+-Way Switch;3 Wege Schalter
+Servo Control;Servo Kontrolle
+Nick compensation;Nick-Kompensierung
+Servo min
+Servo max
+Refresh Rate;Aktualisierungsrate
+Inverse Direction
+Accelerate;Gas
+Poti1
+Poti2
+Poti3
+Poti4
+Altitude Control;Höhen Kontrolle
+Switch for Setpoint;Höhenschalter
+Heading Hold
+Compas Avtive;Kompass aktiv
+Compas Fix
+Coupling;Achskopplung
+Coupling2;Achskopplung2
+Coupling Yaw Correct
+Yaw Rate Limiter;Drehratenbegrenzer
+Yaw pos. feedback
+Yaw neg. feedback
+ACC/Gyro Factor;ACC/Gyro Faktor
 P-Rate
 I-Rate
 ACC/Gyro Comp.
-Drift-Compensation;Drift-Kompensation;Compens. derive
-Dynamic Stability;Stabilite dynam.
-Gas-Limit;Gas-Limit;Gaz Max.
-Threshold;Schwellwert;Seuil
+Drift-Compensation;Drift-Kompensation
+Dynamic Stability
+Gas-Limit
+Threshold;Schwellwert
 Hysterese
-TurnOver Nick;TurnOver Nick;Rafraich. tangage
-TurnOver Roll;TurnOver Roll;Rafraich. Roulis
-Up;Hoch;Haut
-Down;Runter;Bas
-Links;Links;Liens
-Rechts;Rechts;Droite
-Mode Control;Modus Kontrolle;Controle Mode
-GPS-Gain;GPS-Verstärkung;Gain GPS
+TurnOver Nick
+TurnOver Roll
+Up;Hoch
+Down;Runter
+Links;Links
+Rechts;Rechts
+Mode Control;Modus Kontrolle
+GPS-Gain;GPS-Verstärkung
 GPS-P
 GPS-P Limit
 GPS-I
 ,26 → 140,26
 GPS-D Limit
 GPS-ACC
 D-Rate
-Satelite minimum;minimale Sateliten;Satellites mini
-Stick Threshold;Stick-Schwellwert;Seuil Manche
-Wind Correction;Wind Korrektur;Correction vent
-Speed Compensation;Geschwindikeitskompensation;Compensat. vitesse
-Operation-Radius;Operationsradius;Rayon operationnel
-Angle-Limit;Winkellimitation;Limite inclinaison
-Min-Gas;Gas minimal:Gaz mini
-Max-Gas;Gas maximal;Gaz maxi
-Compas effect;Kompass Effekt;Effet boussole
-Voltage Warning;Spannungswarnung;Alerte tension
-Distress Gas;Notgas;Panne de Gaz
-Distress Gas Time;Notgas Zeit;Temps alerte gaz
-J16 Bitmask
-J17 Bitmask
-J16 Timing;J16 Timing;Chronom. J16
-J17 Timing;J17 Timing;Chronom. J17
-Nick/Roll P;Nick/Roll P;Tangage/Roulis P
-Nick/Roll D;Nick/Roll D;Tangage/Roulis D
-Gier P;Gier P;Lacet P
-Extern Control;Extern Control;Controle externe
+Satelite minimum;minimale Sateliten
+Stick Threshold;Stick-Schwellwert
+Wind Correction;Wind Korrektur
+Speed Compensation;Geschwindikeitskompensation
+Operation-Radius;Operationsradius
+Angle-Limit;Winkellimitation
+Min-Gas;Gas minimal
+Max-Gas;Gas maximal
+Compas effect;Kompass Effekt
+Voltage Warning;Spannungswarnung
+Distress Gas;Notgas
+Distress Gas Time;Notgas Zeit
+J16 Bitmask;Bitmaske J16
+J17 Bitmask;Bitmaske J17
+J16 Timing
+J17 Timing
+Nick/Roll P
+Nick/Roll D
+Gier P
+Extern Control
 Param 1
 Param 2
 Param 3
 ,34 → 168,33
 Param 6
 Param 7
 Param 8
-Not read yet;Noch nicht gelesen;Pas encore lu
-PH Login Time;PH einloggzeit;Temps connexion PH
-Params Incompatible;Parameter inkompatibel;Param. incompat.
-No Params on Mobile;No Params on Mobile;Pas param. teleph
-Parameter Write OK;Parameter geschrieben;Ecrit. Param. OK
-Saved Settings;Parameter geschrieben;Sauveg. Reglages
-Settings Undo OK;;Settings Undo OK;Annul. Reglages ok
-incompatible Device;incompatible Device;Periph. incompat.
-Param Reset Success!;Param Reset Success!;RAZ Param. OK
-writing params;writing params;Ecriture param.
-Interval;Interval;Intervale
-Altimeter;Altimeter;Altimetre
+Not read yet;Noch nicht gelesen
+PH Login Time;PH einloggzeit
+Params Incompatible;Parameter inkompatibel
+No Params on Mobile
+Parameter Write OK;Parameter geschrieben
+Saved Settings;Parameter geschrieben
+Settings Undo OK
+incompatible Device
+Param Reset Success!
+writing params
+Interval
+Altimeter
 Cockpit
-Invert Nick;Nick Invertieren;Inverser Tangage
-Invert Roll;Roll Invertieren;Inverser Roulis
-Show Flight Time;Show Flight Time;Temps de vol
-Show Altitude;Show Altitude;Afficher altitude
-Units;Einheiten;Unites
-Developer Mode;Entwicklermodus;Mode developpeur
-Disconnect;Verbindungsabriss;Deconnecter
-Instant Error-Msg;Instant Error-Msg;Msg erreur inst.
-Reconnect;Reconnect;Reconnecter
-Edit;Ändern;Editer
-Altimeter Stepping;Altimeter Stepping;Etapes d'altimetre
-Load Plain;Load Plain;Charger classique
-Load Fancy;Load Fancy;Charger fantaisie
-Timing;Timing;Chronometre
-Primary Data Abo;Primary Data Abo;Vitess. donnees 1
-Secondary Data Abo;Secondary Data Abo;Vitess. donnees 2
-Default Data Abo;Default Data Abo;Vit. donnees def.
-Big Fonts;Grosse Fonts;Big Fonts
+Invert Nick;Nick Invertieren
+Invert Roll;Roll Invertieren
+Show Flight Time
+Show Altitude
+Units;Einheiten
+Developer Mode;Entwicklermodus
+Disconnect;Verbindungsabriss
+Instant Error-Msg
+Reconnect
+Edit;Ändern
+Altimeter Stepping
+Load Plain
+Load Fancy
+Timing
+Primary Data Abo
+Secondary Data Abo
+Default Data Abo

 /DUBwise/trunk/j2me/src/BTSearcher.java
 ,6 → 19,8
     private LocalDevice m_LclDevice = null;
     private DiscoveryAgent m_DscrAgent=null;
     public boolean searching=true;
     public boolean error=false;
     public String  err_log="none";

 /DUBwise/trunk/j2me/src/DUBwiseCanvas.java
 ,27 → 162,20
     {
         if ((keyCode>=KEY_NUM0)&&(keyCode<=KEY_NUM9))
             return 1<<(keyCode-KEY_NUM0);
-        switch (getGameAction( keyCode ))
-            {
-            case UP:
-                return 1<<10;
-            case DOWN:
-                return 1<<11;
-            case LEFT:
-                return 1<<12;
-            case RIGHT:
-                return 1<<13;
-            case FIRE:
-                return 1<<14;
-            }
-        switch ( keyCode )
-            {
-            case KEY_STAR:
-                return 1<<15;
-            }
+        else
+            switch (getGameAction( keyCode ))
+                {
+                case UP:
+                    return 1<<10;
+                case DOWN:
+                    return 1<<11;
+                case LEFT:
+                    return 1<<12;
+                case RIGHT:
+                    return 1<<13;
+                case FIRE:
+                    return 1<<14;
+                }
         //      log("unmapped key");
         return 0; // cant translate
     }
 ,9 → 386,6
         // only mk
         if (mk.is_mk())
             {
-                //              tmp_menu_add("Start Engines",ACTIONID_START_ENGINES);
                 tmp_menu_add(l(STRINGID_MOTORTEST),ACTIONID_MOTORTEST);
                 tmp_menu_add(l(STRINGID_KEYCONTROL),ACTIONID_KEYCONTROL);
                 tmp_menu_add(l(STRINGID_RCDATA),ACTIONID_RCDATA);
 ,7 → 395,7
                 tmp_menu_add("Mixer",ACTIONID_SELECT_MIXER);
             }
-        if ( mk.is_rangeextender()|| mk.is_followme() || mk.is_riddim() )
+        if ( mk.is_rangeextender()|| mk.is_followme() )
             {
                 tmp_menu_add(l(STRINGID_LCD),ACTIONID_LCD);
                 tmp_menu_add(l(STRINGID_DEBUG_VALUES),ACTIONID_RAWDEBUG);
 ,12 → 1836,7
                     g.drawString("do volts sound"+ settings.do_volts_sound ,0,y_off,Graphics.TOP | Graphics.LEFT);
                     y_off+=spacer_small;
 //#endif
                     break;
                 case STATEID_DATABUFF:
 ,13 → 2040,6
                     g.drawString("6 or 9 =>gas " + mk.extern_control[EXTERN_CONTROL_GAS],0,y_off,Graphics.TOP | Graphics.LEFT);
                     y_off+=spacer_medium;
-                    g.drawString("5 => start engines ",0,y_off,Graphics.TOP | Graphics.LEFT);
-                    //              y_off+=spacer_medium;
-                    //g.drawString("5 => start engines ",0,y_off,Graphics.TOP | Graphics.LEFT);
-                    y_off+=spacer_medium;
                     g.drawString("* and # =>exit",0,y_off,Graphics.TOP | Graphics.LEFT);
                     y_off+=spacer_medium;
                     /*              g.drawString("* and Fire =>Start Engines",0,y_off,Graphics.TOP | Graphics.LEFT);
 ,10 → 3165,6
             case ACTIONID_EDIT_PARAMS:
                 chg_state(STATEID_EDIT_PARAMS);
                 break;
-            case ACTIONID_START_ENGINES:
-                mk.start_engines();
-                break;
             case ACTIONID_SELECT_PARAMS:
                 select_paramset4edit=true;
                 read_paramset_intension_save=false;
 ,23 → 3403,22
         // key-actions common in all states
         debug.process_key(keyCode);
         if ( key_bitfield==(keyCode2mask(KEY_NUM0)|keyCode2mask(KEY_STAR)))
             {
                 chg_state(STATEID_MAINMENU);
                 return;
             }
         if (state!=STATEID_MAP)
             {
-                if (((keyCode==KEY_STAR) || (keyCode==settings.key_back) )&&(state!=STATEID_KEYCONTROL))//&&(state!= STATEID_STRINGINPUT))
-                    {
-                        chg_state(STATEID_MAINMENU);
-                        return;
-                    }
+        if (((keyCode==KEY_STAR) || (keyCode==settings.key_back) )&&(state!=STATEID_KEYCONTROL))//&&(state!= STATEID_STRINGINPUT))
+            {
+                chg_state(STATEID_MAINMENU);
+                return;
             }
+            }
         if (((keyCode==KEY_POUND)||(keyCode==settings.key_fullscreen))&&(state!=STATEID_KEYCONTROL))
             {
                 settings.toggle_fullscreen();
 ,8 → 3622,6
                     mod_external_control_by_keycode(keyCode,(byte)1);
-                if (keyCode==KEY_NUM5)
-                    process_action(ACTIONID_START_ENGINES);
                 if (keycontrol_exit==3)
                     chg_state(STATEID_MAINMENU);

/DUBwise/trunk/j2me/src/DUBwiseUIDefinitions.java
109,7 → 109,6
public final static byte ACTIONID_SELECT_DUBWISEDIR = 47;
public final static byte ACTIONID_SELECT_MIXER = 48;
public final static byte ACTIONID_BIG_SYMBOLS = 49;
public final static byte ACTIONID_START_ENGINES = 50;

public final static byte ACTIONID_QUIT = 100;

 /DUBwise/trunk/j2me/src/MKStatusVoice.java
 ,115 → 132,30
         }
     }
-    public boolean play(String what)
+    public void start_playing(String name)
     {
-        // start play
         try {
             act_player_state=PLAYERSTATE_PLAYING;
-            player=init_player(what);
+            player=init_player(name);
             player.start();
         }
         catch (Exception e)  {
-            act_player_state=PLAYERSTATE_FIN;
         }
-        // wait for end
+    }
+    public void wait_for_end()
+    {
         while (act_player_state!=PLAYERSTATE_FIN)
             {
                 try { Thread.sleep(5); }
                 catch (Exception e)  {   }
             }
-        return true;
     }
-    // play number
-    public void play(int what)
-    {
-        if (what==0)
-            {
-                play("0");
-                return;
-            }
-        if (((what/1000)%10)!=0)
-            {
-                play((what/1000)%10);
-                play("thousand");
-                what%=1000;
-            }
-        if (((what/100)%10)!=0)
-            {
-                play((what/100)%10);
-                play("hundred");
-                what%=100;
-            }
-        if (what<20)
-            {
-                if (what<13)
-                    {
-                        if(what!=0)
-                            play(""+what);
-                    }
-                else
-                     {
-                         switch (what%10)
-                             {
-                             case 3:
-                                 play("thir");
-                                 break;
-                             case 5:
-                                 play("fiv");
-                                 break;
-                             default:
-                                 play (""+what%10);
-                             }
-                         play("teen");
-                     }
-            }
-        else
-            {
-                switch (what/10)
-                    {
-                    case 2:
-                        play("twen");
-                        break;
-                    case 3:
-                        play("thir");
-                        break;
-                    case 5:
-                        play("fiv");
-                        break;
-                    default:
-                        play (""+what/10);
-                    }
-                play("ty");
-                if ((what%10)!=0)
-                    play (what%10);
-            }
- }
     int info_from_debug_set=-1;
     int volt_timeout=0;
 ,164 → 167,66
     public int loop_cnt;
     public int volts_play_cnt;
-    boolean conn_told=false;
-    boolean disconn_told=true;
-    boolean sender_warning_told=false;
     public void run()
     {
         while(true)
             {
                 loop_cnt++;
-                if ((canvas.mk!=null)&&(canvas.settings.do_sound))
+                if ((canvas.mk!=null)&&(canvas.mk.connected)&&(canvas.settings.do_sound)&&(canvas.mk.UBatt()!=-1)&&(!canvas.mk.force_disconnect))
                     {
+                        volt_timeout--;
+                        if (info_from_debug_set!=canvas.mk.stats.debug_data_count)
+                            { // only when newdata
+                                if (canvas.settings.do_volts_sound&&(volt_timeout<0))
+                                    {
+                                        volts_play_cnt++;
-                        if ((canvas.mk.connected)&&(!canvas.mk.force_disconnect))
-                            {
-                        if (!conn_told)
-                            {
-                                if (canvas.mk.version.known)
-                                    {
-                                        play("connected");
-                                        play("to");
-                                        play("mikrokopter");
-                                        play("version");
+                                        volt_timeout=(delay*1000)/BASE_SLEEP;
+                                        int ubatt=canvas.mk.UBatt();
+                                        info_from_debug_set=canvas.mk.stats.debug_data_count;
+                                        start_playing(""+(ubatt/10));
+                                        wait_for_end();
-                                        play(canvas.mk.version.major);
-                                        play("point");
-                                        play(canvas.mk.version.minor);
-                                        play("established");
-                                        conn_told=true;
-                                        disconn_told=false;
-                                    }
-                            }
-                        else
-                            {
-                                if ((canvas.mk.SenderOkay()<1))
-                                    {
-                                        if (!sender_warning_told)
+                                        if((ubatt%10)!=0)
                                             {
-                                                play("warning");
-                                                play("rc-signal");
-                                                play("lost");
-                                                sender_warning_told=true;
+                                                start_playing("komma");
+                                                wait_for_end();
+                                                start_playing(""+(ubatt%10));
+                                                wait_for_end();
                                             }
+                                        start_playing("volt");
+                                        wait_for_end();
                                     }
-                                else
-                                    sender_warning_told=false;
-                                if ((canvas.mk.AngleNick()>400)||(canvas.mk.AngleRoll()>400)||(canvas.mk.AngleNick()<-400)||(canvas.mk.AngleRoll()<-400))
+                                if (canvas.settings.do_altimeter_sound)
                                     {
-                                        play("tilt");
-                                        play("warning");
-                                    }
+                                        if (last_alt==-1) last_alt=canvas.mk.Alt();
-                                volt_timeout--;
-                                if (info_from_debug_set!=canvas.mk.stats.debug_data_count)
-                                    { // only when newdata
-                                        if (canvas.settings.do_volts_sound&&(volt_timeout<0))
+                                        if (last_alt>canvas.mk.Alt()+canvas.settings.altsteps)
                                             {
-                                                play("battery");
-                                                play("at");
-                                                volts_play_cnt++;
-                                                volt_timeout=(delay*1000)/BASE_SLEEP;
-                                                int ubatt=canvas.mk.UBatt();
-                                                info_from_debug_set=canvas.mk.stats.debug_data_count;
-                                                play((ubatt/10));
-                                                if((ubatt%10)!=0)
-                                                    {
-                                                        play("point");
-                                                        play((ubatt%10));
-                                                    }
-                                                play("volts");
-                                                play("altitude");
-                                                play( canvas.mk.Alt()/10);
-                                                play("point");
-                                                play( canvas.mk.Alt()%10);
-                                                play("meter");
-                                                if ((canvas.mk.stats.flying_time()!=0))
-                                                    {
-                                                        play("flight");
-                                                        play("time");
-                                                        switch (canvas.mk.stats.flying_time()/60)
-                                                            {
-                                                            case 0:
-                                                            case 1:
-                                                                play("1");
-                                                                play("minute");
-                                                                break;
-                                                            default:
-                                                                play(canvas.mk.stats.flying_time()/60);
-                                                                play("minutes");
-                                                            }
-                                                        switch (canvas.mk.stats.flying_time()%60)
-                                                            {
-                                                            case 0:
-                                                                //                                                          case 1:
-                                                                //                                                              play("1");
-                                                                break;
-                                                            default:
-                                                                play(canvas.mk.stats.flying_time()%60);
-                                                                play("minutes");
-                                                            }
-                                                    }
+                                                //                                              start_playing("down");
+                                                play_down();
+                                                wait_for_end();
+                                                last_alt-=canvas.settings.altsteps;
                                             }
-                                        if (canvas.settings.do_altimeter_sound)
+                                        if (last_alt<canvas.mk.Alt()-canvas.settings.altsteps)
                                             {
-                                                if (last_alt==-1) last_alt=canvas.mk.Alt();
-                                                if (last_alt>canvas.mk.Alt()+canvas.settings.altsteps)
-                                                    {
-                                                        play("down");
-                                                        last_alt-=canvas.settings.altsteps;
-                                                    }
-                                                if (last_alt<canvas.mk.Alt()-canvas.settings.altsteps)
-                                                    {
-                                                        play("up");
-                                                        last_alt+=canvas.settings.altsteps;
-                                                    }
+                                                //start_playing("up");
+                                                play_up();
+                                                wait_for_end();
+                                                last_alt+=canvas.settings.altsteps;
                                             }
-                                        else
-                                            last_alt=-1;
                                     }
+                                else
+                                    last_alt=-1;
                             }
-                            }
-                        else
-                            {
-                                if (!disconn_told)
-                                    play("disconnected");
-                                conn_told=false;
-                                disconn_told=true;
-                            }
                     }
                 try {

Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 517 → Rev 516