nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add wheel diamater configuration

Browse Source
This commit is contained in:
Chet Henry
2014-12-01 21:29:31 -07:00
parent f00c2deb1f
commit 4000453d03
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/RideLogger/res/values/strings.xml
View File

@@ -75,6 +75,8 @@
<string name="setting_sensors_title">Display Sensors</string> <string name="setting_sensors_title">Display Sensors</string>
<string name="setting_sensors_note">List of Sensors Display</string> <string name="setting_sensors_note">List of Sensors Display</string>
<string name="setting_wheel_size">Wheel Diamater in Meters</string>
<string name="imperial_units_title">Imperial Units</string> <string name="imperial_units_title">Imperial Units</string>
<string name="imperial_units_note">Show Measurements in Imperial Units</string> <string name="imperial_units_note">Show Measurements in Imperial Units</string>
@@ -90,5 +92,6 @@
<string name="PREF_TRACKING_SENSORS">TrackingSensors</string> <string name="PREF_TRACKING_SENSORS">TrackingSensors</string>
<string name="PREF_TRACKING_SIZE">TrackingSize</string> <string name="PREF_TRACKING_SIZE">TrackingSize</string>
<string name="PREF_TRACKING_IMPERIAL_UNITS">TrackingImperialUnits</string> <string name="PREF_TRACKING_IMPERIAL_UNITS">TrackingImperialUnits</string>
<string name="PREF_WHEEL_SIZE">WheelSize</string>
</resources> </resources>

6
contrib/RideLogger/res/xml/ant_settings.xml
View File

@@ -8,6 +8,12 @@
android:title="@string/ant_pair_dialog_title" android:title="@string/ant_pair_dialog_title"
android:summary="@string/ant_pair_dialog_button_note" android:summary="@string/ant_pair_dialog_button_note"
/> />
<EditTextPreference
android:key="@string/PREF_WHEEL_SIZE"
android:title="@string/setting_wheel_size"
android:defaultValue="2.07"
/>
</PreferenceCategory> </PreferenceCategory>

1
contrib/RideLogger/src/com/ridelogger/SettingsActivity.java
View File

@@ -122,7 +122,6 @@ public class SettingsActivity extends PreferenceActivity {
timer.schedule( timer.schedule(
new TimerTask() { new TimerTask() {
@Override @Override
public void run() { public void run() {
if(mMultiSelectListPreference.getEntryValues().length > 0) { if(mMultiSelectListPreference.getEntryValues().length > 0) {

7
contrib/RideLogger/src/com/ridelogger/listners/Power.java
View File

@@ -1,4 +1,5 @@
package com.ridelogger.listners; package com.ridelogger.listners;
import android.preference.PreferenceManager;
import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc; import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc;
import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.CalculatedWheelDistanceReceiver; import com.dsi.ant.plugins.antplus.pcc.AntPlusBikePowerPcc.CalculatedWheelDistanceReceiver;
@@ -14,7 +15,7 @@ import com.dsi.ant.plugins.antplus.pcc.defines.EventFlag;
import com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult; import com.dsi.ant.plugins.antplus.pcc.defines.RequestAccessResult;
import com.dsi.ant.plugins.antplus.pccbase.AntPluginPcc.IPluginAccessResultReceiver; import com.dsi.ant.plugins.antplus.pccbase.AntPluginPcc.IPluginAccessResultReceiver;
import com.dsi.ant.plugins.antplus.pccbase.MultiDeviceSearch.MultiDeviceSearchResult; import com.dsi.ant.plugins.antplus.pccbase.MultiDeviceSearch.MultiDeviceSearchResult;
import com.ridelogger.R;
import com.ridelogger.RideService; import com.ridelogger.RideService;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -27,18 +28,20 @@ import java.util.EnumSet;
*/ */
public class Power extends Ant public class Power extends Ant
{ {
public BigDecimal wheelCircumferenceInMeters = new BigDecimal("2.07"); //size of wheel to calculate speed public BigDecimal wheelCircumferenceInMeters; //size of wheel to calculate speed
//setup listeners and logging //setup listeners and logging
public Power(MultiDeviceSearchResult result, RideService mContext) { public Power(MultiDeviceSearchResult result, RideService mContext) {
super(result, mContext); super(result, mContext);
releaseHandle = AntPlusBikePowerPcc.requestAccess(context, result.getAntDeviceNumber(), 0, mResultReceiver, mDeviceStateChangeReceiver); releaseHandle = AntPlusBikePowerPcc.requestAccess(context, result.getAntDeviceNumber(), 0, mResultReceiver, mDeviceStateChangeReceiver);
wheelCircumferenceInMeters = new BigDecimal(PreferenceManager.getDefaultSharedPreferences(context).getString(context.getString(R.string.PREF_DETECT_CRASH), "2.07"));
} }
public Power(MultiDeviceSearchResult result, RideService mContext, Boolean psnoop) { public Power(MultiDeviceSearchResult result, RideService mContext, Boolean psnoop) {
super(result, mContext, psnoop); super(result, mContext, psnoop);
releaseHandle = AntPlusBikePowerPcc.requestAccess(context, result.getAntDeviceNumber(), 0, mResultReceiver, mDeviceStateChangeReceiver); releaseHandle = AntPlusBikePowerPcc.requestAccess(context, result.getAntDeviceNumber(), 0, mResultReceiver, mDeviceStateChangeReceiver);
wheelCircumferenceInMeters = new BigDecimal(PreferenceManager.getDefaultSharedPreferences(context).getString(context.getString(R.string.PREF_DETECT_CRASH), "2.07"));
} }