X-Git-Url: https://git.kernelconcepts.de/?p=metawatch.git;a=blobdiff_plain;f=mw_main.c;h=4e871b43d8617af5682c5cd8ded56d8840ba3050;hp=8fd34a30d33633ce68aa4e73394ac36a6ba8e485;hb=36bbcbe1824acc18b9bc48426de62d862283dfc0;hpb=59068bbd135c3d2ed046be5fd64850166ca04a5c

diff --git a/mw_main.c b/mw_main.c
index 8fd34a3..4e871b4 100644
--- a/mw_main.c
+++ b/mw_main.c
@@ -36,15 +36,15 @@
 
 typedef struct {
 	GMainLoop *mloop;
-	int mw_fd;		/* MetaWatch RFCOMM BT socket */
+	mwdevice_t mwdevice;
 	unsigned char rcvbuf[128];
 	int rcvbuf_pos;
 	int con_fd;		/* console input fd */
 	char cmdline[128];
 	int cmdline_pos;
-} mwdata;
+} mwdata_t;
 
-void bitmap_test(int mw_fd)
+void bitmap_test(mwdevice_t *mwdevice)
 {
 	/* a nice checker-board pattern */
 	unsigned char checkbuf[24] = {
@@ -53,15 +53,15 @@ void bitmap_test(int mw_fd)
 		0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
 		0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
 	};
-	mw_write_buffer(mw_fd, MW_SCREEN_MODE_IDLE, 0, 31, checkbuf, 24);
-	mw_write_buffer(mw_fd, MW_SCREEN_MODE_IDLE, 0, 33, checkbuf, 24);
-	mw_write_buffer(mw_fd, MW_SCREEN_MODE_IDLE, 0, 35, checkbuf, 24);
-	mw_write_buffer(mw_fd, MW_SCREEN_MODE_IDLE, 0, 37, checkbuf, 24);
+	mw_write_buffer(mwdevice, MW_SCREEN_MODE_IDLE, 0, 31, checkbuf, 24);
+	mw_write_buffer(mwdevice, MW_SCREEN_MODE_IDLE, 0, 33, checkbuf, 24);
+	mw_write_buffer(mwdevice, MW_SCREEN_MODE_IDLE, 0, 35, checkbuf, 24);
+	mw_write_buffer(mwdevice, MW_SCREEN_MODE_IDLE, 0, 37, checkbuf, 24);
 
-	mw_update_display(mw_fd, MW_SCREEN_MODE_IDLE, 1);
+	mw_update_display(mwdevice, MW_SCREEN_MODE_IDLE, 1);
 }
 
-void bitmap_test2(int mw_fd)
+void bitmap_test2(mwdevice_t *mwdevice)
 {
 	mw_buffer *mwbuf1, *mwbuf2;
 	unsigned char *bbuf;
@@ -78,8 +78,8 @@ void bitmap_test2(int mw_fd)
 		mw_buf_draw_pixel(mwbuf1, x, x, MW_WHITE);
 		mw_dump_mw_buffer(mwbuf1);
 		bbuf = mw_make_mw_buffer(mwbuf1, &len);
-		mw_send_bitmap(mw_fd, MW_SCREEN_MODE_IDLE, 96, 65, 31, bbuf, len);
-		mw_update_display(mw_fd, MW_SCREEN_MODE_IDLE, 1);
+		mw_send_bitmap(mwdevice, MW_SCREEN_MODE_IDLE, 96, 65, 31, bbuf, len);
+		mw_update_display(mwdevice, MW_SCREEN_MODE_IDLE, 1);
 		getchar();
 	};
 
@@ -87,7 +87,7 @@ void bitmap_test2(int mw_fd)
 	mw_free_pbuffer(mwbuf2);
 }
 
-void text_test(int mw_fd)
+void text_test(mwdevice_t *mwdevice)
 {
 	mw_buffer *mwbuf;
 	unsigned char *bbuf;
@@ -102,12 +102,12 @@ void text_test(int mw_fd)
 	mw_buf_print(mwbuf, 1, 45, "Big Fat Clipping", 2, MW_BLACK, MW_WHITE);
 
 	bbuf = mw_make_mw_buffer(mwbuf, &len);
-	mw_send_bitmap(mw_fd, MW_SCREEN_MODE_IDLE, 96, 65, 31, bbuf, len);
-	mw_update_display(mw_fd, MW_SCREEN_MODE_IDLE, 1);
+	mw_send_bitmap(mwdevice, MW_SCREEN_MODE_IDLE, 96, 65, 31, bbuf, len);
+	mw_update_display(mwdevice, MW_SCREEN_MODE_IDLE, 1);
 	mw_free_pbuffer(mwbuf);
 }
 
-void line_test(int mw_fd)
+void line_test(mwdevice_t *mwdevice)
 {
 	mw_buffer *mwbuf;
 	unsigned char *bbuf;
@@ -120,12 +120,12 @@ void line_test(int mw_fd)
 		mw_buf_draw_line_bresenham(mwbuf, p, 0, 95-p, 65, MW_WHITE);
 
 	bbuf = mw_make_mw_buffer(mwbuf, &len);
-	mw_send_bitmap(mw_fd, MW_SCREEN_MODE_IDLE, 96, 65, 31, bbuf, len);
-	mw_update_display(mw_fd, MW_SCREEN_MODE_IDLE, 1);
+	mw_send_bitmap(mwdevice, MW_SCREEN_MODE_IDLE, 96, 65, 31, bbuf, len);
+	mw_update_display(mwdevice, MW_SCREEN_MODE_IDLE, 1);
 	mw_free_pbuffer(mwbuf);
 }
 
-void bitmap_read(int mw_fd)
+void bitmap_read(mwdevice_t *mwdevice)
 {
 	int ffd, ret;
 	char rbuf[256];
@@ -186,14 +186,14 @@ void bitmap_read(int mw_fd)
 	/* reverse bits and invert the bmap */
 	bmap_buffer_flipinvert(1, 1, bmapbuf, rowlength * height);
 	/* send the buffer to the watch */
-	mw_send_bitmap(mw_fd, MW_SCREEN_MODE_IDLE, width, height, 31, bmapbuf, rowlength * height);
+	mw_send_bitmap(mwdevice, MW_SCREEN_MODE_IDLE, width, height, 31, bmapbuf, rowlength * height);
 	/* update the display */
-	mw_update_display(mw_fd, MW_SCREEN_MODE_IDLE, 1);
+	mw_update_display(mwdevice, MW_SCREEN_MODE_IDLE, 1);
 
 	free(bmapbuf);
 }
 
-void test_notification(int mw_fd)
+void test_notification(mwdevice_t *mwdevice)
 {
 	mw_buffer *mwbuf;
 	unsigned char *bbuf;
@@ -224,14 +224,14 @@ void test_notification(int mw_fd)
 	mw_buf_print(mwbuf, 4, 85, "012345678901234", 0, MW_WHITE, MW_BLACK);
 
 	bbuf = mw_make_mw_buffer(mwbuf, &len);
-	mw_send_bitmap(mw_fd, MW_SCREEN_MODE_NOTIFICATION, 96, 96, 0, bbuf, len);
-	mw_update_display(mw_fd, MW_SCREEN_MODE_NOTIFICATION, 1);
+	mw_send_bitmap(mwdevice, MW_SCREEN_MODE_NOTIFICATION, 96, 96, 0, bbuf, len);
+	mw_update_display(mwdevice, MW_SCREEN_MODE_NOTIFICATION, 1);
 	mw_free_pbuffer(mwbuf);
 
-	mw_set_vibrate_mode(mw_fd, 1, 300, 300, 3);
+	mw_set_vibrate_mode(mwdevice, 1, 300, 300, 3);
 }
 
-void mw_send_notify(int mw_fd, char *header, char *body)
+void mw_send_notify(mwdevice_t *mwdevice, char *header, char *body)
 {
 	mw_buffer *mwbuf;
 	unsigned char *bbuf;
@@ -258,21 +258,21 @@ void mw_send_notify(int mw_fd, char *header, char *body)
 	};
 
 	bbuf = mw_make_mw_buffer(mwbuf, &len);
-	mw_send_bitmap(mw_fd, MW_SCREEN_MODE_APPLICATION, 96, 96, 0, bbuf, len);
-	mw_update_display(mw_fd, MW_SCREEN_MODE_APPLICATION, 1);
+	mw_send_bitmap(mwdevice, MW_SCREEN_MODE_APPLICATION, 96, 96, 0, bbuf, len);
+	mw_update_display(mwdevice, MW_SCREEN_MODE_APPLICATION, 1);
 	mw_free_pbuffer(mwbuf);
 
-	mw_set_vibrate_mode(mw_fd, 1, 300, 300, 2);
+	mw_set_vibrate_mode(mwdevice, 1, 300, 300, 2);
 }
 
-void test_application(int mw_fd)
+void test_application(mwdevice_t *mwdevice)
 {
 	mw_buffer *mwbuf;
 	unsigned char *bbuf;
 	int len;
 
-	mw_enable_button(mw_fd, MW_SCREEN_MODE_APPLICATION, MW_BUTTON_A, MW_BUTTON_IMMEDIATE, MW_BUTTON_EVENT_MESSAGE, MW_BUTTON_A);
-	mw_configure_watch_mode(mw_fd, MW_SCREEN_MODE_APPLICATION, 0, 30, 0);
+	mw_enable_button(mwdevice, MW_SCREEN_MODE_APPLICATION, MW_BUTTON_A, MW_BUTTON_IMMEDIATE, MW_BUTTON_EVENT_MESSAGE, MW_BUTTON_A);
+	mw_configure_watch_mode(mwdevice, MW_SCREEN_MODE_APPLICATION, 0, 30, 0);
 
 	mwbuf = mw_alloc_pbuffer(96, 96, 1);
 	mw_buf_clear(mwbuf, MW_BLACK);
@@ -289,12 +289,12 @@ void test_application(int mw_fd)
 	mw_buf_print(mwbuf, 0, 81, "0123456789012345", 0, MW_WHITE, MW_BLACK);
 
 	bbuf = mw_make_mw_buffer(mwbuf, &len);
-	mw_send_bitmap(mw_fd, MW_SCREEN_MODE_APPLICATION, 96, 96, 0, bbuf, len);
-	mw_update_display(mw_fd, MW_SCREEN_MODE_APPLICATION, 1);
+	mw_send_bitmap(mwdevice, MW_SCREEN_MODE_APPLICATION, 96, 96, 0, bbuf, len);
+	mw_update_display(mwdevice, MW_SCREEN_MODE_APPLICATION, 1);
 	mw_free_pbuffer(mwbuf);
 }
 
-void test_oled(int mw_fd, unsigned char oled)
+void test_oled(mwdevice_t *mwdevice, unsigned char oled)
 {
 	mw_buffer *mwbuf;
 	unsigned char *bbuf;
@@ -303,11 +303,11 @@ void test_oled(int mw_fd, unsigned char oled)
 	mwbuf = mw_alloc_pbuffer(80, 16, 1);
 	mw_buf_clear(mwbuf, MW_BLACK);
 
-	mw_buf_print(mwbuf, 0,  0, "ApplicatiO", 0, MW_WHITE, MW_BLACK);
-	mw_buf_print(mwbuf, 0,  8, "0123456789", 0, MW_WHITE, MW_BLACK);
+	mw_buf_print(mwbuf, 0,  0, "Application", 0, MW_WHITE, MW_BLACK);
+	mw_buf_print(mwbuf, 0,  8, "012345678901234", 0, MW_WHITE, MW_BLACK);
 
 	bbuf = mw_make_mw_oled_buffer(mwbuf, &len);
-	mw_write_oled_buffer(mw_fd, 0, oled, 80, 0, bbuf, len);
+	mw_write_oled_buffer(mwdevice, 0, oled, 80, 0, bbuf, len);
 
 	mw_free_pbuffer(mwbuf);
 }
@@ -316,7 +316,7 @@ void print_help(void)
 {
 }
 
-void process_cmd(char *cmdline, int clinep, int mw_fd)
+void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
 {
 	unsigned char mdata[32];
 	unsigned int intopt;
@@ -324,9 +324,9 @@ void process_cmd(char *cmdline, int clinep, int mw_fd)
 	fprintf(stderr, "command: '%s'\n", cmdline);
 
 	if (strncmp(cmdline, "quit", 4) == 0) {
-		close(mw_fd);
-		exit(0);
-		// g_main_loop_quit (mdata->mloop);
+		//close(mw_fd);
+		//exit(0);
+		g_main_loop_quit (mwdata->mloop);
 	}
 	if (strncmp(cmdline, "help", 4) == 0) {
 		print_help();
@@ -337,15 +337,15 @@ void process_cmd(char *cmdline, int clinep, int mw_fd)
 		mdata[0] = intopt / 60;
 		mdata[1] = intopt % 60;
 		mdata[2] = 0;
-		mw_send_frame(mw_fd, MW_ADVANCE_WATCH_HANDS, 0, mdata, 3);
+		mw_send_frame(&mwdata->mwdevice, MW_ADVANCE_WATCH_HANDS, 0, mdata, 3);
 	}
 	if (strncmp(cmdline, "srtc", 4) == 0) {
 		fprintf(stderr, "Setting RTC from system time...");
-		mw_set_rtc(mw_fd, MW_RTC_CLOCK_24HR, MW_RTC_DATE_DDMM);
+		mw_set_rtc(&mwdata->mwdevice, MW_RTC_CLOCK_24HR, MW_RTC_DATE_DDMM);
 		fprintf(stderr, "OK\n");
 	}
 	if (strncmp(cmdline, "grtc", 4) == 0) {
-		mw_send_frame(mw_fd, MW_GET_REAL_TIME_CLOCK, 0, NULL, 0);
+		mw_send_frame(&mwdata->mwdevice, MW_GET_REAL_TIME_CLOCK, 0, NULL, 0);
 	}
 	if (strncmp(cmdline, "gistr", 5) == 0) {
 		intopt = cmdline[6]-0x30;
@@ -353,20 +353,20 @@ void process_cmd(char *cmdline, int clinep, int mw_fd)
 			mdata[0] = intopt;
 		else
 			mdata[0] = 0;
-		mw_send_frame(mw_fd, MW_GET_INFORMATION_STRING, 0, mdata, 1);
+		mw_send_frame(&mwdata->mwdevice, MW_GET_INFORMATION_STRING, 0, mdata, 1);
 	}
 	if (strncmp(cmdline, "gdtype", 6) == 0) {
-		mw_send_frame(mw_fd, MW_GET_DEVICE_TYPE, 0, NULL, 0);
+		mw_send_frame(&mwdata->mwdevice, MW_GET_DEVICE_TYPE, 0, NULL, 0);
 	}
 	if (strncmp(cmdline, "rvbat", 5) == 0) {
-		mw_send_frame(mw_fd, MW_READ_BATTERY_VOLTAGE_MSG, 0, NULL, 0);
+		mw_send_frame(&mwdata->mwdevice, MW_READ_BATTERY_VOLTAGE_MSG, 0, NULL, 0);
 	}
 	if (strncmp(cmdline, "rlight", 6) == 0) {
-		mw_send_frame(mw_fd, MW_READ_LIGHT_SENSOR_MSG, 0, NULL, 0);
+		mw_send_frame(&mwdata->mwdevice, MW_READ_LIGHT_SENSOR_MSG, 0, NULL, 0);
 	}
 	if (strncmp(cmdline, "modecfg", 6) == 0) {
-		mw_configure_watch_mode(mw_fd, MW_SCREEN_MODE_IDLE, 0, 4, 1);
-		mw_update_display(mw_fd, MW_SCREEN_MODE_IDLE, 0);
+		mw_configure_watch_mode(&mwdata->mwdevice, MW_SCREEN_MODE_IDLE, 0, 4, 1);
+		mw_update_display(&mwdata->mwdevice, MW_SCREEN_MODE_IDLE, 0);
 	}
 	if (strncmp(cmdline, "rbtcfg", 6) == 0) {
 		intopt = cmdline[7]-0x30;
@@ -376,47 +376,47 @@ void process_cmd(char *cmdline, int clinep, int mw_fd)
 		mdata[2] = 0; /* button press type */
 		mdata[3] = 0; /* callback message type */
 		mdata[4] = 0; /* callback message option */
-		mw_send_frame(mw_fd, MW_READ_BUTTON_CONFIG, 0, mdata, 5);
+		mw_send_frame(&mwdata->mwdevice, MW_READ_BUTTON_CONFIG, 0, mdata, 5);
 	}
 	if (strncmp(cmdline, "svib", 4) == 0) {
-		mw_set_vibrate_mode(mw_fd, 1, 300, 300, 5);
+		mw_set_vibrate_mode(&mwdata->mwdevice, 1, 300, 300, 5);
 	}
 	if (strncmp(cmdline, "tbmp", 4) == 0) {
-		bitmap_test(mw_fd);
+		bitmap_test(&mwdata->mwdevice);
 	}
 	if (strncmp(cmdline, "t2bmp", 5) == 0) {
-		bitmap_test2(mw_fd);
+		bitmap_test2(&mwdata->mwdevice);
 	}
 	if (strncmp(cmdline, "text", 4) == 0) {
-		text_test(mw_fd);
+		text_test(&mwdata->mwdevice);
 	}
 	if (strncmp(cmdline, "tline", 5) == 0) {
-		line_test(mw_fd);
+		line_test(&mwdata->mwdevice);
 	}
 	if (strncmp(cmdline, "rbmp", 4) == 0) {
-		bitmap_read(mw_fd);
+		bitmap_read(&mwdata->mwdevice);
 	}
 	if (strncmp(cmdline, "tnote", 5) == 0) {
-		test_notification(mw_fd);
+		test_notification(&mwdata->mwdevice);
 	}
 	if (strncmp(cmdline, "tapp", 4) == 0) {
-		test_application(mw_fd);
+		test_application(&mwdata->mwdevice);
 	}
 	if (strncmp(cmdline, "eoled", 5) == 0) {
 		intopt = cmdline[6]-0x30;
 		if (intopt == MW_OLED_UPPER || intopt == MW_OLED_LOWER)
-			mw_send_frame(mw_fd, MW_ENABLE_OLED_DISPLAY_MSG, intopt, NULL, 0);
+			mw_send_frame(&mwdata->mwdevice, MW_ENABLE_OLED_DISPLAY_MSG, intopt, NULL, 0);
 	}
 	if (strncmp(cmdline, "toled", 5) == 0) {
 		intopt = cmdline[6]-0x30;
-		test_oled(mw_fd, intopt);
-		//mw_write_oled_buffer(mw_fd, 0, 80, 0, mdata, 10);
-		//mw_send_frame(mw_fd, MW_UPDATE_OLED_DISPLAY_MSG, 0, NULL, 0);
+		test_oled(&mwdata->mwdevice, intopt);
+		//mw_write_oled_buffer(mwdevice, 0, 80, 0, mdata, 10);
+		//mw_send_frame(mwdevice, MW_UPDATE_OLED_DISPLAY_MSG, 0, NULL, 0);
 	}
 }
 
 
-int feed_menu(mwdata *mdata)
+int feed_menu(mwdata_t *mdata)
 {
 	int rcvd;
 
@@ -425,7 +425,7 @@ int feed_menu(mwdata *mdata)
 		if (mdata->cmdline[mdata->cmdline_pos] == '\r') {
 			printf("\n");
 			mdata->cmdline[mdata->cmdline_pos--] = '\0';
-			process_cmd(mdata->cmdline, mdata->cmdline_pos, mdata->mw_fd);
+			process_cmd(mdata->cmdline, mdata->cmdline_pos, mdata);
 			mdata->cmdline_pos = 0;
 			memset(mdata->cmdline, 0, 128);
 		} else {
@@ -556,10 +556,10 @@ int str2ba(const char *str, bdaddr_t *ba)
 
 gboolean handle_mw_io(GIOChannel *mw_io, GIOCondition condition, gpointer udata)
 {
-	mwdata *mdata = (mwdata *)udata;
+	mwdata_t *mdata = (mwdata_t *)udata;
 	int rcvd;
 
-	rcvd = read(mdata->mw_fd, mdata->rcvbuf+mdata->rcvbuf_pos, 64);
+	rcvd = read(mdata->mwdevice.mw_fd, mdata->rcvbuf+mdata->rcvbuf_pos, 64);
 #ifdef DEBUG
 	fprintf(stderr, "read %d bytes:\n", rcvd);
 #endif
@@ -567,7 +567,7 @@ gboolean handle_mw_io(GIOChannel *mw_io, GIOCondition condition, gpointer udata)
 #ifdef DEBUG
 		dump_frame(mdata->rcvbuf, rcvd);
 #endif
-		decode_frame(mdata->mw_fd, mdata->rcvbuf, rcvd);
+		decode_frame(&mdata->mwdevice, mdata->rcvbuf, rcvd);
 		mdata->rcvbuf_pos = 0;
 	}
 
@@ -576,7 +576,7 @@ gboolean handle_mw_io(GIOChannel *mw_io, GIOCondition condition, gpointer udata)
 
 gboolean handle_min_io(GIOChannel *mw_io, GIOCondition condition, gpointer udata)
 {
-	mwdata *mdata = (mwdata *)udata;
+	mwdata_t *mdata = (mwdata_t *)udata;
 
 	feed_menu(mdata);
 
@@ -587,7 +587,7 @@ static DBusHandlerResult
 signal_filter (DBusConnection *connection, DBusMessage *message, void *user_data)
 {
 	//GMainLoop *loop = user_data;
-	mwdata *mdata = (mwdata *)user_data;
+	mwdata_t *mdata = (mwdata_t *)user_data;
 	DBusError error;
 	char *app_name, *app_icon, *summary, *body; // **actions;
 	int replace_id; // dict, expire;
@@ -614,7 +614,7 @@ signal_filter (DBusConnection *connection, DBusMessage *message, void *user_data
 			DBUS_TYPE_INT32, &expire, */
 			DBUS_TYPE_INVALID)) {
 			g_print("Notify received: from app %s, icon %s:\nSummary: %s\nBody: %s\n", app_name, app_icon, summary, body);
-			mw_send_notify(mdata->mw_fd, summary, body);
+			mw_send_notify(&mdata->mwdevice, summary, body);
 			/* we just listen, we do not handle it here */
 			return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 		} else {
@@ -632,7 +632,7 @@ signal_filter (DBusConnection *connection, DBusMessage *message, void *user_data
 int main(int argc, char **argv)
 {
 	int mw_fd;
-	mwdata mdata;
+	mwdata_t mdata;
 	struct termios tconfd, otconfd, tmwfd;
 	bdaddr_t btaddr;
 	GIOChannel *mw_io, *m_in;
@@ -673,7 +673,7 @@ int main(int argc, char **argv)
 	tmwfd.c_lflag |= ISIG;
 	tcsetattr(mw_fd, TCSANOW, &tmwfd);
 
-	mdata.mw_fd = mw_fd;
+	mdata.mwdevice.mw_fd = mw_fd;
 	mdata.rcvbuf_pos = 0;
 	memset(mdata.rcvbuf, 0, 128);