summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/lang/english.lang34
-rw-r--r--apps/settings_list.c5
-rw-r--r--firmware/export/tuner.h2
-rw-r--r--firmware/tuner.c18
4 files changed, 53 insertions, 6 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index c7dad66b1a..08412d376d 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12735,3 +12735,37 @@
12735 quickscreen: "Set as Top Quickscreen Item" 12735 quickscreen: "Set as Top Quickscreen Item"
12736 </voice> 12736 </voice>
12737</phrase> 12737</phrase>
12738<phrase>
12739 id: LANG_FM_ITALY
12740 desc: fm region Italy
12741 user: core
12742 <source>
12743 *: none
12744 radio: "Italy"
12745 </source>
12746 <dest>
12747 *: none
12748 radio: "Italy"
12749 </dest>
12750 <voice>
12751 *: none
12752 radio: "Italy"
12753 </voice>
12754</phrase>
12755<phrase>
12756 id: LANG_FM_OTHER
12757 desc: Catch-all FM region. Select if none of the others work
12758 user: core
12759 <source>
12760 *: none
12761 radio: "Other"
12762 </source>
12763 <dest>
12764 *: none
12765 radio: "Other"
12766 </dest>
12767 <voice>
12768 *: none
12769 radio: "Other"
12770 </voice>
12771</phrase>
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 5da15a11a9..2a7bf9658f 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1376,9 +1376,10 @@ const struct settings_list settings[] = {
1376#endif 1376#endif
1377#if CONFIG_TUNER 1377#if CONFIG_TUNER
1378 CHOICE_SETTING(0, fm_region, LANG_FM_REGION, 0, 1378 CHOICE_SETTING(0, fm_region, LANG_FM_REGION, 0,
1379 "fm_region", "eu,us,jp,kr", set_radio_region, 4, 1379 "fm_region", "eu,us,jp,kr,it,wo", set_radio_region, 6,
1380 ID2P(LANG_FM_EUROPE), ID2P(LANG_FM_US), 1380 ID2P(LANG_FM_EUROPE), ID2P(LANG_FM_US),
1381 ID2P(LANG_FM_JAPAN), ID2P(LANG_FM_KOREA)), 1381 ID2P(LANG_FM_JAPAN), ID2P(LANG_FM_KOREA),
1382 ID2P(LANG_FM_ITALY), ID2P(LANG_FM_OTHER)),
1382#endif 1383#endif
1383 1384
1384 OFFON_SETTING(F_BANFROMQS, audioscrobbler, LANG_AUDIOSCROBBLER, false, 1385 OFFON_SETTING(F_BANFROMQS, audioscrobbler, LANG_AUDIOSCROBBLER, false,
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index f92e94269c..b27e660667 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -58,6 +58,8 @@ enum
58 REGION_US_CANADA, 58 REGION_US_CANADA,
59 REGION_JAPAN, 59 REGION_JAPAN,
60 REGION_KOREA, 60 REGION_KOREA,
61 REGION_ITALY,
62 REGION_OTHER,
61 63
62 /* Add new regions above this line */ 64 /* Add new regions above this line */
63 TUNER_NUM_REGIONS 65 TUNER_NUM_REGIONS
diff --git a/firmware/tuner.c b/firmware/tuner.c
index a471c4e970..5fd7fa1f38 100644
--- a/firmware/tuner.c
+++ b/firmware/tuner.c
@@ -28,10 +28,12 @@
28/* General region information */ 28/* General region information */
29const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] = 29const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] =
30{ 30{
31 [REGION_EUROPE] = { 87500000, 108000000, 50000 }, 31 [REGION_EUROPE] = { 87500000, 108000000, 100000 },
32 [REGION_US_CANADA] = { 87900000, 107900000, 200000 }, 32 [REGION_US_CANADA] = { 87900000, 107900000, 200000 },
33 [REGION_JAPAN] = { 76000000, 90000000, 100000 }, 33 [REGION_JAPAN] = { 76000000, 90000000, 100000 },
34 [REGION_KOREA] = { 87500000, 108000000, 100000 } 34 [REGION_KOREA] = { 87500000, 108000000, 200000 },
35 [REGION_ITALY] = { 87500000, 108000000, 50000 },
36 [REGION_OTHER] = { 87500000, 108000000, 50000 }
35}; 37};
36 38
37#ifndef SIMULATOR 39#ifndef SIMULATOR
@@ -46,6 +48,8 @@ const unsigned char lv24020lp_region_data[TUNER_NUM_REGIONS] =
46 [REGION_US_CANADA] = 1, /* 75uS */ 48 [REGION_US_CANADA] = 1, /* 75uS */
47 [REGION_JAPAN] = 0, /* 50uS */ 49 [REGION_JAPAN] = 0, /* 50uS */
48 [REGION_KOREA] = 0, /* 50uS */ 50 [REGION_KOREA] = 0, /* 50uS */
51 [REGION_ITALY] = 0, /* 50uS */
52 [REGION_OTHER] = 0, /* 50uS */
49}; 53};
50#endif /* (CONFIG_TUNER & LV24020LP) */ 54#endif /* (CONFIG_TUNER & LV24020LP) */
51 55
@@ -56,6 +60,8 @@ const struct tea5760_region_data tea5760_region_data[TUNER_NUM_REGIONS] =
56 [REGION_US_CANADA] = { 0, 0 }, /* 75uS, US/Europe band */ 60 [REGION_US_CANADA] = { 0, 0 }, /* 75uS, US/Europe band */
57 [REGION_JAPAN] = { 1, 1 }, /* 50uS, Japanese band */ 61 [REGION_JAPAN] = { 1, 1 }, /* 50uS, Japanese band */
58 [REGION_KOREA] = { 1, 0 }, /* 50uS, US/Europe band */ 62 [REGION_KOREA] = { 1, 0 }, /* 50uS, US/Europe band */
63 [REGION_ITALY] = { 1, 0 }, /* 50uS, US/Europe band */
64 [REGION_OTHER] = { 1, 0 }, /* 50uS, US/Europe band */
59}; 65};
60#endif /* (CONFIG_TUNER & TEA5760) */ 66#endif /* (CONFIG_TUNER & TEA5760) */
61 67
@@ -66,16 +72,20 @@ const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS] =
66 [REGION_US_CANADA] = { 1, 0 }, /* 75uS, US/Europe band */ 72 [REGION_US_CANADA] = { 1, 0 }, /* 75uS, US/Europe band */
67 [REGION_JAPAN] = { 0, 1 }, /* 50uS, Japanese band */ 73 [REGION_JAPAN] = { 0, 1 }, /* 50uS, Japanese band */
68 [REGION_KOREA] = { 0, 0 }, /* 50uS, US/Europe band */ 74 [REGION_KOREA] = { 0, 0 }, /* 50uS, US/Europe band */
75 [REGION_ITALY] = { 0, 0 }, /* 50uS, US/Europe band */
76 [REGION_OTHER] = { 0, 0 }, /* 50uS, US/Europe band */
69}; 77};
70#endif /* (CONFIG_TUNER & TEA5767) */ 78#endif /* (CONFIG_TUNER & TEA5767) */
71 79
72#if (CONFIG_TUNER & SI4700) 80#if (CONFIG_TUNER & SI4700)
73const struct si4700_region_data si4700_region_data[TUNER_NUM_REGIONS] = 81const struct si4700_region_data si4700_region_data[TUNER_NUM_REGIONS] =
74{ 82{
75 [REGION_EUROPE] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */ 83 [REGION_EUROPE] = { 1, 0, 1 }, /* 50uS, US/Europe band, 100kHz spacing */
76 [REGION_US_CANADA] = { 0, 0, 0 }, /* 75uS, US/Europe band, 200kHz spacing */ 84 [REGION_US_CANADA] = { 0, 0, 0 }, /* 75uS, US/Europe band, 200kHz spacing */
77 [REGION_JAPAN] = { 1, 2, 1 }, /* 50uS, Japanese band, 100kHz spacing */ 85 [REGION_JAPAN] = { 1, 2, 1 }, /* 50uS, Japanese band, 100kHz spacing */
78 [REGION_KOREA] = { 1, 0, 1 }, /* 50uS, US/Europe band, 100kHz spacing */ 86 [REGION_KOREA] = { 1, 0, 0 }, /* 50uS, US/Europe band, 200kHz spacing */
87 [REGION_ITALY] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */
88 [REGION_OTHER] = { 1, 0, 2 }, /* 50uS, US/Europe band, 50kHz spacing */
79}; 89};
80#endif /* (CONFIG_TUNER & SI4700) */ 90#endif /* (CONFIG_TUNER & SI4700) */
81 91