xdsopl/robot36
1
0
Fork 0
mirror of https://github.com/xdsopl/robot36.git synced 2026-01-28 18:34:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved root menu, selecting mode disables auto mode

Browse source
This commit is contained in:
Ahmet Inan 2015-02-25 12:49:25 +01:00
parent bb2cfdfce6
commit 926d13a5e3
6 changed files with 57 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/xdsopl/robot36/Decoder.java
View file

@ -162,24 +162,24 @@ public class Decoder {
void toggle_scaling() { image.intScale ^= true; }
void adjust_blur(int blur) { rsDecoder.invoke_adjust_blur(blur); }
void toggle_debug() { rsDecoder.invoke_toggle_debug(); }
void toggle_auto() { rsDecoder.invoke_toggle_auto(); }
void enable_analyzer(boolean enable) { rsDecoder.invoke_enable_analyzer((enableAnalyzer = enable) ? 1 : 0); }
void raw_mode() { rsDecoder.invoke_raw_mode(); }
void robot36_mode() { rsDecoder.invoke_robot36_mode(); }
void robot72_mode() { rsDecoder.invoke_robot72_mode(); }
void martin1_mode() { rsDecoder.invoke_martin1_mode(); }
void martin2_mode() { rsDecoder.invoke_martin2_mode(); }
void scottie1_mode() { rsDecoder.invoke_scottie1_mode(); }
void scottie2_mode() { rsDecoder.invoke_scottie2_mode(); }
void scottieDX_mode() { rsDecoder.invoke_scottieDX_mode(); }
void wraaseSC2_180_mode() { rsDecoder.invoke_wraaseSC2_180_mode(); }
void pd50_mode() { rsDecoder.invoke_pd50_mode(); }
void pd90_mode() { rsDecoder.invoke_pd90_mode(); }
void pd120_mode() { rsDecoder.invoke_pd120_mode(); }
void pd160_mode() { rsDecoder.invoke_pd160_mode(); }
void pd180_mode() { rsDecoder.invoke_pd180_mode(); }
void pd240_mode() { rsDecoder.invoke_pd240_mode(); }
void pd290_mode() { rsDecoder.invoke_pd290_mode(); }
void auto_mode() { rsDecoder.invoke_auto_mode(1); }
void raw_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_raw_mode(); }
void robot36_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_robot36_mode(); }
void robot72_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_robot72_mode(); }
void martin1_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_martin1_mode(); }
void martin2_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_martin2_mode(); }
void scottie1_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_scottie1_mode(); }
void scottie2_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_scottie2_mode(); }
void scottieDX_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_scottieDX_mode(); }
void wraaseSC2_180_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_wraaseSC2_180_mode(); }
void pd50_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_pd50_mode(); }
void pd90_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_pd90_mode(); }
void pd120_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_pd120_mode(); }
void pd160_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_pd160_mode(); }
void pd180_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_pd180_mode(); }
void pd240_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_pd240_mode(); }
void pd290_mode() { rsDecoder.invoke_auto_mode(0); rsDecoder.invoke_pd290_mode(); }
int freeRunReserve(int height) { return (height * 3) / 2; }
void setUpdateRate(int rate) { updateRate = Math.max(0, Math.min(4, rate)); }

4
app/src/main/java/xdsopl/robot36/MainActivity.java
View file

@ -254,8 +254,8 @@ public class MainActivity extends Activity {
case R.id.action_toggle_debug:
decoder.toggle_debug();
return true;
case R.id.action_toggle_auto:
decoder.toggle_auto();
case R.id.action_auto_mode:
decoder.auto_mode();
return true;
case R.id.action_toggle_analyzer:
decoder.enable_analyzer(enableAnalyzer ^= true);

62
app/src/main/res/menu/menu_main.xml
View file

@ -37,11 +37,6 @@
<item android:id="@+id/action_softest_image" android:title="@string/action_softest_image" />
</menu></item>
<item android:id="@+id/action_toggle_scaling" android:title="@string/action_toggle_scaling" />
<item android:id="@+id/action_toggle_debug" android:title="@string/action_toggle_debug" />
<item android:id="@+id/action_toggle_auto" android:title="@string/action_toggle_auto" />
<item android:id="@+id/action_toggle_analyzer" android:title="@string/action_toggle_analyzer" />
<item android:title="@string/update_rate"><menu>
<item android:id="@+id/action_slow_update_rate" android:title="@string/action_slow_update_rate" />
<item android:id="@+id/action_normal_update_rate" android:title="@string/action_normal_update_rate" />
@ -50,32 +45,39 @@
<item android:id="@+id/action_fastest_update_rate" android:title="@string/action_fastest_update_rate" />
</menu></item>
<item android:id="@+id/action_raw_mode" android:title="@string/action_raw_mode" />
<item android:id="@+id/action_auto_mode" android:title="@string/action_auto_mode" />
<item android:title="@string/robot_modes"><menu>
<item android:id="@+id/action_robot36_mode" android:title="@string/action_robot36_mode" />
<item android:id="@+id/action_robot72_mode" android:title="@string/action_robot72_mode" />
</menu></item>
<item android:title="@string/pd_modes"><menu>
<item android:id="@+id/action_pd50_mode" android:title="@string/action_pd50_mode" />
<item android:id="@+id/action_pd90_mode" android:title="@string/action_pd90_mode" />
<item android:id="@+id/action_pd120_mode" android:title="@string/action_pd120_mode" />
<item android:id="@+id/action_pd160_mode" android:title="@string/action_pd160_mode" />
<item android:id="@+id/action_pd180_mode" android:title="@string/action_pd180_mode" />
<item android:id="@+id/action_pd240_mode" android:title="@string/action_pd240_mode" />
<item android:id="@+id/action_pd290_mode" android:title="@string/action_pd290_mode" />
</menu></item>
<item android:title="@string/martin_modes"><menu>
<item android:id="@+id/action_martin1_mode" android:title="@string/action_martin1_mode" />
<item android:id="@+id/action_martin2_mode" android:title="@string/action_martin2_mode" />
</menu></item>
<item android:title="@string/scottie_modes"><menu>
<item android:id="@+id/action_scottie1_mode" android:title="@string/action_scottie1_mode" />
<item android:id="@+id/action_scottie2_mode" android:title="@string/action_scottie2_mode" />
<item android:id="@+id/action_scottieDX_mode" android:title="@string/action_scottieDX_mode" />
</menu></item>
<item android:title="@string/wraase_modes"><menu>
<item android:id="@+id/action_wraaseSC2_180_mode" android:title="@string/action_wraaseSC2_180_mode" />
<item android:title="@string/select_mode"><menu>
<item android:id="@+id/action_raw_mode" android:title="@string/action_raw_mode" />
<item android:title="@string/robot_modes"><menu>
<item android:id="@+id/action_robot36_mode" android:title="@string/action_robot36_mode" />
<item android:id="@+id/action_robot72_mode" android:title="@string/action_robot72_mode" />
</menu></item>
<item android:title="@string/pd_modes"><menu>
<item android:id="@+id/action_pd50_mode" android:title="@string/action_pd50_mode" />
<item android:id="@+id/action_pd90_mode" android:title="@string/action_pd90_mode" />
<item android:id="@+id/action_pd120_mode" android:title="@string/action_pd120_mode" />
<item android:id="@+id/action_pd160_mode" android:title="@string/action_pd160_mode" />
<item android:id="@+id/action_pd180_mode" android:title="@string/action_pd180_mode" />
<item android:id="@+id/action_pd240_mode" android:title="@string/action_pd240_mode" />
<item android:id="@+id/action_pd290_mode" android:title="@string/action_pd290_mode" />
</menu></item>
<item android:title="@string/martin_modes"><menu>
<item android:id="@+id/action_martin1_mode" android:title="@string/action_martin1_mode" />
<item android:id="@+id/action_martin2_mode" android:title="@string/action_martin2_mode" />
</menu></item>
<item android:title="@string/scottie_modes"><menu>
<item android:id="@+id/action_scottie1_mode" android:title="@string/action_scottie1_mode" />
<item android:id="@+id/action_scottie2_mode" android:title="@string/action_scottie2_mode" />
<item android:id="@+id/action_scottieDX_mode" android:title="@string/action_scottieDX_mode" />
</menu></item>
<item android:title="@string/wraase_modes"><menu>
<item android:id="@+id/action_wraaseSC2_180_mode" android:title="@string/action_wraaseSC2_180_mode" />
</menu></item>
</menu></item>
<item android:id="@+id/action_toggle_debug" android:title="@string/action_toggle_debug" />
<item android:id="@+id/action_toggle_scaling" android:title="@string/action_toggle_scaling" />
<item android:id="@+id/action_toggle_analyzer" android:title="@string/action_toggle_analyzer" />
</group>
</menu>

5
app/src/main/res/values-de/strings.xml
View file

@ -5,7 +5,6 @@
<string name="action_save_image">Bild speichern</string>
<string name="action_clear_image">Bild löschen</string>
<string name="action_toggle_decoder">Dekodierer umschalten</string>
<string name="action_toggle_auto">Automatik umschalten</string>
<string name="action_toggle_debug">Bildanalyse umschalten</string>
<string name="action_toggle_analyzer">Analysator umschalten</string>
<string name="update_rate">Bildwiederholrate</string>
@ -14,6 +13,8 @@
<string name="action_fast_update_rate">schnell</string>
<string name="action_faster_update_rate">schneller</string>
<string name="action_fastest_update_rate">am schnellsten</string>
<string name="action_auto_mode">Automatik Modus</string>
<string name="select_mode">Modus auswählen</string>
<string name="action_raw_mode">Roh Modus</string>
<string name="action_robot36_mode">Robot36 Modus</string>
<string name="action_robot72_mode">Robot72 Modus</string>
@ -30,7 +31,7 @@
<string name="action_scottie2_mode">Scottie2 Modus</string>
<string name="action_scottieDX_mode">ScottieDX Modus</string>
<string name="action_wraaseSC2_180_mode">WraaseSC2 180 Modus</string>
<string name="image_sharpness">Bildschärfe Anpassen</string>
<string name="image_sharpness">Bildschärfe anpassen</string>
<string name="action_sharpest_image">am schärfsten</string>
<string name="action_sharper_image">schärfer</string>
<string name="action_sharp_image">scharf</string>

3
app/src/main/res/values/strings.xml
View file

@ -5,7 +5,6 @@
<string name="action_save_image">Save Image</string>
<string name="action_clear_image">Clear Image</string>
<string name="action_toggle_decoder">Toggle Decoder</string>
<string name="action_toggle_auto">Toggle Auto Mode</string>
<string name="action_toggle_debug">Toggle Debug Mode</string>
<string name="action_toggle_analyzer">Toggle Analyzer</string>
<string name="update_rate">Update Rate</string>
@ -14,6 +13,8 @@
<string name="action_fast_update_rate">fast</string>
<string name="action_faster_update_rate">faster</string>
<string name="action_fastest_update_rate">fastest</string>
<string name="action_auto_mode">Auto Mode</string>
<string name="select_mode">Select Mode</string>
<string name="action_raw_mode">Raw Mode</string>
<string name="action_robot36_mode">Robot36 Mode</string>
<string name="action_robot72_mode">Robot72 Mode</string>

2
app/src/main/rs/modes.rsh
View file

@ -22,7 +22,7 @@ limitations under the License.
#include "exports.rsh"
static int freerun_reserve(int height) { return (height * 3) / 2; }
void toggle_auto() { automatic_mode_detection ^= 1; }
void auto_mode(int mode) { automatic_mode_detection = mode; }
void toggle_debug() { debug_mode ^= 1; }
void raw_mode()