View difference between Paste ID: m676437e4 and
SHOW:
|
|
- or go back to the newest paste.
1 | --- a/apps/features.txt | |
2 | +++ b/apps/features.txt | |
3 | @@ -197,14 +197,15 @@ tc_ramcache | |
4 | ||
5 | #if CONFIG_CHARGING | |
6 | charging | |
7 | -#if defined(HAVE_USB_POWER) | |
8 | -usb_charging | |
9 | -#endif | |
10 | #if defined(HAVE_USB_CHARGING_ENABLE) | |
11 | usb_charging_enable | |
12 | #endif | |
13 | #endif | |
14 | ||
15 | +#if defined(HAVE_USB_POWER) | |
16 | +usb_power | |
17 | +#endif | |
18 | + | |
19 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | |
20 | usbstack | |
21 | #endif | |
22 | diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex | |
23 | index 5620bd2..0cf077d 100644 | |
24 | --- a/manual/rockbox_interface/main.tex | |
25 | +++ b/manual/rockbox_interface/main.tex | |
26 | @@ -712,6 +712,7 @@ all other settings that can be modified using \fname{.cfg} files. This topic | |
27 | is discussed in more detail in \reference{ref:manage_settings}. | |
28 | The Rockbox distribution comes with some themes that should look nice on | |
29 | your \dap{}. | |
30 | + | |
31 | \opt{lcd_bitmap}{ | |
32 | \note{Some of the themes shipped with Rockbox need additional | |
33 | fonts from the fonts package, so make sure you installed them. | |
34 | @@ -720,9 +721,18 @@ have the needed fonts installed as otherwise the theme may not display | |
35 | properly.} | |
36 | } | |
37 | ||
38 | -\opt{usb_charging} | |
39 | -{ | |
40 | - \section{Charging} | |
41 | +\nopt{ondio}{ | |
42 | + \opt{usb_power}{ | |
43 | + \section{USB Charging} | |
44 | + | |
45 | + The \dap{} can be charged over USB without connecting to your | |
46 | + computer by holding \ActionStdUsbCharge{} while plugging in. This | |
47 | + allows you to continue using the \dap{} normally. | |
48 | + } | |
49 | +} | |
50 | + | |
51 | +\opt{ondio}{ | |
52 | + \section{USB Power} | |
53 | ||
54 | The \dap{} can be powered over USB without connecting to your | |
55 | computer by holding \ActionStdUsbCharge{} while plugging in. This | |
56 |