Skip to content

Commit 1cd5a68

Browse files
committed
UI modification, allowing single shots and resetting shot count
1 parent 35a9714 commit 1cd5a68

5 files changed

+27
-18
lines changed

assets/ButtonLeft_4x7.png

1.38 KB
Loading

assets/ButtonRight_4x7.png

1.8 KB
Loading

assets/Ok_btn_9x9.png

3.52 KB
Loading

assets/Ok_btn_pressed_13x13.png

-3.54 KB
Binary file not shown.

ios_trigger.c

+27-18
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,17 @@ __int32_t ios_trigger_app(void *p){
7676
}
7777
break;
7878
case(InputKeyLeft):
79+
if(!app->shooting){
80+
app->shots = 0;
81+
}
7982
break;
8083
case(InputKeyRight):
81-
furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_VOLUME_INCREMENT);
82-
furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_VOLUME_INCREMENT);
83-
notification_message(app->notifications, &sequence_blink_blue_100);
84-
app->shots++;
84+
if(!app->shooting){
85+
furi_hal_bt_hid_consumer_key_press(HID_CONSUMER_VOLUME_INCREMENT);
86+
furi_hal_bt_hid_consumer_key_release(HID_CONSUMER_VOLUME_INCREMENT);
87+
notification_message(app->notifications, &sequence_blink_blue_100);
88+
app->shots++;
89+
}
8590
break;
8691
default:
8792
break;
@@ -143,19 +148,28 @@ static void draw_callback(Canvas* canvas, void* ctx) {
143148
canvas_draw_str(canvas, 2, 10, "iOS Intervalometer");
144149
//Represent
145150
canvas_set_font(canvas, FontSecondary);
146-
canvas_draw_str(canvas, 79, 60, "By Nem0oo");
151+
canvas_draw_str(canvas, 92, 62, "Nem0oo");
147152
if(app->connected){
148153
canvas_draw_icon(canvas, 111, 2, &I_Ble_connected_15x15);
149154

150155
canvas_set_font(canvas, FontSecondary);
151-
canvas_draw_str(canvas, 3, 26, "Delay (in sec)");
152-
canvas_draw_icon(canvas, 67, 28, &I_ButtonDown_7x4);
153-
canvas_draw_icon(canvas, 67, 13, &I_ButtonUp_7x4);
154-
canvas_draw_str(canvas, 65, 26, chaine_delais);
155-
canvas_draw_icon(canvas, 2, 31, &I_Ok_btn_pressed_13x13);
156-
canvas_draw_str(canvas, 17, 41, chaine_shooting);
157-
canvas_draw_str(canvas, 17, 56, chaine_photo);
158-
canvas_draw_icon(canvas, 2, 47, &I_dir_10px);
156+
//Delay line
157+
canvas_draw_icon(canvas, 3, 19, &I_ButtonDown_7x4);
158+
canvas_draw_icon(canvas, 3, 14, &I_ButtonUp_7x4);
159+
canvas_draw_str(canvas, 13, 22, "Delay (in sec)");
160+
canvas_draw_str(canvas, 71, 22, chaine_delais);
161+
//Start/stop line
162+
canvas_draw_icon(canvas, 2, 25, &I_Ok_btn_9x9);
163+
canvas_draw_str(canvas, 13, 33, chaine_shooting);
164+
//Single shot line
165+
canvas_draw_icon(canvas, 6, 36, &I_ButtonRight_4x7);
166+
canvas_draw_str(canvas, 13, 43, "Single shot");
167+
//Reset shot count line
168+
canvas_draw_icon(canvas, 3, 45, &I_ButtonLeft_4x7);
169+
canvas_draw_str(canvas, 13, 52, "Reset shot count");
170+
//Shots number line
171+
canvas_draw_icon(canvas, 2, 53, &I_dir_10px);
172+
canvas_draw_str(canvas, 14, 62, chaine_photo);
159173
}else{
160174
canvas_draw_icon(canvas, 111, 2, &I_Ble_disconnected_15x15);
161175
canvas_draw_icon(canvas, 1, 21, &I_WarningDolphin_45x42);
@@ -190,11 +204,6 @@ static void bt_hid_connection_status_changed_callback(BtStatus status, void* con
190204
furi_assert(context);
191205
AppStruct* app = context;
192206
app->connected = (status == BtStatusConnected);
193-
//if(app->connected) {
194-
// notification_message(app->notifications, &sequence_set_blue_255);
195-
//} else {
196-
// notification_message(app->notifications, &sequence_reset_blue);
197-
//}
198207
}
199208

200209
AppStruct* appStructAlloc(){

0 commit comments

Comments
 (0)