Mercurial > mbsePi-apps / changeset

--- a/thermferm/panel.c	Wed Aug 13 19:14:01 2014 +0200
+++ b/thermferm/panel.c	Wed Aug 13 19:40:01 2014 +0200
@@ -28,6 +28,24 @@
 #ifdef HAVE_WIRINGPI_H
 
 
+/*
+ * 10 Milliseconds counts for a key to be short or long pressed.
+ */
+#define PRESS_NORMAL    5
+#define PRESS_LONG      200
+
+/*
+ * LCD timeout in seconds
+ */
+#define LCD_SLEEP       120
+
+/*
+ * Menu timeout in seconds
+ */
+#define MENU_TIMEOUT    60
+
+
+
 extern int		my_shutdown;
 extern int		debug;
 extern int		setupmenu;
@@ -41,6 +59,8 @@
 int			menutimer = 0;
 
 
+int keypressed(void);
+
 
 /*
  * Check for a key. Return last pressed key or none.
@@ -174,9 +194,6 @@
     }
 
     syslog(LOG_NOTICE, "Thread my_panel_loop stopped");
-    if (debug)
-	fprintf(stdout, "Thread my_panel_loop stopped\n");
-
     return 0;
 }
 

--- a/thermferm/panel.h	Wed Aug 13 19:14:01 2014 +0200
+++ b/thermferm/panel.h	Wed Aug 13 19:40:01 2014 +0200
@@ -12,21 +12,6 @@
 #define	PANEL_DOWN	5
 #define	PANEL_UP	6
 
-/*
- * 10 Milliseconds counts for a key to be short or long pressed.
- */
-#define	PRESS_NORMAL	5
-#define	PRESS_LONG	200
-
-/*
- * LCD timeout in seconds
- */
-#define	LCD_SLEEP	120
-
-/*
- * Menu timeout in seconds
- */
-#define	MENU_TIMEOUT	60
 
 /*
  * Key names
@@ -41,7 +26,6 @@
 
 
 int keycheck(void);
-int keypressed(void);
 
 
 PI_THREAD (my_panel_loop);