Skip to content

Added a failsafe behavior. #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
psigen wants to merge 13 commits into
base: feature/onetouch
Choose a base branch
from
Open

Added a failsafe behavior. #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
80ee2a4
Added a failsafe behavior.
psigen Apr 21, 2016
7e6f5bb
Simplified logic and disabled failsafe if autonomous plan is running.
psigen Apr 21, 2016
be7faa2
Fixed missing dependency in preferences panel.
psigen Apr 21, 2016
ce38020
Updated timeout settings and fixed bug in start/stop sequence.
psigen Apr 21, 2016
484a9e8
Fixed swapped boolean state for failsafe running check.
psigen Apr 21, 2016
39a17b8
Added 15 second option for failsafe.
psigen Apr 23, 2016
9a2590d
Removed leftover comments.
psigen Apr 23, 2016
0fd06e3
Removed more comment cruft.
psigen Apr 23, 2016
94fa024
Added fixes for Failsafe logic (including fixed ping).
psigen Apr 23, 2016
0b87b73
Fixed minor bug where shutting down server didn't clear failsafe text.
psigen Apr 23, 2016
e2b6b59
Fixed massive bug in null being passed to startWaypoints.
psigen Apr 23, 2016
3288be9
Added minor change to interrupt running Failsafe on shutdown.
psigen Apr 23, 2016
53a48fb
Merge branch 'feature/onetouch' into feature/failsafe
psigen May 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions res/layout/fragment_launcher.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,16 @@
android:singleLine="true"
android:text="@string/launcher_swipe_right_text_content" />
</RelativeLayout>

<TextView
android:id="@+id/launcher_failsafe_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:textStyle="bold"
android:textSize="24sp"
android:textColor="#F00"
android:visibility="invisible"
android:text="@string/launcher_failsafe_text_content" />
</RelativeLayout>
1 change: 1 addition & 0 deletions res/values/strings_launcher_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<string name="launcher_home_text_content">[No Home Position]</string>
<string name="launcher_ip_text_content">[IP Address]</string>
<string name="launcher_home_text_format">[HOME] Lat: <b>%1$f</b>, Lon: <b>%2$f</b></string>
<string name="launcher_failsafe_text_content">Failsafe Engaged</string>
<string name="launcher_swipe_left_text_content">Swipe left for settings.</string>
<string name="launcher_swipe_right_text_content">Swipe right for debugging.</string>
</resources>
12 changes: 7 additions & 5 deletions res/values/strings_preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@
<string name="pref_failsafe_timeout_summary">Set the maximum time without connectivity until failsafe activates.</string>
<string name="pref_failsafe_timeout_default">120</string>
<string-array name="pref_failsafe_timeout_entries">
<item>15 seconds</item>
<item>30 seconds</item>
<item>1 minute</item>
<item>2 minutes</item>
<item>5 minutes</item>
<item>10 minutes</item>
</string-array>
<string-array name="pref_failsafe_timeout_values">
<item>30</item>
<item>60</item>
<item>120</item>
<item>300</item>
<item>600</item>
<item>15000</item>
<item>30000</item>
<item>60000</item>
<item>120000</item>
<item>300000</item>
<item>600000</item>
</string-array>
<string name="pref_vehicle_category_title">Vehicle Configuration</string>
<string name="pref_vehicle_type_title">Vehicle Type</string>
Expand Down
1 change: 1 addition & 0 deletions res/xml/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
android:title="@string/pref_failsafe_addr_title" />
<ListPreference
android:defaultValue="@string/pref_failsafe_timeout_default"
android:dependency="pref_failsafe_enable"
android:dialogTitle="@string/pref_failsafe_timeout_title"
android:entries="@array/pref_failsafe_timeout_entries"
android:entryValues="@array/pref_failsafe_timeout_values"
Expand Down
Loading