Rename write_clock to write_clock_ns, because it is. Tweak the defaul…

…t value for correctness.
davidgiven · Sep 30, 2024 · 045e5e7 · 045e5e7
1 parent 6fd98e3
commit 045e5e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/usb/applesauceusb.cc b/lib/usb/applesauceusb.cc
@@ -52,7 +52,7 @@ static Bytes fluxEngineToApplesauceWriteData(
         if (!fmr.findEvent(F_BIT_PULSE, ticks))
             break;
 
-        uint32_t applesauceTicks = ticks * NS_PER_TICK / clock;
+        uint32_t applesauceTicks = (double)ticks * NS_PER_TICK / clock;
         while (applesauceTicks >= 0xffff)
         {
             bw.write_le16(0xffff);
@@ -279,7 +279,7 @@ class ApplesauceUsb : public USB
         doCommand("disk:wclear");
 
         Bytes asdata =
-            fluxEngineToApplesauceWriteData(fldata, _config.write_clock());
+            fluxEngineToApplesauceWriteData(fldata, _config.write_clock_ns());
         doCommand(fmt::format("data:>{}", asdata.size()));
         _serial->write(asdata);
         checkCommandResult(_serial->readLine());

diff --git a/lib/usb/usb.proto b/lib/usb/usb.proto
@@ -21,8 +21,8 @@ message ApplesauceProto {
 		[(help) = "Applesauce serial port to use"];
 	optional bool verbose = 2
 		[(help) = "Enable verbose protocol logging", default = false];
-	optional float write_clock = 3
-		[(help) = "Write clock speed", default = 22.5];
+	optional float write_clock_ns = 3
+		[(help) = "Write clock speed", default = 22.45];
 }
 
 message UsbProto {