fixed command receiving code

4 years ago · 546fb2d9dc
parent 875b6a0620
commit 546fb2d9dc
1 changed files with 74 additions and 72 deletions
--- a/source/main.cpp
+++ b/source/main.cpp
@ -1,72 +1,74 @@
-/**
- * @file main.cpp
- * @brief Program entry point.
- *
- * Copyright (C) 2020 Clyne Sullivan
- *
- * Distributed under the GNU GPL v3 or later. You should have received a copy of
- * the GNU General Public License along with this program.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "ch.h"
-#include "hal.h"
-
-#include "adc.hpp"
-#include "dac.hpp"
-#include "usbserial.hpp"
-
-#include <array>
-
-static_assert(sizeof(adcsample_t) == sizeof(uint16_t));
-
-#if CACHE_LINE_SIZE > 0
-CC_ALIGN(CACHE_LINE_SIZE)
-#endif
-static std::array<adcsample_t, CACHE_SIZE_ALIGN(adcsample_t, 2048)> adc_samples;
-
-int main()
-{
-    halInit();
-    chSysInit();
-
-    palSetPadMode(GPIOA, 5,  PAL_MODE_OUTPUT_PUSHPULL); // LED
-
-    ADCd adc (ADCD1, GPTD4);
-    adc.start();
-
-    //DACd dac (DACD1, {
-    //    .init         = 0,
-    //    .datamode     = DAC_DHRM_12BIT_RIGHT,
-    //    .cr           = 0
-    //});
-    //dac.start();
-    //dac.write(0, 1024);
-
-    USBSeriald usbd (SDU1);
-    usbd.start();
-
-	while (true) {
-        if (usbd.active()) {
-            // Expect to receive a byte command 'packet'.
-            if (char cmd[3]; usbd.read(&cmd, 3) > 0) {
-                switch (cmd[0]) {
-                case 'r': // Read in analog signal
-                    if (auto count = std::min(static_cast<unsigned int>(cmd[1] | (cmd[2] << 8)), adc_samples.size()); count > 0) {
-                        adc.getSamples(&adc_samples[0], count);
-                        usbd.write(adc_samples.data(), count * sizeof(adcsample_t));
-                    }
-                    break;
-                case 'i': // Identify ourself as an stmdsp device
-                    usbd.write("stmdsp", 6);
-                    break;
-                default:
-                    break;
-                }
-            }
-        }
-
-		chThdSleepMilliseconds(1);
-	}
-}
-
+/**
+ * @file main.cpp
+ * @brief Program entry point.
+ *
+ * Copyright (C) 2020 Clyne Sullivan
+ *
+ * Distributed under the GNU GPL v3 or later. You should have received a copy of
+ * the GNU General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "ch.h"
+#include "hal.h"
+
+#include "adc.hpp"
+#include "dac.hpp"
+#include "usbserial.hpp"
+
+#include <array>
+
+static_assert(sizeof(adcsample_t) == sizeof(uint16_t));
+
+#if CACHE_LINE_SIZE > 0
+CC_ALIGN(CACHE_LINE_SIZE)
+#endif
+static std::array<adcsample_t, CACHE_SIZE_ALIGN(adcsample_t, 2048)> adc_samples;
+
+int main()
+{
+    halInit();
+    chSysInit();
+
+    palSetPadMode(GPIOA, 5,  PAL_MODE_OUTPUT_PUSHPULL); // LED
+
+    ADCd adc (ADCD1, GPTD4);
+    adc.start();
+
+    //DACd dac (DACD1, {
+    //    .init         = 0,
+    //    .datamode     = DAC_DHRM_12BIT_RIGHT,
+    //    .cr           = 0
+    //});
+    //dac.start();
+    //dac.write(0, 1024);
+
+    USBSeriald usbd (SDU1);
+    usbd.start();
+
+	while (true) {
+        if (usbd.active()) {
+            // Expect to receive a byte command 'packet'.
+            if (char cmd[3]; usbd.read(&cmd, 1) > 0) {
+                switch (cmd[0]) {
+                case 'r': // Read in analog signal
+                    if (usbd.read(&cmd[1], 2) < 2)
+                        break;
+                    if (auto count = std::min(static_cast<unsigned int>(cmd[1] | (cmd[2] << 8)), adc_samples.size()); count > 0) {
+                        adc.getSamples(&adc_samples[0], count);
+                        usbd.write(adc_samples.data(), count * sizeof(adcsample_t));
+                    }
+                    break;
+                case 'i': // Identify ourself as an stmdsp device
+                    usbd.write("stmdsp", 6);
+                    break;
+                default:
+                    break;
+                }
+            }
+        }
+
+		chThdSleepMilliseconds(1);
+	}
+}
+