Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xduoox3: Include curves for both battery types

Browse source 
There is no way to detect this at runtime so it is a user setting

Change-Id: Ibc5b87312238c59e3678d512af27e3a3bcb9a58a
This commit is contained in:
Solomon Peachy 2020-08-26 13:55:14 -04:00
parent f4bf27c26e
commit a52eb1d8cc
49 changed files with 128 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/lang/arabic.lang
View file

@ -3728,7 +3728,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>

4
apps/lang/basque.lang
View file

@ -3771,7 +3771,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3788,7 +3788,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/bulgarian.lang
View file

@ -3777,7 +3777,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3794,7 +3794,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/catala.lang
View file

@ -3768,7 +3768,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3785,7 +3785,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/chinese-simp.lang
View file

@ -3569,7 +3569,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3586,7 +3586,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/chinese-trad.lang
View file

@ -3568,7 +3568,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3585,7 +3585,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/czech.lang
View file

@ -3780,7 +3780,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3797,7 +3797,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/dansk.lang
View file

@ -2993,7 +2993,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3010,7 +3010,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/deutsch.lang
View file

@ -3780,7 +3780,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3797,7 +3797,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/eesti.lang
View file

@ -3257,7 +3257,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3271,7 +3271,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

10
apps/lang/english-us.lang
View file

@ -3561,37 +3561,43 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
*: none
battery_types: "Alkaline"
xduoox3: "Newer (2000 mAh)"
</source>
<dest>
*: none
battery_types: "Alkaline"
xduoox3: "Newer (2000 mAh)"
</dest>
<voice>
*: none
battery_types: "Alkaline"
xduoox3: "Newer 2000 milliamp hour"
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>
*: none
battery_types: "NiMH"
xduoox3: "Older (1500 mAh)"
</source>
<dest>
*: none
battery_types: "NiMH"
xduoox3: "Older (1500 mAh)"
</dest>
<voice>
*: none
battery_types: "Nickel metal hydride"
xduoox3: "Older 1500 milliamp hour"
</voice>
</phrase>
<phrase>

10
apps/lang/english.lang
View file

@ -3640,37 +3640,43 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
*: none
battery_types: "Alkaline"
xduoox3: "Newer (2000 mAh)"
</source>
<dest>
*: none
battery_types: "Alkaline"
xduoox3: "Newer (2000 mAh)"
</dest>
<voice>
*: none
battery_types: "Alkaline"
xduoox3: "Newer 2000 milliamp hour"
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>
*: none
battery_types: "NiMH"
xduoox3: "Older (1500 mAh)"
</source>
<dest>
*: none
battery_types: "NiMH"
xduoox3: "Older (1500 mAh)"
</dest>
<voice>
*: none
battery_types: "Nickel metal hydride"
xduoox3: "Older 1500 milliamp hour"
</voice>
</phrase>
<phrase>

4
apps/lang/espanol.lang
View file

@ -2237,7 +2237,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -2254,7 +2254,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/esperanto.lang
View file

@ -3499,7 +3499,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3513,7 +3513,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/finnish.lang
View file

@ -3568,7 +3568,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3585,7 +3585,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/francais.lang
View file

@ -3622,7 +3622,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3639,7 +3639,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/galego.lang
View file

@ -2214,7 +2214,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -2231,7 +2231,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/greek.lang
View file

@ -3763,7 +3763,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3780,7 +3780,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/hebrew.lang
View file

@ -3779,7 +3779,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3796,7 +3796,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/hrvatski.lang
View file

@ -3770,7 +3770,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3787,7 +3787,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/islenska.lang
View file

@ -2548,7 +2548,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -2565,7 +2565,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/italiano.lang
View file

@ -3563,7 +3563,7 @@ desc: deprecated
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3580,7 +3580,7 @@ desc: deprecated
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/japanese.lang
View file

@ -3779,7 +3779,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3796,7 +3796,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/korean.lang
View file

@ -3579,7 +3579,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3596,7 +3596,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/latviesu.lang
View file

@ -3773,7 +3773,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3790,7 +3790,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/lietuviu.lang
View file

@ -3837,7 +3837,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3854,7 +3854,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/magyar.lang
View file

@ -3749,7 +3749,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3766,7 +3766,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/nederlands.lang
View file

@ -3580,7 +3580,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3597,7 +3597,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/norsk-nynorsk.lang
View file

@ -3515,7 +3515,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3532,7 +3532,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/norsk.lang
View file

@ -2998,7 +2998,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3015,7 +3015,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/polski.lang
View file

@ -3570,7 +3570,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3587,7 +3587,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/portugues-brasileiro.lang
View file

@ -3772,7 +3772,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3789,7 +3789,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/portugues.lang
View file

@ -3357,7 +3357,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3374,7 +3374,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/romaneste.lang
View file

@ -2890,7 +2890,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -6298,7 +6298,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/russian.lang
View file

@ -3393,7 +3393,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3410,7 +3410,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/slovak.lang
View file

@ -3562,7 +3562,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3579,7 +3579,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/slovenscina.lang
View file

@ -3335,7 +3335,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -7200,7 +7200,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/srpski.lang
View file

@ -3759,7 +3759,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3776,7 +3776,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/svenska.lang
View file

@ -3779,7 +3779,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3796,7 +3796,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/tagalog.lang
View file

@ -3755,7 +3755,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3772,7 +3772,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/thai.lang
View file

@ -3739,7 +3739,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3756,7 +3756,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/turkce.lang
View file

@ -10262,7 +10262,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>
@ -13368,7 +13368,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>

4
apps/lang/ukrainian.lang
View file

@ -3771,7 +3771,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3788,7 +3788,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/vlaams.lang
View file

@ -3576,7 +3576,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3593,7 +3593,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

4
apps/lang/walon.lang
View file

@ -3776,7 +3776,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_ALKALINE
id: LANG_BATTERY_TYPE_1
desc: in battery settings
user: core
<source>
@ -3793,7 +3793,7 @@
</voice>
</phrase>
<phrase>
id: LANG_BATTERY_TYPE_NIMH
id: LANG_BATTERY_TYPE_2
desc: in battery settings
user: core
<source>

8
apps/settings_list.c
View file

@ -1050,8 +1050,12 @@ const struct settings_list settings[] = {
#if BATTERY_TYPES_COUNT > 1
CHOICE_SETTING(0, battery_type, LANG_BATTERY_TYPE, 0, "battery type",
"alkaline,nimh", NULL, 2, ID2P(LANG_BATTERY_TYPE_ALKALINE),
ID2P(LANG_BATTERY_TYPE_NIMH)),
#ifdef XDUOO_X3
"new_2000mAh,old_1500mAh",
#else
"alkaline,nimh",
#endif
NULL, 2, ID2P(LANG_BATTERY_TYPE_1), ID2P(LANG_BATTERY_TYPE_2)),
#endif
#ifdef HAVE_REMOTE_LCD
/* remote lcd */

2
firmware/export/config/xduoox3.h
View file

@ -114,7 +114,7 @@
#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */
#define BATTERY_CAPACITY_MAX 2000 /* max. capacity selectable */
#define BATTERY_CAPACITY_INC 100 /* capacity increment */
#define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_TYPES_COUNT 2 /* Two types (2000mAh and 1500mAh) */
#define CURRENT_NORMAL 167 // 2.78mA * 60s
#define CURRENT_BACKLIGHT 180 // 15mA * 60s

20
firmware/target/mips/ingenic_jz47xx/xduoo_x3/sadc-xduoo_x3.c
View file

@ -148,29 +148,39 @@ void KEY_INT_IRQ(void)
{
}
/* Notes on batteries
xDuoo shipped two types of batteries:
First is the 2000mAh battery shipped in newer units
Second is the 1500mAh battery shipped in older units
*/
const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
{
/* 5% */
3414
3414, 3634
};
const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
{
/* 0% */
3307
3307, 3307
};
/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
{
{ 3307, 3459, 3530, 3575, 3608, 3648, 3723, 3819, 3918, 4022, 4162 }
{ 3307, 3459, 3530, 3575, 3608, 3648, 3723, 3819, 3918, 4022, 4162 },
{ 3300, 3652, 3704, 3730, 3753, 3786, 3836, 3906, 3973, 4061, 4160 }
};
#if CONFIG_CHARGING
/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
const unsigned short percent_to_volt_charge[11] =
{ 3307, 3459, 3530, 3575, 3608, 3648, 3723, 3819, 3918, 4022, 4162 };
// { 3300, 3652, 3704, 3730, 3753, 3786, 3836, 3906, 3973, 4061, 4160 };
{ 3444, 3827, 3893, 3909, 3931, 4001, 4067, 4150, 4206, 4207, 4208 };
#endif /* CONFIG_CHARGING */
/* VBAT = (BDATA/1024) * 2.5V */

7
manual/configure_rockbox/system_options.tex
View file

@ -26,6 +26,7 @@
\opt{mrobe100}{720~mAh}%
\opt{samsungyh920,samsungyh925}{900~mAh}%
\opt{samsungyh820}{650~mAh}%
\opt{xduoox3}{2000~mAh}%
, which is the capacity value for the standard battery shipped with the \dap.
Rockbox uses this value for runtime estimation, not battery percentage
calculation. Changing this setting has no effect whatsoever on
@ -44,8 +45,10 @@
\opt{battery_types}{
\item [Battery Type.] This setting tells Rockbox which type of battery
is currently used in the \dap{}. The two supported battery types are
``Alkaline'' or ``NiMH''.}
is currently used in the \dap{}.
\nopt{xduoox3}{The two supported battery types are ``Alkaline'' or ``NiMH''.}
\opt{xduoox3}{Older \playerman{} \playertype{} units shipped with a 1500mAh battery, while newer units ships with a 2000mAh battery. If you are not sure which type you have, older units have a button marked ``ESC''.}
}
\opt{usb_charging_enable}{
\item [Charge During USB Connection.] This option lets you control whether