nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

note high-speed mode in help and logging (fixes #804)

Browse Source
This commit is contained in:
John
2023-01-30 22:30:56 +01:00
parent d35d0bb71d
commit 3b6d5402c9
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/README.md
+6 -5
View File
@@ -49,10 +49,11 @@ settings.
-o, --pingoff disable visual ping -o, --pingoff disable visual ping
-p, --pingon enable visual ping (default) -p, --pingon enable visual ping (default)
-r, --reset reset the device at the end on success -r, --reset reset the device at the end on success
--variant=VARIANT set the VARIANT to U=USB/RPI, W=WIFI, E=Ethernet, --variant=VARIANT set the VARIANT to U=USB/RPI (high-speed), W=WIFI,
N=non-enhanced USB/RPI/WIFI, F=non-enhanced E=Ethernet, N=non-enhanced USB/RPI/WIFI,
Ethernet (lowercase to allow hardware jumpers, F=non-enhanced Ethernet (lowercase to allow
default "u", since firmware 20221206) hardware jumpers, default "u", since firmware
20221206)
Tool options: Tool options:
-s, --slow use low speed for transfer -s, --slow use low speed for transfer
@@ -82,7 +83,7 @@ MAC address: ae:b0:53:26:15:80
IP address: DHCP (default) IP address: DHCP (default)
Arbitration delay: 200 us (default) Arbitration delay: 200 us (default)
Visual ping: on (default) Visual ping: on (default)
Variant: USB/RPI, allow hardware jumpers (default) Variant: USB/RPI (high-speed), allow hardware jumpers (default)
New firmware version: 1 [7f16] New firmware version: 1 [7f16]
erasing flash: done. erasing flash: done.
src/tools/ebuspicloader.cpp
+2 -2
View File
@@ -73,7 +73,7 @@ static const struct argp_option argpoptions[] = {
{nullptr, 0, nullptr, 0, "PIC options:", 3 }, {nullptr, 0, nullptr, 0, "PIC options:", 3 },
{"pingon", 'p', nullptr, 0, "enable visual ping (default)", 0 }, {"pingon", 'p', nullptr, 0, "enable visual ping (default)", 0 },
{"pingoff", 'o', nullptr, 0, "disable visual ping", 0 }, {"pingoff", 'o', nullptr, 0, "disable visual ping", 0 },
{"variant", -3, "VARIANT", 0, "set the VARIANT to U=USB/RPI, W=WIFI, E=Ethernet," {"variant", -3, "VARIANT", 0, "set the VARIANT to U=USB/RPI (high-speed), W=WIFI, E=Ethernet,"
" N=non-enhanced USB/RPI/WIFI, F=non-enhanced Ethernet" " N=non-enhanced USB/RPI/WIFI, F=non-enhanced Ethernet"
" (lowercase to allow hardware jumpers, default \"u\"" " (lowercase to allow hardware jumpers, default \"u\""
", since firmware 20221206)", 0 }, ", since firmware 20221206)", 0 },
@@ -1093,7 +1093,7 @@ int readSettings(int fd, uint8_t* currentData = nullptr) {
std::cout << "Variant: "; // since firmware 20221206 std::cout << "Variant: "; // since firmware 20221206
switch (configData[5]&0x03) { switch (configData[5]&0x03) {
case 3: case 3:
std::cout << "USB/RPI"; std::cout << "USB/RPI (high-speed)";
break; break;
case 2: case 2:
std::cout << "WIFI"; std::cout << "WIFI";