.gitignore

@@ -24,5 +24,4 @@ V203/usb/scope/software/moc/*
 V203/usb/scope/software/obj/*
 V203/usb/scope/software/qrc_src.cpp
 V203/usb/scope/software/ui_mainwindow.h
-V203/usb/spitest/*
 

V203/usb/ch32v203/adcscope.cpp

@@ -69,18 +69,12 @@ static inline void AdcCalibrate (void) noexcept {
   RCC.APB2PRSTR.B.ADC1RST = SET;
   RCC.APB2PRSTR.B.ADC1RST = RESET;  
   // set channels
-  ADC1.RSQR3__CHANNEL.modify([](ADC1_Type::RSQR3__CHANNEL_DEF & r) -> auto {
+  ADC1.RSQR3__CHANNEL.B.SQ1__CHSEL  = 0u;      // CH0
-    r.B.SQ1__CHSEL  = 0u;      // CH0
+  ADC1.RSQR3__CHANNEL.B.SQ2         = 1u;      // CH1
-    r.B.SQ2         = 1u;      // CH1
-    return r.R;
-  });
   ADC1.RSQR1.B.L      = ADC_MAXCHANNELS - 1U;  // 2 regular conversion
-  ADC1.SAMPTR2_CHARGE2.modify([](ADC1_Type::SAMPTR2_CHARGE2_DEF & r) -> auto {
+  static constexpr unsigned ts = 0u;
-    static constexpr unsigned ts = 0u;
+  ADC1.SAMPTR2_CHARGE2.B.SMP2_TKCG2 = ts;
-    r.B.SMP0_TKCG0 = ts;
+  ADC1.SAMPTR2_CHARGE2.B.SMP3_TKCG3 = ts;
-    r.B.SMP1_TKCG1 = ts;
-    return r.R;
-  });
   ADC1.CTLR1.B.SCAN   = SET;
   
   ADC1.CTLR2.B.ADON   = SET;

V203/usb/ch32v203/gpio.h

@@ -33,23 +33,13 @@ class GpioClass {
       //r.B.IOPCEN = SET;
         return r.R;
       });
-      if (pin < 8u) {
+      const uint32_t pos = pin << 2;
-        const uint32_t pos = pin << 2;
+      port.CFGLR.modify([=](GPIOA_Type::CFGLR_DEF & r)->auto {
-        port.CFGLR.modify([=](GPIOA_Type::CFGLR_DEF & r)->auto {
+        uint32_t t = r.R;
-          uint32_t t = r.R;
+        t &= ~(0xFu << pos);
-          t &= ~(0xFu << pos);
+        t |= _mode  << pos;
-          t |= _mode  << pos;
+        return t;
-          return t;
+      });
-        });
-      } else {
-        const uint32_t pos = (pin - 8u) << 2;
-        port.CFGHR.modify([=](GPIOA_Type::CFGHR_DEF & r)->auto {
-          uint32_t t = r.R;
-          t &= ~(0xFu << pos);
-          t |= _mode  << pos;
-          return t;
-        });
-      }
     }
     void operator<< (const bool b) const {
       port.BSHR.R = b ? 1u << pin : 1u << (pin + 16);

V203/usb/ch32v203/spiclass.cpp

@@ -82,14 +82,14 @@ void SpiClass::Init() {
     return r.R;
   }); 
   SPI1.CTLR1.modify([](SPI1_Type::CTLR1_DEF & r) -> uint32_t {
-    r.B.CPHA     = RESET;
+    r.B.CPHA     = SET;
-    r.B.CPOL     = RESET;
+    r.B.CPOL     = SET;
     r.B.MSTR     = SET;
     r.B.DFF      = RESET;     // 8 bit
     r.B.SSM      = SET;
     r.B.SSI      = SET;
-    r.B.LSBFIRST = SET;
+    r.B.LSBFIRST = RESET;
-    r.B.BR       = FPCLK_32;  // 4.5 MHz
+    r.B.BR       = FPCLK_64;  // 4.5 MHz
     return r.R;
   });
   SPI1.CTLR2.modify([](SPI1_Type::CTLR2_DEF & r) -> uint32_t {
@@ -106,8 +106,6 @@ bool SpiClass::send (const char * data, const unsigned int len) {
   complete = false;
   total    = len > SPIBUFLEN ? SPIBUFLEN : len;
   memcpy (buffer, data, total);
-  DMA1.PADDR3.R    = reinterpret_cast<size_t> (& SPI1.DATAR);
-  DMA1.MADDR3.R    = reinterpret_cast<size_t> (buffer);
   DMA1.CNTR3.R     = total;
   DMA1.CFGR3.B.EN  = SET;
   SPI1.CTLR1.B.SPE = SET;

V203/usb/ch32v203/spisim.cpp

@@ -1,22 +0,0 @@
-#include "spisim.h"
-#include "system.h"
-
-SpiSim::SpiSim() noexcept : nss(GPIOA,4), sck(GPIOA,5), mosi(GPIOA,7) {
-  delay_init();
-  nss  << true;
-  sck  << false;
-  mosi << false;
-}
-void SpiSim::outbyte(const uint8_t b) const {
-  nss << false;
-  for (unsigned n=0u; n<8; n++) {
-    const bool bit = (b & (1u << n)) ? true : false;
-    mosi << bit;
-    delay_us (2);
-    sck  << true;
-    delay_us (4);
-    sck  << false;
-    delay_us (2);
-  }
-  nss << true;
-}

V203/usb/ch32v203/spisim.h

@@ -1,17 +0,0 @@
-#ifndef SPISIM_H
-#define SPISIM_H
-#include "gpio.h"
-
-/** Původní třída SpiClass s DMA a hardware SPI se chová divně
- * a je zbytečně složitá. Zde je potřeba odeslat 1 Byte na obvod
- * 74595 a je jednodušší to udělat softwarově. Výstup je sice
- * blokující, ale ten byte je dost krátká doba, aby to nerušilo.
- */
-class SpiSim {
-  GpioClass nss, sck, mosi;
-  public:
-    explicit SpiSim  () noexcept;
-    void     outbyte (const uint8_t b) const;
-};
-
-#endif // SPISIM_H

V203/usb/scope/firmware/Makefile

@@ -17,7 +17,7 @@ DEL    = rm -f
 
 # zdrojaky
 OBJS   = main.o hack.o
-OBJS  += usb_desc.o cdc_class.o spisim.o adcscope.o samplering.o
+OBJS  += usb_desc.o cdc_class.o spiclass.o adcscope.o samplering.o
 
 include $(TARGET)/$(TOOL).mk
 BOBJS = $(addprefix $(BLD),$(OBJS))

V203/usb/scope/firmware/samplering.cpp

@@ -76,11 +76,11 @@ void SampleRing::CommandPass(const unsigned int cmd) {
   switch (dest) {
     case DEST_CHA:
       voltage.a = header.bits.cmd_value;
-      spi.outbyte (voltage.common[0]);
+      spi.send (voltage.common, 1);
       break;
     case DEST_CHB:
       voltage.b = header.bits.cmd_value;
-      spi.outbyte (voltage.common[0]);
+      spi.send (voltage.common, 1);
       break;
     case DEST_BASE:
       m_time_base_order = header.bits.cmd_value;

V203/usb/scope/firmware/samplering.h

@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include "structures.h"
 #include "baselayer.h"
-#include "spisim.h"
+#include "spiclass.h"
 
 static constexpr unsigned RING_BIT = 10;
 static constexpr unsigned RING_LEN = 1u << RING_BIT;
@@ -19,7 +19,7 @@ enum RCVD_STATUS {
 };
 
 class SampleRing : public BaseLayer {
-  SpiSim                        spi;
+  SpiClass                      spi;
   ChannelVoltage                voltage;
   [[gnu::aligned(4)]]DATA_BLOCK ring_buffer [RING_LEN];
   TrigerSettings                m_settings;
@@ -38,7 +38,7 @@ class SampleRing : public BaseLayer {
     explicit SampleRing () noexcept : BaseLayer(), spi(), voltage(), m_settings(), m_head(0), m_tail(0), m_lenght(0),
                                      m_old_triger(false), m_trigered(false), m_finished(false),
                                      m_mode (TIME_BASE_TRIGERED), o_mode (TIME_BASE_TRIGERED), m_time_base_order(6u),
-                                     rcvd_counter(0u), rcvd_status (RCVD_IDLE) { };
+                                     rcvd_counter(0u), rcvd_status (RCVD_IDLE) { spi.Init(); };
     uint32_t Up (const char * data, const uint32_t len) override;
     void write  (DATA_BLOCK const * data);
     void pass   ();

V203/usb/scope/firmware/structures.h

@@ -28,16 +28,16 @@ struct TrigerSettings {
 };
 static_assert (sizeof(TrigerSettings) == 10, "TrigerSettings error");
 enum VOLTAGE_SCALE {
-  S100mV = 0b1100,  // 1:1  x10
+  S100mV = 0b0011,  // 1:1  x10
-  S200mV = 0b1110,  // 1:1  x5
+  S200mV = 0b0111,  // 1:1  x5
-  S500mV = 0b1101,  // 1:1  x2
+  S500mV = 0b1011,  // 1:1  x2
   
   S1V    = 0b0000,  // 1:10 x10
-  S2V    = 0b0010,  // 1:10 x5
+  S2V    = 0b0100,  // 1:10 x5
-  S5V    = 0b0001,  // 1:10 x2
+  S5V    = 0b1000,  // 1:10 x2
   
-  S10V   = 0b1000,  // 1:100x10
+  S10V   = 0b0001,  // 1:100x10
-  S20V   = 0b1010,  // 1:100x5
+  S20V   = 0b0101,  // 1:100x5
   S50V   = 0b1001,  // 1:100x2
 };
 union ChannelVoltage {