WebSVN - FlightCtrl - Path Comparison - /branches/ligi_j2me/ Rev 501 and /branches/ligi

Ignore whitespace Rev 501 → Rev 502

/branches/ligi_j2me/README
87,6 → 87,7

Nokia N95
Nokia N80
Nokia N73
Nokia 6234
Nokia 6131
Nokia 6300

/branches/ligi_j2me/bin/v0.42_pre4/DUBwise_176x220.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

/branches/ligi_j2me/bin/v0.42_pre4/DUBwise_176x220.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre4/DUBwise_240x320.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

/branches/ligi_j2me/bin/v0.42_pre4/DUBwise_240x320.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre5/DUBwise_240x320.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre5/DUBwise_176x220.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

/branches/ligi_j2me/bin/v0.42_pre5/DUBwise_176x220.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre5/DUBwise_240x320.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

/branches/ligi_j2me/bin/v0.42_pre6/DUBwise_240x320.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre6/DUBwise_176x220.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

/branches/ligi_j2me/bin/v0.42_pre6/DUBwise_176x220.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre6/DUBwise_240x320.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

/branches/ligi_j2me/bin/v0.42_pre1/DUBwise_240x320.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

/branches/ligi_j2me/bin/v0.42_pre1/DUBwise_128x.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

/branches/ligi_j2me/bin/v0.42_pre1/DUBwise_240x320.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre1/DUBwise_128x.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre1/DUBwise_176x220.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

/branches/ligi_j2me/bin/v0.42_pre1/DUBwise_176x220.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre2/DUBwise_240x320.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

/branches/ligi_j2me/bin/v0.42_pre2/DUBwise_240x320.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre3/DUBwise_240x320.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

/branches/ligi_j2me/bin/v0.42_pre3/DUBwise_240x320.jad
File deleted

/branches/ligi_j2me/bin/v0.42_pre3/DUBwise_176x220.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

/branches/ligi_j2me/bin/v0.42_pre3/DUBwise_176x220.jad
File deleted

 /branches/ligi_j2me/bin/v0.42_pre7/DUBwise_176x220.jad
 ,0 → 1,8
+MIDlet-Jar-URL: DUBwise_176x220.jar
+MIDlet-Jar-Size: 90529
+MIDlet-Name: DUBwise
+MIDlet-Vendor: LiGi
+MIDlet-Version: 0.42
+MIDlet-1: DUBwise, i.png, DUBwise
+MIDletX-No-Command: true
+MIDlet-Icon: i.png

/branches/ligi_j2me/bin/v0.42_pre7/DUBwise_176x220.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /branches/ligi_j2me/bin/v0.42_pre7/DUBwise_240x320.jad
 ,0 → 1,8
+MIDlet-Jar-URL: DUBwise_240x320.jar
+MIDlet-Jar-Size: 75178
+MIDlet-Name: DUBwise
+MIDlet-Vendor: LiGi
+MIDlet-Version: 0.42
+MIDlet-1: DUBwise, i.png, DUBwise
+MIDletX-No-Command: true
+MIDlet-Icon: i.png

/branches/ligi_j2me/bin/v0.42_pre7/DUBwise_240x320.jar
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /branches/ligi_j2me/src/MKCommunicator.java
 ,10 → 60,8
         version=new MKVersion();
         debug_data=new MKDebugData();
         params=new MKParamsParser();
-        //      mk_url=url; // remember URL for connecting / reconnecting later
-                LCD= new MKLCD(this);
-                watchdog=new MKWatchDog(this);
+        LCD= new MKLCD(this);
+        watchdog=new MKWatchDog(this);
         new Thread( this ).start(); // fire up main Thread
     }
 ,7 → 74,7
     //  URL string: "btspp://XXXXXXXXXXXX:1" - the X-Part is the MAC-Adress of the Bluetooth-Device connected to the Fligth-Control
     public void connect_to(String _url,String _name)
     {
-        mk_url=_url;
+        mk_url=_url; // remember URL for connecting / reconnecting later
         name=_name;
         force_disconnect=false;
         connected=false;
 ,8 → 172,25
         send_command(0,'q',params);
     }
-    public void trigger_LCD(int key)
+    public void get_debug_name(int id)
     {
+        int[] params=new int[1];
+        params[0]=id;
+        while(sending)
+            {try { Thread.sleep(50); }
+            catch (Exception e)  {   }
+            }
+        send_command(0,'a',params);
+    }
+   public void trigger_LCD(int key)
+    {
         if (sending) return;
 ,6 → 282,11
                 debug_data_count++;
                 debug_data.set_by_mk_data(Decode64(data,3,len-3),version);
                 break;
+            case 'A': // debug Data Names
+                //debug_data_count++;
+                debug_data.set_names_by_mk_data(data[1]-'0',Decode64(data,3,len-3));
+                break;
             case 'V': // Version Info
                 version_data_count++;

 /branches/ligi_j2me/src/MKDebugData.java
 ,6 → 13,8
 {
     public int[] analog;
+    public String[] names;
+    public boolean[] got_name;
     public int motor_complete=-1;
 ,12 → 35,30
     public MKDebugData()
     {
+        names=new String[32];
         analog=new int[32];
+        got_name=new boolean[32];
         for (i=0;i<32;i++)
+            {
             analog[i]=-1;
+            names[i]="-#"+i+"->";
+            got_name[i]=false;
+            }
     }
+    public void set_names_by_mk_data(int id,int[] in_arr)
+    {
+        names[id]="";
+        for (i=0;i<16;i++)
+            {
+                if ((char)in_arr[i]!=' ')
+                    names[id]+=(char)in_arr[i];
+                got_name[id]=true;
+            }
+        names[id]+=":";
+    }
     public void set_by_mk_data(int[] in_arr,MKVersion version)
     {

 /branches/ligi_j2me/src/MKMiniCanvas.java
 ,8 → 511,8
                     g.setFont(f2);
                     for (int i=0;i<16;i++)
                         {
-                            g.drawString("#"+i+"->" + mk.debug_data.analog[i] ,0,y_off,Graphics.TOP | Graphics.LEFT);
-                            g.drawString("#"+(16+i)+"->" + mk.debug_data.analog[16+i] ,this.getWidth()/2,y_off,Graphics.TOP | Graphics.LEFT);
+                            g.drawString(mk.debug_data.names[i] + mk.debug_data.analog[i] ,0,y_off,Graphics.TOP | Graphics.LEFT);
+                            g.drawString(mk.debug_data.names[16+i]  + mk.debug_data.analog[16+i] ,this.getWidth()/2,y_off,Graphics.TOP | Graphics.LEFT);
                             y_off+=spacer1;
                         }

/branches/ligi_j2me/src/MKParamsParser.java
84,6 → 84,7
break;

case 6:
case 7:
for ( int i=0;i<65;i++)
field[paramset_num][i]=in_arr[i];
names[paramset_num]="" + (paramset_num+1) +": ";

 /branches/ligi_j2me/src/MKWatchDog.java
 ,6 → 59,12
                         else if (mk.params.field[4][0]==-1)
                             mk.get_params(5);
+                        for (int c=0;c<32;c++)
+                            if (!mk.debug_data.got_name[c])
+                                {
+                                    mk.get_debug_name(c);
+                                    break;
+                                }
                     }

Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 501 → Rev 502