Rev 262 | Rev 266 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 262 | Rev 265 | ||
|---|---|---|---|
| Line 39... | Line 39... | ||
| 39 | public String connection_name=""; |
39 | public String connection_name=""; |
| 40 | public String connection_url=""; |
40 | public String connection_url=""; |
| Line 41... | Line 41... | ||
| 41 | 41 | ||
| 42 | public boolean do_vibra=true; |
42 | public boolean do_vibra=true; |
| - | 43 | public boolean do_sound=true; |
|
| - | 44 | public boolean do_volts_sound=true; |
|
| - | 45 | public boolean do_altimeter_sound=true; |
|
| - | 46 | ||
| 43 | public boolean do_sound=true; |
47 | |
| 44 | public boolean fullscreen=false; |
48 | public boolean fullscreen=false; |
| 45 | public boolean do_scrollbg=false; |
49 | public boolean do_scrollbg=false; |
| Line 46... | Line 50... | ||
| 46 | public boolean expert_mode=false; |
50 | public boolean expert_mode=false; |
| Line 218... | Line 222... | ||
| 218 | 222 | ||
| 219 | //#endif |
223 | //#endif |
| Line 220... | Line 224... | ||
| 220 | } |
224 | } |
| 221 | 225 | ||
| Line 222... | Line 226... | ||
| 222 | if (pos==SETTINGS_POS_BITFIELD2) |
226 | if (pos==SETTINGS_POS_BITFIELD2) |
| 223 | do_sound=((val&1)!=0); // TODO: FIXME - extra var |
227 | do_volts_sound=((val&1)!=0); |
| - | 228 | ||
| - | 229 | if (pos==SETTINGS_POS_BITFIELD2+1) |
|
| - | 230 | reload_settings=((val&2)!=0); |
|
| 224 | 231 | ||
| Line 225... | Line 232... | ||
| 225 | if (pos==SETTINGS_POS_BITFIELD2) |
232 | if (pos==SETTINGS_POS_BITFIELD2+2) |
| Line 250... | Line 257... | ||
| 250 | }, |
257 | }, |
| 251 | { STRINGID_GPSFORMAT, STRINGID_SPEEDFORMAT}, |
258 | { STRINGID_GPSFORMAT, STRINGID_SPEEDFORMAT}, |
| 252 | { STRINGID_NICK ,STRINGID_ROLL,STRINGID_GIER,STRINGID_GASINCREASE,STRINGID_HEIGHTINCREASE }, |
259 | { STRINGID_NICK ,STRINGID_ROLL,STRINGID_GIER,STRINGID_GASINCREASE,STRINGID_HEIGHTINCREASE }, |
| 253 | {STRINGID_BACKTOMAINMENU,STRINGID_FULLSCREEN,STRINGID_CLEAR }, |
260 | {STRINGID_BACKTOMAINMENU,STRINGID_FULLSCREEN,STRINGID_CLEAR }, |
| 254 | {STRINGID_LEGEND,STRINGID_SCALEGRID,STRINGID_GRAPHINTERVAL}, |
261 | {STRINGID_LEGEND,STRINGID_SCALEGRID,STRINGID_GRAPHINTERVAL}, |
| 255 | {STRINGID_VOLTS,STRINGID_DELAYINS,STRINGID_VOLUME}, |
262 | {STRINGID_VOLTS,STRINGID_DELAYINS,STRINGID_ALTIMETER,STRINGID_VOLUME}, |
| 256 | {STRINGID_SOUND,STRINGID_VIBRA,STRINGID_REMOTECAMSTICK,STRINGID_ALWAYSRELOADPARAMS,STRINGID_EXPERTMODE}}; |
263 | {STRINGID_SOUND,STRINGID_VIBRA,STRINGID_REMOTECAMSTICK,STRINGID_ALWAYSRELOADPARAMS,STRINGID_EXPERTMODE}}; |
| Line 257... | Line 264... | ||
| 257 | 264 | ||
| Line 269... | Line 276... | ||
| 269 | public int[][] _field_positions={ {SETTINGS_POS_LANG,SETTINGS_POS_SKIN,8,9 |
276 | public int[][] _field_positions={ {SETTINGS_POS_LANG,SETTINGS_POS_SKIN,8,9 |
| 270 | //#if devicecontrol=="on" |
277 | //#if devicecontrol=="on" |
| Line 271... | Line 278... | ||
| 271 | 278 | ||
| 272 | ,13 |
279 | ,13 |
| 273 | //#endif |
280 | //#endif |
| 274 | } , {2,3 } , {4,5,6,7,8} , {9,10,11},{SETTINGS_POS_BITFIELD1*8 +6,SETTINGS_POS_BITFIELD1*8 +7, SETTINGS_POS_GRAPHINTERVAL} ,{SETTINGS_POS_BITFIELD2*8+0,SETTINGS_POS_VOICEDELAY,SETTINGS_POS_VOICEVOLUME }, {10,11,12,SETTINGS_POS_BITFIELD2*8+1,12}}; |
281 | } , {2,3 } , {4,5,6,7,8} , {9,10,11},{SETTINGS_POS_BITFIELD1*8 +6,SETTINGS_POS_BITFIELD1*8 +7, SETTINGS_POS_GRAPHINTERVAL} ,{SETTINGS_POS_BITFIELD2*8+0,SETTINGS_POS_VOICEDELAY,SETTINGS_POS_BITFIELD2*8+2,SETTINGS_POS_VOICEVOLUME }, {10,11,12,SETTINGS_POS_BITFIELD2*8+1,12}}; |
| 275 | public int[][] _field_types={ {PARAMTYPE_CHOICE+0,PARAMTYPE_CHOICE+1,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH |
282 | public int[][] _field_types={ {PARAMTYPE_CHOICE+0,PARAMTYPE_CHOICE+1,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH |
| 276 | //#if devicecontrol=="on" |
283 | //#if devicecontrol=="on" |
| 277 | ,PARAMTYPE_BITSWITCH |
284 | ,PARAMTYPE_BITSWITCH |
| 278 | //#endif |
285 | //#endif |
| 279 | } , {PARAMTYPE_CHOICE+2,PARAMTYPE_CHOICE+3} , {PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE}, {PARAMTYPE_KEY,PARAMTYPE_KEY,PARAMTYPE_KEY} , {PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE}, {PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE,PARAMTYPE_BYTE}, {PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_STICK,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH}}; |
286 | } , {PARAMTYPE_CHOICE+2,PARAMTYPE_CHOICE+3} , {PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE,PARAMTYPE_BYTE}, {PARAMTYPE_KEY,PARAMTYPE_KEY,PARAMTYPE_KEY} , {PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE}, {PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE,PARAMTYPE_BITSWITCH,PARAMTYPE_BYTE}, {PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH,PARAMTYPE_STICK,PARAMTYPE_BITSWITCH,PARAMTYPE_BITSWITCH}}; |
| Line 280... | Line 287... | ||
| 280 | DUBwiseCanvas canvas; |
287 | DUBwiseCanvas canvas; |