X-Git-Url: https://git.kernelconcepts.de/?p=metawatch.git;a=blobdiff_plain;f=mw_main.c;h=d391048088b244807346e0555f9fb8c15e358207;hp=17b52adcaaeb8167b378c16d7c821801e8775568;hb=45df0eb30c5119f66f332d35a411f508a4f1b69a;hpb=b11171caa5c6ef0a685c134ea01b89a8330bd74e

diff --git a/mw_main.c b/mw_main.c
index 17b52ad..d391048 100644
--- a/mw_main.c
+++ b/mw_main.c
@@ -257,8 +257,8 @@ int days(int m1, int y1)
 void draw_idle_calendar(mwdevice_t *mwdevice)
 {
 	long unsigned int t;
-	unsigned int y,y1,m,m1,d,da,i,j,k;
-	const char a[12][20]={"January","February","March","April","May","June","July","August","September","October","November","December"};
+	unsigned int y,y1,m,m1,d,i,j,k;
+	/* const char a[12][20]={"January","February","March","April","May","June","July","August","September","October","November","December"}; */
 	const char dnames[7][3] = { "Mo", "Di", "Mi", "Do", "Fr", "Sa", "So" };
 	mw_buffer *mwbuf;
 	unsigned char *bbuf;
@@ -310,7 +310,7 @@ void draw_idle_calendar(mwdevice_t *mwdevice)
 	px=0;
 	py=3;
 	for (i=0; i<7; i++) {
-		snprintf(pnum, 3, dnames[i]);
+		snprintf(pnum, 3, "%s", dnames[i]);
 		mw_buf_print(mwbuf, px, py, pnum, 0, MW_WHITE, MW_BLACK);
 		px += 14;
 	};
@@ -396,7 +396,13 @@ void test_application(mwdevice_t *mwdevice)
 	unsigned char *bbuf;
 	int len;
 
+	mw_enable_button(mwdevice, MW_SCREEN_MODE_IDLE, MW_BUTTON_A, MW_BUTTON_IMMEDIATE, MW_BUTTON_EVENT_MESSAGE, MW_BUTTON_A);
+
 	mw_enable_button(mwdevice, MW_SCREEN_MODE_APPLICATION, MW_BUTTON_A, MW_BUTTON_IMMEDIATE, MW_BUTTON_EVENT_MESSAGE, MW_BUTTON_A);
+	mw_enable_button(mwdevice, MW_SCREEN_MODE_APPLICATION, MW_BUTTON_B, MW_BUTTON_IMMEDIATE, MW_BUTTON_EVENT_MESSAGE, MW_BUTTON_B);
+	mw_enable_button(mwdevice, MW_SCREEN_MODE_APPLICATION, MW_BUTTON_C, MW_BUTTON_IMMEDIATE, MW_BUTTON_EVENT_MESSAGE, MW_BUTTON_C);
+	mw_enable_button(mwdevice, MW_SCREEN_MODE_APPLICATION, MW_BUTTON_E, MW_BUTTON_IMMEDIATE, MW_BUTTON_EVENT_MESSAGE, MW_BUTTON_E);
+	mw_enable_button(mwdevice, MW_SCREEN_MODE_APPLICATION, MW_BUTTON_F, MW_BUTTON_IMMEDIATE, MW_BUTTON_EVENT_MESSAGE, MW_BUTTON_F);
 	mw_configure_watch_mode(mwdevice, MW_SCREEN_MODE_APPLICATION, 0, 30, 0);
 
 	mwbuf = mw_alloc_pbuffer(96, 96, 1);
@@ -423,7 +429,7 @@ void test_oled(mwdevice_t *mwdevice, unsigned char oled)
 {
 	mw_buffer *mwbuf;
 	unsigned char *bbuf;
-	int len, i;
+	int len;
 
 	mwbuf = mw_alloc_pbuffer(80, 16, 1);
 	mw_buf_clear(mwbuf, MW_BLACK);
@@ -477,6 +483,8 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
 	if (strncmp(cmdline, "quit", 4) == 0) {
 		//close(mw_fd);
 		//exit(0);
+		/* just in case we quit and show another screen */
+		mw_update_display(&mwdata->mwdevice, MW_SCREEN_MODE_IDLE, 0);
 		g_main_loop_quit (mwdata->mloop);
 	}
 	if (strncmp(cmdline, "help", 4) == 0) {
@@ -492,7 +500,7 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
 	}
 	if (strncmp(cmdline, "srtc", 4) == 0) {
 		fprintf(stderr, "Setting RTC from system time...");
-		mw_set_rtc(&mwdata->mwdevice, MW_RTC_CLOCK_24HR, MW_RTC_DATE_DDMM);
+		mw_set_rtc(&mwdata->mwdevice);
 		fprintf(stderr, "OK\n");
 	}
 	if (strncmp(cmdline, "grtc", 4) == 0) {
@@ -577,8 +585,7 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
 	}
 	if (strncmp(cmdline, "g24", 3) == 0) {
 		mdata[0] = 0;
-		mdata[1] = 0;
-		mw_nval_operation(&mwdata->mwdevice, MW_NVAL_OPERATION_READ, MW_NVAL_TIME_FORMAT, 2, mdata);
+		mw_nval_operation(&mwdata->mwdevice, MW_NVAL_OPERATION_READ, MW_NVAL_TIME_FORMAT, 1, mdata);
 	}
 }
 
@@ -681,6 +688,20 @@ signal_filter (DBusConnection *connection, DBusMessage *message, void *user_data
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
+void mw_button_event_message_cb(mwdevice_t *mwdevice, unsigned char buttons, unsigned char options, void *user_data)
+{
+	g_print("button event cb:0x%02x 0x%02x\n", buttons, options);
+	g_print("screen is %d\n", mwdevice->screen_mode);
+	if (mwdevice->screen_mode == MW_SCREEN_MODE_IDLE) {
+		if (buttons == MW_BUTTON_A)
+			test_application(mwdevice);
+	}
+	if (mwdevice->screen_mode == MW_SCREEN_MODE_APPLICATION) {
+		if (buttons == MW_BUTTON_C)
+			mw_update_display(mwdevice, MW_SCREEN_MODE_IDLE, 0);
+	}
+}
+
 int main(int argc, char **argv)
 {
 	int mw_fd;
@@ -763,6 +784,7 @@ int main(int argc, char **argv)
 	mdata.cmdline_pos = 0;
 
 	mw_init(&mdata.mwdevice, mw_fd);
+	mw_set_button_event_message_cb(&mdata.mwdevice, mw_button_event_message_cb, NULL);
 
 	g_main_loop_run (mdata.mloop);