stv0g/eyefi-config
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add upload status commands

Browse source 
I found these by watching my Canon S95.  They let you monitor
the progress that a file is making during an upload.
This commit is contained in:
Dave Hansen 2011-03-25 14:35:45 -07:00
parent 986a301571
commit b9e4c610fd
3 changed files with 126 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
eyefi-config.c
View file

@ -63,12 +63,13 @@ void *eyefi_response(void)
return eyefi_buf;
}
void dumpbuf(const char *buffer, int bytesToWrite)
int __dumpbuf(const char *buffer, int bytesToWrite, int per_line)
{
int ret = 0;
int i;
static char linebuf[500];
for (i=0; i < bytesToWrite; i += 16) {
for (i=0; i < bytesToWrite; i += per_line) {
char *tmpbuf = &linebuf[0];
unsigned long sum = 0;
int j;
@ -77,13 +78,13 @@ void dumpbuf(const char *buffer, int bytesToWrite)
} while (0)
lprintf("[%03d]: ", i);
for (j=0; j < 16; j++) {
for (j=0; j < per_line; j++) {
u8 c = ((unsigned char *)buffer)[i+j];
lprintf("%02x ", (unsigned int)c);
sum += c;
}
lprintf(" |");
for (j=0; j < 16; j++) {
for (j=0; j < per_line; j++) {
u8 c = ((unsigned char *)buffer)[i+j];
if (c >= 'a' && c <= 'z')
lprintf("%c", c);
@ -99,10 +100,16 @@ void dumpbuf(const char *buffer, int bytesToWrite)
lprintf("|\n");
if (sum == 0)
continue;
printf("%s", linebuf);
ret += printf("%s", linebuf);
//if (i > 200)
// break;
}
return ret;
}
int dumpbuf(const char *buffer, int bytesToWrite)
{
return __dumpbuf(buffer, bytesToWrite, 16);
}
void read_from(enum eyefi_file);
@ -145,15 +152,15 @@ void zero_card_files(void)
char zbuf[EYEFI_BUF_SIZE];
memset(&zbuf[0], 0, EYEFI_BUF_SIZE);
//write_to(REQM, zbuf, EYEFI_BUF_SIZE);
write_to(REQM, zbuf, EYEFI_BUF_SIZE);
write_to(REQC, zbuf, EYEFI_BUF_SIZE);
write_to(RSPM, zbuf, EYEFI_BUF_SIZE);
write_to(RSPC, zbuf, EYEFI_BUF_SIZE);
// write_to(RSPC, zbuf, EYEFI_BUF_SIZE);
read_from(REQM);
read_from(REQC);
read_from(RSPM);
read_from(RSPC);
// read_from(RSPC);
}
void init_card()
@ -589,6 +596,48 @@ void set_transfer_mode(enum transfer_mode transfer_mode)
wait_for_response();
}
void print_transfer_status(void)
{
int tries = 10;
struct upload_status *us;
int i;
// Give it some sane number so it doesn't
// wear out the card
for (i = 0; i < 1000; i++) {
char *filename;
char *dir;
int http_len;
int http_complete;
card_info_cmd(UPLOAD_STATUS);
//__dumpbuf(eyefi_buf, 128, 48);
us = eyefi_buf;
if (!us->len) {
return;
printf("transfer not in progress\n");
if (tries-- <= 0)
break;
sleep(1);
continue;
}
if (us->len <= 8) {
printf("%s() result too small: %d, transfer pending???\n",
__func__, us->len);
return;
}
http_len = be32_to_u32(us->http_len);
http_complete = be32_to_u32(us->http_done);
filename = (char *)&us->string[0];
dir = filename + strlen(filename) + 1;
printf("transferring (%d) %s/%s %d/%d bytes (%4.2f%%))\n",
us->len,
dir, filename,
http_complete, http_len,
(100.0 * http_complete) / http_len);
break;
}
zero_card_files();
}
struct testbuf {
char cmd;
@ -600,6 +649,17 @@ struct z {
char zeros[100];
} z;
int print_connected_to(void)
{
struct pascal_string *essid;
card_info_cmd(CONNECTED_TO);
essid = eyefi_buf;
if (!essid->length) {
return printf("not connected\n");
}
return printf("connected to: %s\n", (char *)&essid->value[0]);
}
char fwbuf[1<<20];
char zbuf[1<<20];
@ -611,44 +671,49 @@ void testit0(void)
int i;
int fdin;
int fdout;
//char new_cmd[] = {'O', 0x06, 0x0d, 0x0a, 0x31, 0x30, 0x2e, 0x36, 0x2e, 0x30, 0x2e, 0x31, 0x33, 0x37};
print_endless();
endless_enable(1);
print_endless();
endless_enable(0);
set_endless_percentage(77);
print_endless();
endless_enable(1);
print_endless();
endless_enable(0);
print_endless();
exit(0);
for (i = 10; i <= 13; i++) {
zero_card_files();
card_info_cmd(i);
printf("UNKNOWN %d result:\n", i);
dumpbuf(eyefi_buf, 64);
printf("WLAN enabled: %d\n", wlan_enabled());
scan_print_nets();
//printf("waiting...\n");
//print_transfer_status();
//exit(0);
int doagain = 1;
//wlan_disable(0);
//int to_test[] = {5, 8, 9, 11, 15, 16, 255, -1};
int to_test[] = {0xFF, -1};
zero_card_files();
while (1) {
//fprintf(stderr, "testing...\n");
for (i = 0; i < 255; i++) {
int cmd = to_test[i];
if (cmd == -1)
break;
//zero_card_files();
card_info_cmd(cmd);
printf("UNKNOWN %3d result: ", cmd);
int printed = dumpbuf(eyefi_buf, 256);
if (!printed)
printf("\n");
print_transfer_status();
print_connected_to();
}
i = 0xff;
card_info_cmd(i);
printf("UNKNOWN %d result:\n", i);
dumpbuf(eyefi_buf, 64);
}
exit(0);
scan_print_nets();
printf("WLAN enabled: %d\n", wlan_enabled());
//wlan_disable();
printf("WLAN enabled: %d\n", wlan_enabled());
for (i = 10; i <= 13; i++) {
int printed;
zero_card_files();
card_info_cmd(i);
printf("UNKNOWN %d result:\n", i);
dumpbuf(eyefi_buf, 64);
printed = dumpbuf(eyefi_buf, 64);
printf("WLAN enabled: %d\n", wlan_enabled());
}
i = 0xff;
card_info_cmd(i);
printf("UNKNOWN %d result:\n", i);
printf("UNKNOWN %d result:", i);
dumpbuf(eyefi_buf, 64);
exit(3);
@ -868,6 +933,7 @@ int get_log_into(u8 *resbuf)
u32 __log_size = fetch_log_length();
int log_pieces = __log_size/EYEFI_BUF_SIZE;
debug_printf(1, "%s() total_bytes: %d\n", __func__, __log_size);
if (__log_size <= 0)
return __log_size;

27
eyefi-config.h
View file

@ -72,6 +72,7 @@ extern int fd_flush(int);
* definitions shorter.
*/
typedef unsigned int u32;
typedef unsigned short u16;
typedef unsigned char u8;
#define os_memset memset
@ -175,8 +176,10 @@ enum card_info_subcommand {
UNKNOWN_6 = 6, // checksums
LOG_LEN = 7,
WLAN_ENABLED = 10,
UNKNOWN_13 = 13, // Returns an ASCII SSID. Last connected or
// current WiFi network, maybe?
UPLOAD_PENDING= 11, // {0x1, STATE}
CONNECTED_TO = 13, // Currently connected Wifi network
UPLOAD_STATUS = 14, // current uploading file info
UNKNOWN_15 = 15, // always returns {0x01, 0x1d} as far as I've seen
TRANSFER_MODE = 17,
ENDLESS = 27,
@ -195,6 +198,14 @@ enum card_info_subcommand {
//00000010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
// that happens 3 seconds after the card goes into the D90
//
// 1301001235/0002/REQM: 00000000 4f 0c 01 01 00 00 00 00 00 00 00 00 00 00 00 00 |O...............|
// looks like it is setting the PC's IP address:
// 1300998375/0013/REQM: 00000000 4f 06 0d 0a 31 30 2e 38 2e 30 2e 31 32 33 00 00 |O...10.8.0.123..|
// 1300762293/0016/REQM: 00000000 4f 06 0d 0a 31 30 2e 36 2e 30 2e 31 32 33 00 00 |O...10.6.0.123..|
// 1300762293/0015/REQM: 00000000 4f 06 0d 0a 31 30 2e 36 2e 30 2e 31 32 33 00 00 |O...10.6.0.123..|
struct card_info_req {
u8 o;
u8 subcommand;
@ -328,6 +339,18 @@ struct rest_log_response {
u8 data[EYEFI_BUF_SIZE];
} __attribute__((packed));
struct upload_status {
u8 len;
be32 http_len;
be32 http_done;
// There are two strings in here:
// 1. filename on the card
// \0
// 2. directory on the card where it was found
// \0
u8 string[0];
} __attribute__((packed));
/*
* Functions that are exported from eyefi-config.c
*/

6
eyefi-linux.c
View file

@ -90,20 +90,20 @@ char *locate_eyefi_mount(void)
&foo, &bar);
// only look at fat filesystems:
if (strcmp(fs, "msdos") && strcmp(fs, "vfat")) {
debug_printf(2, "fs at '%s' is not fat, skipping...\n", mnt);
debug_printf(4, "fs at '%s' is not fat, skipping...\n", mnt);
continue;
}
// Linux's /proc/mounts has spaces like this \040
replace_escapes(&mnt[0]);
char *file = eyefi_file_on(REQM, &mnt[0]);
debug_printf(2, "looking for EyeFi file here: '%s'\n", file);
debug_printf(4, "looking for EyeFi file here: '%s'\n", file);
struct stat statbuf;
int statret;
statret = stat(file, &statbuf);
free(file);
if (statret) {
debug_printf(2, "fs at: %s is not an Eye-Fi card, skipping...\n",
debug_printf(4, "fs at: %s is not an Eye-Fi card, skipping...\n",
eyefi_mount);
continue;
}