Commit c74ec4da authored by a1ex's avatar a1ex
Browse files

600D: enabled audio and debug tasks; debugging code for menu.

--HG--
branch : unified
parent 98f5b564dd45
...@@ -28,10 +28,6 @@ ...@@ -28,10 +28,6 @@
#include "menu.h" #include "menu.h"
#include "gui.h" #include "gui.h"
#ifdef CONFIG_600D
#include "disable-this-module.h"
#endif
void audio_configure(int force); void audio_configure(int force);
void volume_display(); void volume_display();
void volume_display_clear(); void volume_display_clear();
......
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
#include "lens.h" #include "lens.h"
//#include "lua.h" //#include "lua.h"
#ifdef CONFIG_600D
#include "disable-this-module.h"
#endif
int config_autosave = 1; int config_autosave = 1;
#define CONFIG_AUTOSAVE_FLAG_FILE "B:/AUTOSAVE.NEG" #define CONFIG_AUTOSAVE_FLAG_FILE "B:/AUTOSAVE.NEG"
......
...@@ -608,13 +608,15 @@ menu_handler( ...@@ -608,13 +608,15 @@ menu_handler(
) )
return 1; // 0 is too aggressive :) return 1; // 0 is too aggressive :)
/* if( event != 0x10000098 && event != 0x100000db) #ifdef CONFIG_600D
if( event != 0x10000098 && event != 0x100000db)
{ {
bmp_printf( FONT_SMALL, 400, 40, bmp_printf( FONT_SMALL, 400, 40,
"evt %8x(%8x,%8x,%8x", "evt %8x(%8x,%8x,%8x)",
event, arg2, arg3, arg4 event, arg2, arg3, arg4
); );
}*/ }
#endif
// Mine! No one else gets it // Mine! No one else gets it
//~ return 0; //~ return 0;
...@@ -1005,12 +1007,13 @@ static struct menu_entry about_menu[] = { ...@@ -1005,12 +1007,13 @@ static struct menu_entry about_menu[] = {
static void static void
open_canon_menu() open_canon_menu()
{ {
#ifdef CONFIG_600D
return;
#endif
while(1) while(1)
{ {
fake_simple_button(BGMT_MENU); fake_simple_button(BGMT_MENU);
#ifdef CONFIG_600D
msleep(500);
return;
#endif
int i; int i;
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment