diff options
-rw-r--r-- | bootloader/telechips.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/c100/power-c100.c | 19 | ||||
-rw-r--r-- | manual/main_menu/main.tex | 6 | ||||
-rw-r--r-- | manual/plugins/sort.tex | 2 |
5 files changed, 21 insertions, 12 deletions
diff --git a/bootloader/telechips.c b/bootloader/telechips.c index 9f912ebe2d..47e508b8b3 100644 --- a/bootloader/telechips.c +++ b/bootloader/telechips.c | |||
@@ -70,12 +70,12 @@ void show_debug_screen(void) | |||
70 | line = 1; | 70 | line = 1; |
71 | button = button_get(false); | 71 | button = button_get(false); |
72 | 72 | ||
73 | /* Power-off if POWER button has been held for a long time | 73 | /* Power-off if POWER button has been held for a time |
74 | This loop is currently running at about 100 iterations/second | 74 | This loop is currently running at about 100 iterations/second |
75 | */ | 75 | */ |
76 | if (button & POWEROFF_BUTTON) { | 76 | if (button & POWEROFF_BUTTON) { |
77 | power_count++; | 77 | power_count++; |
78 | if (power_count > 200) | 78 | if (power_count > 100) |
79 | do_power_off = true; | 79 | do_power_off = true; |
80 | } else { | 80 | } else { |
81 | power_count = 0; | 81 | power_count = 0; |
diff --git a/firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c b/firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c index 7201aeea99..c6ec9ee996 100644 --- a/firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c +++ b/firmware/target/arm/tcc77x/c100/lcd-S6B33B2.c | |||
@@ -213,8 +213,6 @@ void lcd_set_flip(bool yesno) | |||
213 | 213 | ||
214 | /*** update functions ***/ | 214 | /*** update functions ***/ |
215 | 215 | ||
216 | /*** update functions ***/ | ||
217 | |||
218 | void lcd_yuv_set_options(unsigned options) | 216 | void lcd_yuv_set_options(unsigned options) |
219 | { | 217 | { |
220 | lcd_yuv_options = options; | 218 | lcd_yuv_options = options; |
diff --git a/firmware/target/arm/tcc77x/c100/power-c100.c b/firmware/target/arm/tcc77x/c100/power-c100.c index 82eb8dce02..c2e69ff6c4 100644 --- a/firmware/target/arm/tcc77x/c100/power-c100.c +++ b/firmware/target/arm/tcc77x/c100/power-c100.c | |||
@@ -42,6 +42,21 @@ bool ide_powered(void) | |||
42 | 42 | ||
43 | void power_off(void) | 43 | void power_off(void) |
44 | { | 44 | { |
45 | |||
46 | //sleep(HZ/1000); /* 10ms */ | ||
47 | //lcd_send_command(0x02); | ||
48 | |||
49 | //sleep(HZ/1000); /* 10ms */ | ||
50 | //lcd_send_command(0x00); | ||
51 | |||
52 | //sleep(HZ/1000); /* 10ms */ | ||
53 | sleep(HZ/1000); /* 10ms */ | ||
54 | |||
55 | // From MAIN.c | ||
56 | GPIOB &= ~(0x04); | ||
57 | //GPIOD &= ~(0x80|0x40); | ||
58 | |||
59 | |||
45 | } | 60 | } |
46 | 61 | ||
47 | #else /* SIMULATOR */ | 62 | #else /* SIMULATOR */ |
@@ -56,10 +71,6 @@ void charger_enable(bool on) | |||
56 | (void)on; | 71 | (void)on; |
57 | } | 72 | } |
58 | 73 | ||
59 | void power_off(void) | ||
60 | { | ||
61 | } | ||
62 | |||
63 | void ide_power_enable(bool on) | 74 | void ide_power_enable(bool on) |
64 | { | 75 | { |
65 | (void)on; | 76 | (void)on; |
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex index a96402878e..560d8947d2 100644 --- a/manual/main_menu/main.tex +++ b/manual/main_menu/main.tex | |||
@@ -147,12 +147,12 @@ from where you currently are. | |||
147 | 147 | ||
148 | \item[Save Current Playlist:] | 148 | \item[Save Current Playlist:] |
149 | Saves the current dynamic playlist, excluding queued tracks, to the | 149 | Saves the current dynamic playlist, excluding queued tracks, to the |
150 | specified file. If no path is provided then playlist is saved to current | 150 | specified file. If no path is provided then playlist is saved to the current |
151 | directory (see \reference{ref:Playlistsubmenu}). | 151 | directory. |
152 | 152 | ||
153 | \item[Playlist Catalog:] | 153 | \item[Playlist Catalog:] |
154 | The \setting{Playlist Catalog} provides a simple interface to maintain | 154 | The \setting{Playlist Catalog} provides a simple interface to maintain |
155 | several playlist (see \reference{label:WorkingWithPlaylists}). | 155 | several playlists (see \reference{ref:working_with_playlists}). |
156 | \end{description} | 156 | \end{description} |
157 | 157 | ||
158 | \section{Plugins} | 158 | \section{Plugins} |
diff --git a/manual/plugins/sort.tex b/manual/plugins/sort.tex index 0f8e741ea3..fe230609ba 100644 --- a/manual/plugins/sort.tex +++ b/manual/plugins/sort.tex | |||
@@ -1,6 +1,6 @@ | |||
1 | \subsection{Sort} | 1 | \subsection{Sort} |
2 | This plugin takes a file and sorts it in ascending alphabetical order. Case is | 2 | This plugin takes a file and sorts it in ascending alphabetical order. Case is |
3 | ignored. This is useful for ordering playlists generated by the | 3 | ignored. This is useful for ordering playlists generated by the |
4 | \setting{Create Playlist} menu option (see \reference{ref:Playlistsubmenu}). | 4 | \setting{Create Playlist} menu option (see \reference{ref:playlistoptions}). |
5 | 5 | ||
6 | 6 | ||