Skip to content

Commit 7f376c3

Browse files
arthurbenemannarthurbenemann
committed
Merge branch 'master' into beta
Conflicts: Android/src/org/droidplanner/android/activities/ConfigurationActivity.java
2 parents 79753f5 + 47eccc9 commit 7f376c3

File tree

83 files changed

+5807
-558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+5807
-558
lines changed

‎Android/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
package="org.droidplanner"
5-
android:versionCode="93"
5+
android:versionCode="94"
66
android:versionName="please run version.sh to get the version name">
77

88
<uses-sdk

‎Android/res/drawable-hdpi/ic_action_radio.png‎

1.38 KB
Loading

‎Android/res/drawable-mdpi/ic_action_radio.png‎

893 Bytes
Loading

‎Android/res/drawable-xhdpi/ic_action_radio.png‎

1.22 KB
Loading

‎Android/res/layout-port/fragment_tuning.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,15 @@
191191
android:layout_height="wrap_content"
192192
android:layout_marginRight="16dp"
193193
android:background="@drawable/button_blue"
194-
android:text="Reset"/>
194+
android:text="@string/button_setup_reset"/>
195195

196196
<Button
197197
android:id="@+id/button2"
198198
style="@style/modeControl"
199199
android:layout_width="@dimen/setup_action_button_width"
200200
android:layout_height="wrap_content"
201201
android:background="@drawable/button_green"
202-
android:text="Send"/>
202+
android:text="@string/button_setup_send"/>
203203
</LinearLayout>
204204

205205
</LinearLayout>

‎Android/res/layout/fragment_tuning.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
style="@style/modeControl"
183183
android:layout_width="@dimen/setup_action_button_width"
184184
android:layout_height="wrap_content"
185-
android:text="Reset"
185+
android:text="@string/button_setup_reset"
186186
android:layout_marginRight="16dp"
187187
android:background="@drawable/button_blue"
188188
/>
@@ -193,7 +193,7 @@
193193
android:layout_width="@dimen/setup_action_button_width"
194194
android:layout_height="wrap_content"
195195
android:background="@drawable/button_green"
196-
android:text="Send"/>
196+
android:text="@string/button_setup_send"/>
197197
</LinearLayout>
198198

199199
</RelativeLayout>

‎Android/res/values-de/strings.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@
331331
<!-- Text To Speech -->
332332
<string name="pref_title_tts">Sprachausgabe</string>
333333
<string name="pref_title_tts_periodic">Periodisch</string>
334+
<string name="pref_title_tts_periodic_status">Intervall Meldungen</string>
334335
<string name="pref_tts_periodic_summary">Was ist in dem periodischen Status enthalten?</string>
335336
<string name="pref_tts_periodic_period">Periode</string>
336337
<string name="pref_tts_periodic_period_summary">Wie oft der periodische Status gelesen wird.</string>
@@ -342,6 +343,19 @@
342343
<string name="pref_tts_periodic_rssi_summary">"Received Signal Strength Indication" lesen.</string>
343344
<string name="pref_tts_periodic_airspeed">Fluggeschwindigkeit</string>
344345
<string name="pref_tts_periodic_airspeed_summary">Fluggeschwindigkeit lesen.</string>
346+
<string name="pref_title_tts_warnings">Warnungen</string>
347+
<string name="pref_tts_warning_solar_activity">Sonnenaktivität</string>
348+
<string name="pref_tts_warning_solar_activity_summary">Warnt vor hoher Sonnenaktivität, die GPS-Genauigkeit verringern könnte.</string>
349+
<string name="pref_tts_warning_wind_speed">Windgeschwindigkeit</string>
350+
<string name="pref_tts_warning_wind_speed_summary">Warnt vor hoher Windgeschwindigkeit, die Flug schwer machen könnte.</string>
351+
<string name="pref_tts_warning_400ft_ceiling_exceeded">400 fuss überschritten</string>
352+
<string name="pref_tts_warning_400ft_ceiling_exceeded_summary">In den Vereinigten Staaten ist es oft illegal höher als 400 fuss zu fliegen.</string>
353+
<string name="pref_tts_warning_low_signal_strength">Schwaches Signal</string>
354+
<string name="pref_tts_warning_low_signal_strength_summary">Warnt wenn die verbindung zur Drohne schlecht ist.</string>
355+
<string name="pref_tts_warning_lost_signal">Verbindungsstatus</string>
356+
<string name="pref_tts_warning_lost_signal_summary">Warnt wenn die Verbindung zur Drohne getrennt oder wiederhergestellt wird.</string>
357+
<string name="pref_tts_warning_autopilot_warnings">Warnungen vom Autopilot</string>
358+
<string name="pref_tts_warning_autopilot_warnings_summary">Warnt vor Scharfstellfehler, leere Batterien, usw.</string>
345359

346360
<!-- Droneshare -->
347361
<string name="dsheader">Wären Sie daran interessiert die kostenlose www.Droneshare.com Service zu benutzen?</string>

‎Android/res/values-zh-rTW/strings.xml‎

Lines changed: 463 additions & 0 deletions
Large diffs are not rendered by default.

‎Android/res/values/strings.xml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,12 @@
105105
<string name="storage_folder">Storage Folder</string>
106106
<string name="pref_live_upload">Enable live upload (ALPHA TEST)</string>
107107
<string name="pref_live_upload_summary">Live vehicle monitoring on Droneshare</string>
108-
108+
109+
<!-- Toast Message -->
110+
<string name="user_autopan_long_press">Long press to activate user auto panning.</string>
111+
<string name="drone_autopan_long_press">Long press to activate drone auto panning.</string>
112+
<string name="drone_no_location">No drone location available</string>
113+
109114
<!-- Connection State -->
110115
<string name="menu_connect">Connect</string>
111116
<string name="menu_disconnect">Disconnect</string>
@@ -117,6 +122,7 @@
117122
<string name="button_setup_cancel">Cancel</string>
118123
<string name="button_setup_send">Send</string>
119124
<string name="button_setup_next">Next</string>
125+
<string name="button_setup_reset">Reset</string>
120126
<string name="button_setup_done">Done</string>
121127
<string name="Pause">Pause</string>
122128
<string name="dialog_box_btn_txt_ok">OK</string>
@@ -455,6 +461,11 @@
455461

456462
<string name="pref_ui_gps_hdop_summary">Display HDOP instead of FIX in satellite info bar item</string>
457463
<string name="pref_ui_gps_hdop_title">Display Satellite HDOP</string>
464+
458465
<string name="status_disconnecting">Disconnecting...</string>
459466
<string name="status_connecting">Connecting...</string>
467+
468+
<!-- Help -->
469+
<string name="help_item_description">How to plan and fly a mission</string>
470+
460471
</resources>

‎Android/res/xml-zh-rTW/checklist_default.xml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<preflightcheck
3+
title="Pre-Flight Checklist"
4+
type="APM"
5+
version="1" >
6+
<category label="使用者檢查清單" >
7+
<check_item
8+
description="確認相機已連接且打開電源"
9+
editable="yes"
10+
mandatory="yes"
11+
title="相機已連接、打開電源" />
12+
</category>
13+
<category label="控制面板" >
14+
<check_item
15+
description="確認控制面板在正確的方向"
16+
editable="yes"
17+
mandatory="yes"
18+
title="副翼(Aileron)" />
19+
<check_item
20+
description="確認控制面板在正確的方向"
21+
editable="yes"
22+
mandatory="yes"
23+
title="升降舵(Elevator)" />
24+
<check_item
25+
description="確認控制面板在正確的方向"
26+
editable="yes"
27+
mandatory="yes"
28+
title="方向舵(Rudder)" />
29+
</category>
30+
<category label="系統檢查清單" >
31+
<switch_item
32+
description="數傳連線狀況"
33+
editable="yes"
34+
mandatory="yes"
35+
system_tag="SYS_CONNECTION_STATE"
36+
title="連結數傳" />
37+
<value_item
38+
description="顯示預設高度"
39+
editable="yes"
40+
mandatory="yes"
41+
minimum_val="10"
42+
nominal_val="20"
43+
system_tag="SYS_DEF_ALT"
44+
title="預設高度"
45+
unit="%0.2fm" />
46+
<level_item
47+
description="顯示 GPS 衛星數量"
48+
editable="no"
49+
mandatory="yes"
50+
maximum_val="8"
51+
minimum_val="5"
52+
nominal_val="6"
53+
system_tag="SYS_GPS3D_LVL"
54+
title="GPS(3D) 衛星數量"
55+
unit="%.0f Sats." />
56+
<level_item
57+
description="顯示電池電量"
58+
editable="no"
59+
mandatory="yes"
60+
maximum_val="100"
61+
minimum_val="75"
62+
nominal_val="80"
63+
system_tag="SYS_BATTREM_LVL"
64+
title="電池電量"
65+
unit="%.1f%%" />
66+
<level_item
67+
description="顯示電池伏特數"
68+
editable="no"
69+
mandatory="yes"
70+
maximum_val="13"
71+
minimum_val="10.5"
72+
nominal_val="11.1"
73+
system_tag="SYS_BATTVOL_LVL"
74+
title="電池伏特數"
75+
unit="%.1fV" />
76+
<level_item
77+
description="顯示電池電流"
78+
editable="no"
79+
mandatory="yes"
80+
maximum_val="20"
81+
minimum_val="5"
82+
nominal_val="10"
83+
system_tag="SYS_BATTCUR_LVL"
84+
title="電池電流"
85+
unit="%.1fA" />
86+
</category>
87+
</preflightcheck>

0 commit comments

Comments
 (0)