Browse code

Fix alarm not confirmable, enhance GTK simulation diplay for charge state, fix RTC time handling

Nils Faerber authored on 06/05/2013 11:12:37
Showing 2 changed files
... ...
@@ -119,7 +119,7 @@ void hal_accelerometer_enable(void)
119 119
 
120 120
 void hal_accelerometer_disable(void)
121 121
 {
122
-	g_printerr("accel enable\n");
122
+	g_printerr("accel disable\n");
123 123
 	gtk_widget_set_sensitive(ui_g->x_sc, FALSE);
124 124
 	gtk_widget_set_sensitive(ui_g->y_sc, FALSE);
125 125
 	gtk_widget_set_sensitive(ui_g->z_sc, FALSE);
... ...
@@ -445,8 +445,10 @@ void hal_get_rtc(clock_state *rtc)
445 445
 	rtc->minute = mtime.tm_min;
446 446
 	rtc->second = mtime.tm_sec;
447 447
 	rtc->day = mtime.tm_mday;
448
+	rtc->wday = mtime.tm_wday;
448 449
 	rtc->month = (mtime.tm_mon + 1);
449 450
 	rtc->year = (mtime.tm_year + 1900);
451
+	
450 452
 }
451 453
 
452 454
 void hal_set_rtc(const clock_state *rtc, boolean set_set)
... ...
@@ -455,6 +457,10 @@ void hal_set_rtc(const clock_state *rtc, boolean set_set)
455 457
 
456 458
 void hal_get_power_state(power_state *pwr)
457 459
 {
460
+	pwr->source = POWER_SOURCE_EXTERNAL;
461
+	pwr->charge_state = POWER_CHARGER_CHARGING;
462
+	pwr->percent = 50;
463
+	pwr->level = 3242; // mV
458 464
 }
459 465
 
460 466
 static boolean BacklightState = FALSE;
... ...
@@ -471,15 +477,18 @@ boolean hal_lcd_get_backlight(void)
471 477
 	return BacklightState;
472 478
 }
473 479
 
480
+static boolean VibrationState = FALSE;
474 481
 
475 482
 /* sets the vibration motor on/off, on=TRUE, off=FALSE */
476 483
 void hal_vibration_set_state(boolean state)
477 484
 {
485
+	g_print("turn vibration %s\n", state ? "on" : "off");
486
+	VibrationState = state;
478 487
 }
479 488
 
480 489
 boolean hal_vibration_get_state(void)
481 490
 {
482
-	return FALSE;
491
+	return VibrationState;
483 492
 }
484 493
 
485 494
 
... ...
@@ -853,8 +853,7 @@ event_ret_t alarm_handle_events(uint16_t event, void *data)
853 853
 			break;
854 854
 		case EVENT_USER_BUTTONS:
855 855
 			dbg_out("button event %d\n", *(int *)data);
856
-			// hal_lcd_set_backlight(FALSE);
857
-			return EVENT_RET_HANDLED;
856
+			return EVENT_RET_UNHANDLED;
858 857
 			break;
859 858
 		case EVENT_HALF_SEC_TIMER:
860 859
 			hal_lcd_set_backlight(!hal_lcd_get_backlight());