• R/O
  • HTTP
  • SSH
  • HTTPS

FujiCam: Commit

Fujifilm X Series Remote Control for Android (Prototype)

Fujifilm Xシリーズカメラの遠隔操作アプリ for Android (プロトタイプ)


Commit MetaInfo

Revisãof47d95d5bfd10e712d0e4affd60ee043dd2b869e (tree)
Hora2019-05-21 00:07:00
AutorMRSa <mrsa@myad...>
CommiterMRSa

Mensagem de Log

全部入れるとちゃんと動く...

Mudança Sumário

Diff

--- a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/Connection.java
+++ b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/Connection.java
@@ -70,12 +70,14 @@ public class Connection implements IFujiStatusRequest
7070 dump_bytes(1, rx_bytes);
7171 Thread.sleep(50);
7272
73+/**/
7374 // なんだろう?? (送信が必要なようだが)
7475 comm.send_to_camera(sequence.start_message2(), true);
7576 rx_bytes = comm.receive_from_camera();
7677 dump_bytes(2, rx_bytes);
7778 Thread.sleep(50);
78-
79+/**/
80+/**/
7981 // two_part messageを発行 (その1)
8082 comm.send_to_camera(sequence.start_message3_1(), true);
8183 rx_bytes = comm.receive_from_camera();
@@ -87,13 +89,16 @@ public class Connection implements IFujiStatusRequest
8789 rx_bytes = comm.receive_from_camera();
8890 dump_bytes(4, rx_bytes);
8991 Thread.sleep(50);
92+/**/
9093
94+/**/
9195 // remote mode
9296 comm.send_to_camera(sequence.start_message4(), true);
9397 rx_bytes = comm.receive_from_camera();
9498 dump_bytes(5, rx_bytes);
9599 Thread.sleep(50);
96-
100+/**/
101+/**/
97102 // two_part messageを発行 (その1)
98103 comm.send_to_camera(sequence.start_message5_1(), true);
99104 rx_bytes = comm.receive_from_camera();
@@ -105,7 +110,8 @@ public class Connection implements IFujiStatusRequest
105110 rx_bytes = comm.receive_from_camera();
106111 dump_bytes(7, rx_bytes);
107112 Thread.sleep(50);
108-
113+/**/
114+/**/
109115 // ????
110116 comm.send_to_camera(sequence.start_message6(), true);
111117 rx_bytes = comm.receive_from_camera();
@@ -117,15 +123,16 @@ public class Connection implements IFujiStatusRequest
117123 rx_bytes = comm.receive_from_camera();
118124 dump_bytes(9, rx_bytes);
119125 Thread.sleep(50);
120-
126+/**/
127+/**/
121128 // ????
122129 comm.send_to_camera(sequence.start_message8(), true);
123130 rx_bytes = comm.receive_from_camera();
124131 dump_bytes(10, rx_bytes);
125132 Thread.sleep(50);
126-
127- // ????
128- comm.send_to_camera(sequence.start_message9(), true);
133+/**/
134+ // リモート制御の開始!
135+ comm.send_to_camera(sequence.camera_remote_message(), true);
129136
130137 // 応答OKの場合は、8バイト ({0x03, 0x00, 0x01, 0x20} + {0x10, 0x02, 0x00, 0x00} )が応答されるはず
131138 rx_bytes = comm.receive_from_camera();
--- a/app/src/main/java/net/osdn/gokigen/cameratest/fuji/MessageSequence.java
+++ b/app/src/main/java/net/osdn/gokigen/cameratest/fuji/MessageSequence.java
@@ -236,7 +236,7 @@ class MessageSequence
236236
237237
238238
239- byte[] start_message9()
239+ byte[] camera_remote_message()
240240 {
241241 return (new byte[] {
242242 // message_header.index : uint16 (0: terminate, 2: two_part_message, 1: other)
Show on old repository browser