Skip to content

Commit eec22ad

Browse files
authored
Merge pull request #18 from dronov/refactoring-verbose
fix tabs in verbose function, fix key for an offset option
2 parents 6aa8b32 + 88da970 commit eec22ad

File tree

1 file changed

+32
-29
lines changed

1 file changed

+32
-29
lines changed

main.c

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,38 @@
3434
int verbose;
3535

3636
void v_print(int mode, int len) { // mode: begin=0, progress = 1
37-
static int size = 0;
38-
static time_t started,reported;
39-
int dur,done;
40-
if (!verbose) return ;
41-
time_t now;
42-
time(&now);
43-
switch (mode) {
44-
case 0: // setup
45-
size = len;
46-
started = reported = now;
47-
break;
48-
case 1: // progress
49-
if (now == started ) return ;
50-
dur = now - started;
51-
done = size-len;
52-
if (done >0 && reported !=now) {
53-
printf("Bytes: %d (%d%c), Time: %d, ETA: %d \r",done,
54-
(done*100)/size, '%', dur, (int) ( (1.0*dur*size)/done-dur));
55-
fflush(stdout);
56-
reported = now;
57-
}
58-
break;
59-
case 2: // done
60-
dur = now - started; if (dur<1) dur=1;
61-
printf("Total: %d sec, average speed %d bytes per second.\n",dur, size/dur);
62-
break;
37+
if (!verbose) return ;
6338

64-
break;
65-
}
39+
static unsigned int size = 0;
40+
static time_t started,reported;
41+
unsigned int dur,done;
42+
time_t now;
43+
time(&now);
44+
45+
switch (mode) {
46+
case 0: // setup
47+
size = len;
48+
started = reported = now;
49+
break;
50+
case 1: // progress
51+
if (now == started ) return ;
52+
53+
dur = now - started;
54+
done = size-len;
55+
if (done > 0 && reported != now) {
56+
printf("Bytes: %d (%d%c), Time: %d, ETA: %d \r",done,
57+
(done * 100) / size, '%', dur, (int) ((1.0 * dur * size) / done-dur));
58+
fflush(stdout);
59+
reported = now;
60+
}
61+
break;
62+
case 2: // done
63+
dur = now - started; if (dur<1) dur=1;
64+
printf("Total: %d sec, average speed %d bytes per second.\n", dur, size / dur);
65+
break;
66+
default:
67+
break;
68+
}
6669
}
6770

6871
int main(int argc, char* argv[])
@@ -86,7 +89,7 @@ int main(int argc, char* argv[])
8689
" -v, --verbose print verbose info\n"\
8790
" -l, --length <bytes> manually set length\n"\
8891
" -w, --write <filename> write chip with data from filename\n"\
89-
" -0, --offset <HEX_OFFSET> write data starting from specific offset\n"\
92+
" -o, --offset <HEX_OFFSET> write data starting from specific offset\n"\
9093
" -r, --read <filename> read chip and save data to filename\n"\
9194
" -t, --turbo increase the i2c bus speed (-tt to use much faster speed)\n"\
9295
" -d, --double double the spi bus speed\n";

0 commit comments

Comments
 (0)