Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 303 → Rev 314

/branches/ligi_j2me/src/MKParamsEditor.java
24,7 → 24,7
 
 
public String[] tab_names={"Configuration","Channels","Stick","Altitude","Gyro","Looping","Camera","Other","User"};
public int[] tab_entrys_count={6,8,3,6,4,6,5,5,4};
public int[] tab_entrys_count={6,8,3,6,4,6,6,5,4};
public String[][] tab_entrys={{"Altitude Contol","Switch for setpoint","Heading Hold","Compass","Orientation fixed","GPS"}
,
35,7 → 35,7
{"Up","Down","Left","Right","Gas Limit","Response threshold"},
{"Servo Ctrl","Nick compensation","Invert direction","Servo min","Servo max","Servo refresh Rate"},
 
{"Min Gas","Max Gas","Compass effect","voltage warning","distress gas"},
{"Min Gas","Max Gas","Compass effect","voltage warning","distress gas time", "distress gas"},
{"Param1","Param2","Param3","Param4"}
// {"","","","","",""},
 
67,7 → 67,7
{ {22,0} ,{23,0},{20,0},{28,0} },
{ {40,0} ,{40,1},{40,2},{40,3},{38,0},{39,0} },
{ {33,0} ,{34,0},{40,2}/*!*/,{35,0},{36,0},{37,0} },
{ {18,0} ,{19,0},{21,0},{24,0},{25,0} },
{ {18,0} ,{19,0},{21,0},{24,0},{26,0},{25,0} },
{ {29,0} ,{30,0},{31,0},{32,0} }
};
 
113,9 → 113,9
{
lcd_lines[1+2*i]=tab_entrys[act_tab][i];
if (tab_entry_types[act_tab][i]== PARAMTYPE_BOOLEAN)
lcd_lines[2+2*i]=(((canvas.mk.params.field[tab_entry_src[act_tab][i][0]]&(1<<tab_entry_src[act_tab][i][1]))==0)?"off":"on" ) ;
lcd_lines[2+2*i]=(((canvas.mk.params.field_from_act(tab_entry_src[act_tab][i][0])&(1<<tab_entry_src[act_tab][i][1]))==0)?"off":"on" ) ;
if (tab_entry_types[act_tab][i]== PARAMTYPE_BYTE)
lcd_lines[2+2*i]=""+canvas.mk.params.field[tab_entry_src[act_tab][i][0]];
lcd_lines[2+2*i]=""+canvas.mk.params.field_from_act(tab_entry_src[act_tab][i][0]);
 
}
 
162,10 → 162,11
switch(tab_entry_types[act_tab][act_y/2-1])
{
case PARAMTYPE_BOOLEAN:
canvas.mk.params.field[tab_entry_src[act_tab][act_y/2-1][0]]^=1<<tab_entry_src[act_tab][act_y/2-1][1];
 
canvas.mk.params.field_from_act_xor(tab_entry_src[act_tab][act_y/2-1][0],1<<tab_entry_src[act_tab][act_y/2-1][1]);
break;
case PARAMTYPE_BYTE:
canvas.mk.params.field[tab_entry_src[act_tab][act_y/2-1][0]]++;
canvas.mk.params.field_from_act_add(tab_entry_src[act_tab][act_y/2-1][0],1);
break;
}
break;
174,10 → 175,12
switch(tab_entry_types[act_tab][act_y/2-1])
{
case PARAMTYPE_BOOLEAN:
canvas.mk.params.field[tab_entry_src[act_tab][act_y/2-1][0]]^=1<<tab_entry_src[act_tab][act_y/2-1][1];
 
canvas.mk.params.field_from_act_xor(tab_entry_src[act_tab][act_y/2-1][0],1<<tab_entry_src[act_tab][act_y/2-1][1]);
 
break;
case PARAMTYPE_BYTE:
canvas.mk.params.field[tab_entry_src[act_tab][act_y/2-1][0]]--;
canvas.mk.params.field_from_act_add(tab_entry_src[act_tab][act_y/2-1][0],-1);
break;
}
 
190,10 → 193,12
 
case Canvas.DOWN:
if (act_y<(act_lcd_lines-2)) act_y+=2;
else act_y=0;
break;
 
case Canvas.UP:
if (act_y!=0) act_y-=2;;
if (act_y!=0) act_y-=2;
else act_y=act_lcd_lines-1;
break;
}