Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 260 → Rev 261

/DUBwise/trunk/j2me/src/DUBwiseCanvas.java
222,6 → 222,7
 
tmp_menu_add(l(STRINGID_SELECT_FIRMWARE),ACTIONID_SELECT_FIRMWARE);
tmp_menu_add("UPDATE_DUBWISE",ACTIONID_UPDATE_DUBWISE);
tmp_menu_add("Phone GPS",ACTIONID_SHOWPHONEGPS);
 
 
if (settings.expert_mode)
627,7 → 628,7
mk.ufo_prober.change_notify=false;
if (mk.ufo_prober.is_incompatible())
{
mk.error_str="incompatible Device";
mk.error_str=l(STRINGID_INCOMPATIBLEDEVICE);
chg_state(STATEID_ERROR_MSG);
}
else
640,6 → 641,52
{
 
case STATEID_SHOWPHONEGPS:
try
{
Class.forName("javax.microedition.location.LocationProvider");
 
javax.microedition.location.Criteria cr= new javax.microedition.location.Criteria();
cr.setHorizontalAccuracy(500);
// Get an instance of the provider
javax.microedition.location.LocationProvider lp= javax.microedition.location.LocationProvider.getInstance(cr);
// Request the location, setting a one-minute timeout
javax.microedition.location.Location l = lp.getLocation(60);
javax.microedition.location.Coordinates c = l.getQualifiedCoordinates();
 
 
/* low crit
 
Criteria crit2 = new Criteria();
crit2.setHorizontalAccuracy(Criteria.NO_REQUIREMENT);
crit2.setVerticalAccuracy(Criteria.NO_REQUIREMENT);
crit2.setPreferredResponseTime(Criteria.NO_REQUIREMENT);
crit2.setPreferredPowerConsumption(Criteria.POWER_USAGE_HIGH);
crit2.setCostAllowed(false);
crit2.setSpeedAndCourseRequired(false);
crit2.setAltitudeRequired(false);
lp= LocationProvider.getInstance(crit2);
 
*/
if(c != null ) {
// Use coordinate information
phone_lat= c.getLatitude();
phone_long = c.getLongitude();
}
}
catch (Exception e)
{
mk.error_str="Phone GPS Problem";
chg_state(STATEID_ERROR_MSG);
}
break;
case STATEID_SELECT_FIRMWARE:
if ((menu_items.length==0)&&(fw_loader.got_list))
setup_menu(fw_loader.names,null);
653,7 → 700,7
mk.params.reset();
mk.watchdog.act_paramset=0;
nextstate=STATEID_PARAM_MENU;
success_msg="Param Reset Success!";
success_msg=l(STRINGID_PARAMRESETOK);
chg_state(STATEID_SUCCESS_MSG);
}
break;
708,7 → 755,7
if (param_masswrite_write_pos==5)
{
nextstate=STATEID_PARAM_MENU;
success_msg="Parameter Write OK";
success_msg=l(STRINGID_PARAMWRITEOK);
chg_state(STATEID_SUCCESS_MSG);
}
else
718,7 → 765,7
catch (Exception e)
{debug.log("Problem Sleeping "); }
lcd_lines[0]="Writing Params";
lcd_lines[0]=l(STRINGID_WRITINGPARAMS);
lcd_lines[1]=DUBwiseHelper.pound_progress(param_masswrite_write_pos,5);
 
894,6 → 941,7
//#if devicecontrol=="on"
 
try {
Class.forName("com.nokia.mid.ui.DeviceControl");
if (settings.keep_lighton) com.nokia.mid.ui.DeviceControl.setLights(0,100);
 
}
1454,6 → 1502,16
break;
//#endif
 
 
case STATEID_SHOWPHONEGPS:
y_off+=spacer;
g.drawString("lat" + phone_lat ,0,y_off,Graphics.TOP | Graphics.LEFT);
y_off+=spacer;
g.drawString("long" + phone_long ,0,y_off,Graphics.TOP | Graphics.LEFT);
 
break;
 
 
case STATEID_SELECT_FIRMWARE:
case STATEID_SELECT_COMPORT:
case STATEID_PARAM_MENU:
2133,6 → 2191,10
int[][] params2masswrite;
int param_masswrite_write_pos;
 
double phone_lat=0.0;
double phone_long=0.0;
 
public void process_action(byte actionid)
{
switch(actionid)
2145,6 → 2207,11
catch(Exception e) { }
break;
 
 
case ACTIONID_SHOWPHONEGPS:
chg_state(STATEID_SHOWPHONEGPS);
break;
 
case ACTIONID_PARAM_LOAD_MOBILE:
try
{
2159,7 → 2226,7
// params_version
if ( mk.params.params_version!=din.readInt())
{
mk.error_str="Params Incompatible";
mk.error_str=l(STRINGID_PARAMSINCOMPATIBLE);
chg_state(STATEID_ERROR_MSG);
break;
}
2179,7 → 2246,7
}
catch (Exception e)
{
mk.error_str="No Params on Mobile";
mk.error_str=l(STRINGID_NOPARAMSONMOBILE);
chg_state(STATEID_ERROR_MSG);
}
 
2199,7 → 2266,7
break;
case ACTIONID_PARAM_WRITE_OK:
success_msg="Parameter Write OK";
success_msg=l(STRINGID_PARAMWRITEOK);
chg_state(STATEID_SUCCESS_MSG);
break;
case ACTIONID_HORIZON:
2338,7 → 2405,7
 
case ACTIONID_WRITE_PARAMS:
mk.write_params(mk.params.act_paramset);
success_msg="Saved Settings"; // too optimistic
success_msg=l(STRINGID_SAVEDSETTINGS); // too optimistic
nextstate=STATEID_HANDLE_PARAMS;
chg_state(STATEID_SUCCESS_MSG);
break;
2345,7 → 2412,7
 
case ACTIONID_UNDO_PARAMS:
mk.params.use_backup();
success_msg="Settings Undo OK"; // too optimistic
success_msg=l(STRINGID_SETTINGSUNDOOK); // too optimistic
nextstate=STATEID_HANDLE_PARAMS;
chg_state(STATEID_SUCCESS_MSG);
 
/DUBwise/trunk/j2me/src/DUBwiseUIDefinitions.java
47,8 → 47,9
public final static byte STATEID_PARAM_MENU =32;
public final static byte STATEID_PARAM_MASSWRITE =33;
public final static byte STATEID_SELECT_FIRMWARE =34;
public final static byte STATEID_SHOWPHONEGPS =35;
 
public final static byte STATEID_COUNT =35;
public final static byte STATEID_COUNT =36;
 
 
 
93,7 → 94,7
public final static byte ACTIONID_RENAME_PARAMS = 38;
public final static byte ACTIONID_SELECT_FIRMWARE = 39;
public final static byte ACTIONID_UPDATE_DUBWISE = 40;
public final static byte ACTIONID_SHOWPHONEGPS = 41;
public final static byte ACTIONID_QUIT = 100;