hide deprecated code; make USB snippet common for F0/F1/F3

2026-02-28 03:44:30 +03:00 · 2024-09-02 18:21:41 +03:00
parent 9166996bff
commit bdbd7d68d9
419 changed files with 3445 additions and 752 deletions
--- a/F1:F103/PL2303_ringbuffer/Makefile
+++ b/F1:F103/PL2303_ringbuffer/Makefile
@@ -3,7 +3,8 @@ BINARY      := PL2303
 MCU         ?= F103x6
 # change this linking script depending on particular MCU model,
 LDSCRIPT    ?= stm32f103x6.ld
-DEFINES := -DUSB1_16 -DSTM32F10X_LD
+#DEFINES := -DUSB1_16 -DSTM32F10X_LD
+DEFINES := -DSTM32F10X_LD

 include ../makefile.f1
 include ../../makefile.stm32
--- a/F1:F103/PL2303_ringbuffer/PL2303.bin
+++ b/F1:F103/PL2303_ringbuffer/PL2303.bin
--- a/F1:F103/PL2303_ringbuffer/hardware.c
+++ b/F1:F103/PL2303_ringbuffer/hardware.c
@@ -25,9 +25,9 @@ static inline void gpio_setup(){
 //    AFIO->MAPR = AFIO_MAPR_SWJ_CFG_DISABLE;
    AFIO->MAPR = AFIO_MAPR_SWJ_CFG_JTAGDISABLE; // for PA15
    // Set led as opendrain output
-    //GPIOC->CRH |= CRH(13, CNF_ODOUTPUT | MODE_SLOW);
+    GPIOC->CRH |= CRH(13, CNF_ODOUTPUT | MODE_SLOW);
    // USB pullup (PA15) - pushpull output
-    GPIOA->CRH = CRH(8, CNF_PPOUTPUT | MODE_SLOW) | CRH(15, CNF_PPOUTPUT | MODE_SLOW);
+    GPIOA->CRH = /* CRH(8, CNF_PPOUTPUT | MODE_SLOW) | */ CRH(15, CNF_PPOUTPUT | MODE_SLOW);
 }

 void hw_setup(){
--- a/F1:F103/PL2303_ringbuffer/hardware.h
+++ b/F1:F103/PL2303_ringbuffer/hardware.h
@@ -22,13 +22,18 @@

 // LED0 - PC13 (bluepill), blinking each second
 // PA8 - my board
-#define LED0_port   GPIOA
-#define LED0_pin    (1<<8)
+#define LED0_port   GPIOC
+#define LED0_pin    (1<<13)

 #define LED_blink(x)    pin_toggle(x ## _port, x ## _pin)
 #define LED_on(x)       pin_clear(x ## _port, x ## _pin)
 #define LED_off(x)      pin_set(x ## _port, x ## _pin)

+#define USBPU_port  GPIOA
+#define USBPU_pin   (1<<15)
+#define USBPU_ON()  pin_set(USBPU_port, USBPU_pin)
+#define USBPU_OFF() pin_clear(USBPU_port, USBPU_pin)
+
 extern volatile uint32_t Tms;

 void hw_setup();
--- a/F1:F103/PL2303_ringbuffer/main.c
+++ b/F1:F103/PL2303_ringbuffer/main.c
@@ -33,9 +33,8 @@ int main(void){
    char inbuff[MAXSTRLEN+1];
    StartHSE();
    hw_setup();
-    SysTick_Config(72000);
    USBPU_OFF();
-    hw_setup();
+    SysTick_Config(72000);
    usart_setup();
    USB_setup();
    USBPU_ON();
@@ -56,6 +55,7 @@ int main(void){
        if(l < 0) USB_sendstr("ERROR: USB buffer overflow or string was too long\n");
        else if(l){
            USEND("Got USB data\n");
+            USB_sendstr("RECEIVED: _"); USB_sendstr(inbuff); USB_sendstr("_\n");
            const char *ans = parse_cmd(inbuff);
            if(ans) USB_sendstr(ans);
        }
--- a/F1:F103/PL2303_ringbuffer/pl2303.creator.user
+++ b/F1:F103/PL2303_ringbuffer/pl2303.creator.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 8.0.2, 2023-06-11T19:24:48. -->
+<!-- Written by QtCreator 14.0.1, 2024-09-02T16:40:13. -->
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>
@@ -8,7 +8,7 @@
 </data>
 <data>
  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
+  <value type="qlonglong">0</value>
 </data>
 <data>
  <variable>ProjectExplorer.Project.EditorSettings</variable>
@@ -28,7 +28,7 @@
     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
    </valuemap>
   </valuemap>
-   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">2</value>
   <value type="QByteArray" key="EditorConfiguration.Codec">KOI8-R</value>
   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
   <value type="int" key="EditorConfiguration.IndentSize">4</value>
@@ -37,6 +37,7 @@
   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="int" key="EditorConfiguration.PreferAfterWhitespaceComments">0</value>
   <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
@@ -54,6 +55,7 @@
   <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
   <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.tintMarginArea">true</value>
  </valuemap>
 </data>
 <data>
@@ -67,7 +69,9 @@
    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
   </valuemap>
+   <value type="bool" key="AutoTest.ApplyFilter">false</value>
   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
+   <valuelist type="QVariantList" key="AutoTest.PathFilters"/>
   <value type="int" key="AutoTest.RunAfterBuild">0</value>
   <value type="bool" key="AutoTest.UseGlobal">true</value>
   <valuemap type="QVariantMap" key="ClangTools">
@@ -75,6 +79,7 @@
    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
    <value type="int" key="ClangTools.ParallelJobs">8</value>
+    <value type="bool" key="ClangTools.PreferConfigFile">false</value>
    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
@@ -89,9 +94,9 @@
   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{65a14f9e-e008-4c1b-89df-4eaa4774b6e3}</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Big/Data/00__Electronics/STM32/F303-nolib/blink</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
@@ -102,9 +107,9 @@
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Сборка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Сборка</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
@@ -115,9 +120,9 @@
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericMakeStep</value>
     </valuemap>
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Очистка</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Очистка</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
@@ -128,12 +133,12 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Default</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">GenericProjectManager.GenericBuildConfiguration</value>
   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Развёртывание</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Развёртывание</value>
+     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
@@ -141,24 +146,29 @@
    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
    <valuelist type="QVariantList" key="CustomOutputParsers"/>
    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
+    <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph dwarf,4096 -F 250</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
-    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
  </valuemap>
 </data>
 <data>
  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">1</value>
+  <value type="qlonglong">1</value>
 </data>
 <data>
  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
--- a/F1:F103/PL2303_ringbuffer/proto.c
+++ b/F1:F103/PL2303_ringbuffer/proto.c
@@ -17,10 +17,9 @@
 */

 #include "proto.h"
+#include "hardware.h"
 #include "usb.h"

-extern uint32_t Tms;
-
 const char *test = "123456789A123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789I123456789J123456789K123456789L123456789M123456789N123456789O123456789P123456789Q123456789R123456789S123456789T123456789U123456789V123456789W123456789X123456789Y";

 char *omit_spaces(const char *buf){
--- a/F1:F103/PL2303_ringbuffer/ringbuffer.c
+++ b/F1:F103/PL2303_ringbuffer/ringbuffer.c
@@ -1,5 +1,4 @@
 /*
- * This file is part of the pl2303 project.
 * Copyright 2023 Edward V. Emelianov <edward.emelianoff@gmail.com>.
 *
 * This program is free software: you can redistribute it and/or modify
@@ -18,19 +17,21 @@

 #include "ringbuffer.h"

-// stored data length
-int RB_datalen(ringbuffer *b){
+static int datalen(ringbuffer *b){
    if(b->tail >= b->head) return (b->tail - b->head);
    else return (b->length - b->head + b->tail);
 }

-/**
- * @brief RB_hasbyte - check if buffer has given byte stored
- * @param b - buffer
- * @param byte - byte to find
- * @return index if found, -1 if none
- */
-int RB_hasbyte(ringbuffer *b, uint8_t byte){
+// stored data length
+int RB_datalen(ringbuffer *b){
+    if(b->busy) return -1;
+    b->busy = 1;
+    int l = datalen(b);
+    b->busy = 0;
+    return l;
+}
+
+static int hasbyte(ringbuffer *b, uint8_t byte){
    if(b->head == b->tail) return -1; // no data in buffer
    int startidx = b->head;
    if(b->head > b->tail){ //
@@ -43,6 +44,20 @@ int RB_hasbyte(ringbuffer *b, uint8_t byte){
    return -1;
 }

+/**
+ * @brief RB_hasbyte - check if buffer has given byte stored
+ * @param b - buffer
+ * @param byte - byte to find
+ * @return index if found, -1 if none or busy
+ */
+int RB_hasbyte(ringbuffer *b, uint8_t byte){
+    if(b->busy) return -1;
+    b->busy = 1;
+    int ret = hasbyte(b, byte);
+    b->busy = 0;
+    return ret;
+}
+
 // poor memcpy
 static void mcpy(uint8_t *targ, const uint8_t *src, int l){
    while(l--) *targ++ = *src++;
@@ -54,15 +69,8 @@ TRUE_INLINE void incr(ringbuffer *b, volatile int *what, int n){
    if(*what >= b->length) *what -= b->length;
 }

-/**
- * @brief RB_read - read data from ringbuffer
- * @param b - buffer
- * @param s - array to write data
- * @param len - max len of `s`
- * @return bytes read
- */
-int RB_read(ringbuffer *b, uint8_t *s, int len){
-    int l = RB_datalen(b);
+static int read(ringbuffer *b, uint8_t *s, int len){
+    int l = datalen(b);
    if(!l) return 0;
    if(l > len) l = len;
    int _1st = b->length - b->head;
@@ -78,33 +86,49 @@ int RB_read(ringbuffer *b, uint8_t *s, int len){
    return _1st;
 }

+/**
+ * @brief RB_read - read data from ringbuffer
+ * @param b - buffer
+ * @param s - array to write data
+ * @param len - max len of `s`
+ * @return bytes read or -1 if busy
+ */
+int RB_read(ringbuffer *b, uint8_t *s, int len){
+    if(b->busy) return -1;
+    b->busy = 1;
+    int r = read(b, s, len);
+    b->busy = 0;
+    return r;
+}
+
+static int readto(ringbuffer *b, uint8_t byte, uint8_t *s, int len){
+    int idx = hasbyte(b, byte);
+    if(idx < 0) return 0;
+    int partlen = idx + 1 - b->head;
+    // now calculate length of new data portion
+    if(idx < b->head) partlen += b->length;
+    if(partlen > len) return -read(b, s, len);
+    return read(b, s, partlen);
+}
+
 /**
 * @brief RB_readto fill array `s` with data until byte `byte` (with it)
 * @param b - ringbuffer
 * @param byte - check byte
 * @param s - buffer to write data
 * @param len - length of `s`
- * @return amount of bytes written (negative, if len<data in buffer)
+ * @return amount of bytes written (negative, if len<data in buffer or buffer is busy)
 */
 int RB_readto(ringbuffer *b, uint8_t byte, uint8_t *s, int len){
-    int idx = RB_hasbyte(b, byte);
-    if(idx < 0) return 0;
-    int partlen = idx + 1 - b->head;
-    // now calculate length of new data portion
-    if(idx < b->head) partlen += b->length;
-    if(partlen > len) return -RB_read(b, s, len);
-    return RB_read(b, s, partlen);
+    if(b->busy) return -1;
+    b->busy = 1;
+    int n = readto(b, byte, s, len);
+    b->busy = 0;
+    return n;
 }

-/**
- * @brief RB_write - write some data to ringbuffer
- * @param b - buffer
- * @param str - data
- * @param l - length
- * @return amount of bytes written
- */
-int RB_write(ringbuffer *b, const uint8_t *str, int l){
-    int r = b->length - 1 - RB_datalen(b); // rest length
+static int write(ringbuffer *b, const uint8_t *str, int l){
+    int r = b->length - 1 - datalen(b); // rest length
    if(l > r) l = r;
    if(!l) return 0;
    int _1st = b->length - b->tail;
@@ -117,8 +141,27 @@ int RB_write(ringbuffer *b, const uint8_t *str, int l){
    return l;
 }

+/**
+ * @brief RB_write - write some data to ringbuffer
+ * @param b - buffer
+ * @param str - data
+ * @param l - length
+ * @return amount of bytes written or -1 if busy
+ */
+int RB_write(ringbuffer *b, const uint8_t *str, int l){
+    if(b->busy) return -1;
+    b->busy = 1;
+    int w = write(b, str, l);
+    b->busy = 0;
+    return w;
+}
+
 // just delete all information in buffer `b`
-void RB_clearbuf(ringbuffer *b){
+int RB_clearbuf(ringbuffer *b){
+    if(b->busy) return -1;
+    b->busy = 1;
    b->head = 0;
    b->tail = 0;
+    b->busy = 0;
+    return 1;
 }
--- a/F1:F103/PL2303_ringbuffer/ringbuffer.h
+++ b/F1:F103/PL2303_ringbuffer/ringbuffer.h
@@ -1,5 +1,4 @@
 /*
- * This file is part of the pl2303 project.
 * Copyright 2023 Edward V. Emelianov <edward.emelianoff@gmail.com>.
 *
 * This program is free software: you can redistribute it and/or modify
@@ -17,13 +16,21 @@
 */

 #pragma once
+
+#if defined STM32F0
+#include <stm32f0.h>
+#elif defined STM32F1
 #include <stm32f1.h>
+#elif defined STM32F3
+#include <stm32f3.h>
+#endif

 typedef struct{
    uint8_t *data;      // data buffer
    const int length;   // its length
    int head;           // head index
    int tail;           // tail index
+    volatile int busy; // == TRUE if buffer is busy now
 } ringbuffer;

 int RB_read(ringbuffer *b, uint8_t *s, int len);
@@ -31,5 +38,4 @@ int RB_readto(ringbuffer *b, uint8_t byte, uint8_t *s, int len);
 int RB_hasbyte(ringbuffer *b, uint8_t byte);
 int RB_write(ringbuffer *b, const uint8_t *str, int l);
 int RB_datalen(ringbuffer *b);
-void RB_clearbuf(ringbuffer *b);
-
+int RB_clearbuf(ringbuffer *b);
--- a/F1:F103/PL2303_ringbuffer/usart.h
+++ b/F1:F103/PL2303_ringbuffer/usart.h
@@ -30,16 +30,6 @@
 // macro for static strings
 #define USEND(str) usart_send(str)

-#ifdef EBUG
-#define x__(a) #a
-#define STR(a) x__(a)
-#define DBG(str)  do{usart_send(__FILE__ " (L" STR(__LINE__) "): " str); \
-    usart_putchar('\n'); usart_transmit(); }while(0)
-#else
-#define DBG(str)
-#endif
-
-
 #define usartrx()  (usart_linerdy)
 #define usartovr() (usart_bufovr)

--- a/F1:F103/PL2303_ringbuffer/usb.c
+++ b/F1:F103/PL2303_ringbuffer/usb.c
@@ -1,6 +1,5 @@
 /*
- * This file is part of the pl2303 project.
- * Copyright 2023 Edward V. Emelianov <edward.emelianoff@gmail.com>.
+ * Copyright 2024 Edward V. Emelianov <edward.emelianoff@gmail.com>.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -27,18 +26,22 @@ static volatile uint8_t usbbuff[USB_TXBUFSZ]; // temporary buffer for sending da
 static uint8_t obuf[RBOUTSZ], ibuf[RBINSZ];
 volatile ringbuffer rbout = {.data = obuf, .length = RBOUTSZ, .head = 0, .tail = 0};
 volatile ringbuffer rbin = {.data = ibuf, .length = RBINSZ, .head = 0, .tail = 0};
-// transmission is succesfull
-volatile uint8_t bufisempty = 1;
+// inbuf overflow when receiving
 volatile uint8_t bufovrfl = 0;
+// last send data size
+static volatile int lastdsz = 0;

+// called from transmit EP
 void send_next(){
-    if(bufisempty) return;
-    static int lastdsz = 0;
    int buflen = RB_read((ringbuffer*)&rbout, (uint8_t*)usbbuff, USB_TXBUFSZ);
-    if(!buflen){
+    if(buflen == 0){
        if(lastdsz == 64) EP_Write(3, NULL, 0); // send ZLP after 64 bits packet when nothing more to send
        lastdsz = 0;
-        bufisempty = 1;
+        return;
+    }else if(buflen < 0){
+        lastdsz = 0;
+        // Uncomment next line if you want 4Mbit/s instead of 6Mbit/s
+        //EP_Write(3, NULL, 0); // send ZLP if buffer is in writting state now
        return;
    }
    EP_Write(3, (uint8_t*)usbbuff, buflen);
@@ -47,44 +50,42 @@ void send_next(){

 // blocking send full content of ring buffer
 int USB_sendall(){
-    while(!bufisempty){
-        if(!usbON) return 0;
+    while(lastdsz > 0){
+        if(!usbON) return FALSE;
    }
-    return 1;
+    return TRUE;
 }

 // put `buf` into queue to send
 int USB_send(const uint8_t *buf, int len){
-    if(!buf || !usbON || !len) return 0;
+    if(!buf || !usbON || !len) return FALSE;
    while(len){
        int a = RB_write((ringbuffer*)&rbout, buf, len);
-        len -= a;
-        buf += a;
-        if(bufisempty){
-            bufisempty = 0;
-            send_next();
-        }
+        if(a > 0){
+            len -= a;
+            buf += a;
+        } else if (a < 0) continue; // do nothing if buffer is in reading state
+        if(lastdsz == 0) send_next(); // need to run manually - all data sent, so no IRQ on IN
    }
-    return 1;
+    return TRUE;
 }

 int USB_putbyte(uint8_t byte){
-    if(!usbON) return 0;
-    while(0 == RB_write((ringbuffer*)&rbout, &byte, 1)){
-        if(bufisempty){
-            bufisempty = 0;
-            send_next();
-        }
+    if(!usbON) return FALSE;
+    int l = 0;
+    while((l = RB_write((ringbuffer*)&rbout, &byte, 1)) != 1){
+        if(l < 0) continue;
    }
-    return 1;
+    if(lastdsz == 0) send_next(); // need to run manually - all data sent, so no IRQ on IN
+    return TRUE;
 }

 int USB_sendstr(const char *string){
-    if(!string || !usbON) return 0;
+    if(!string || !usbON) return FALSE;
    int len = 0;
    const char *b = string;
    while(*b++) ++len;
-    if(!len) return 0;
+    if(!len) return FALSE;
    return USB_send((const uint8_t*)string, len);
 }

@@ -95,13 +96,14 @@ int USB_sendstr(const char *string){
 * @return amount of received bytes (negative, if overfull happened)
 */
 int USB_receive(uint8_t *buf, int len){
-    int sz = RB_read((ringbuffer*)&rbin, buf, len);
+    chkin();
    if(bufovrfl){
-        RB_clearbuf((ringbuffer*)&rbin);
-        if(!sz) sz = -1;
-        else sz = -sz;
+        while(1 != RB_clearbuf((ringbuffer*)&rbin));
        bufovrfl = 0;
+        return -1;
    }
+    int sz = RB_read((ringbuffer*)&rbin, buf, len);
+    if(sz < 0) return 0; // buffer in writting state
    return sz;
 }

@@ -112,15 +114,22 @@ int USB_receive(uint8_t *buf, int len){
 * @return strlen or negative value indicating overflow (if so, string won't be ends with 0 and buffer should be cleared)
 */
 int USB_receivestr(char *buf, int len){
-    int l = RB_readto((ringbuffer*)&rbin, '\n', (uint8_t*)buf, len);
-    if(l == 0) return 0;
-    if(--l < 0 || bufovrfl) RB_clearbuf((ringbuffer*)&rbin);
-    else buf[l] = 0; // replace '\n' with strend
+    chkin();
    if(bufovrfl){
-        if(l > 0) l = -l;
-        else l = -1;
+        while(1 != RB_clearbuf((ringbuffer*)&rbin));
        bufovrfl = 0;
+        return -1;
    }
+    int l = RB_readto((ringbuffer*)&rbin, '\n', (uint8_t*)buf, len);
+    if(l < 1){
+        if(rbin.length == RB_datalen((ringbuffer*)&rbin)){ // buffer is full but no '\n' found
+            while(1 != RB_clearbuf((ringbuffer*)&rbin));
+            return -1;
+        }
+        return 0;
+    }
+    if(l == 0) return 0;
+    buf[l-1] = 0; // replace '\n' with strend
    return l;
 }

--- a/F1:F103/PL2303_ringbuffer/usb.h
+++ b/F1:F103/PL2303_ringbuffer/usb.h
@@ -1,6 +1,5 @@
 /*
- * This file is part of the pl2303 project.
- * Copyright 2023 Edward V. Emelianov <edward.emelianoff@gmail.com>.
+ * Copyright 2024 Edward V. Emelianov <edward.emelianoff@gmail.com>.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,25 +16,25 @@
 */

 #pragma once
+
 #include "ringbuffer.h"
 #include "usbhw.h"

 // sizes of ringbuffers for outgoing and incoming data
 #define RBOUTSZ     (512)
-#define RBINSZ      (512)
+#define RBINSZ      (256)

 #define newline()   USB_putbyte('\n')
 #define USND(s)     do{USB_sendstr(s); USB_putbyte('\n');}while(0)

-#if 0
 #define STR_HELPER(s)   #s
 #define STR(s)          STR_HELPER(s)
+
 #ifdef EBUG
 #define DBG(str)  do{USB_sendstr(__FILE__ " (L" STR(__LINE__) "): " str); newline();}while(0)
 #else
 #define DBG(str)
 #endif
-#endif

 extern volatile ringbuffer rbout, rbin;
 extern volatile uint8_t bufisempty, bufovrfl;
--- a/F1:F103/PL2303_ringbuffer/usb_lib.c
+++ b/F1:F103/PL2303_ringbuffer/usb_lib.c
@@ -1,6 +1,5 @@
 /*
- * This file is part of the pl2303 project.
- * Copyright 2023 Edward V. Emelianov <edward.emelianoff@gmail.com>.
+ * Copyright 2024 Edward V. Emelianov <edward.emelianoff@gmail.com>.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +14,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 #include <stdint.h>
 #include "usb.h"
 #include "usb_lib.h"
@@ -26,7 +24,7 @@ ep_t endpoints[STM32ENDPOINTS];
 static uint16_t USB_Addr = 0;
 static usb_LineCoding lineCoding = {115200, 0, 0, 8};
 uint8_t ep0databuf[EP0DATABUF_SIZE], setupdatabuf[EP0DATABUF_SIZE];
-static config_pack_t *setup_packet = (config_pack_t*) setupdatabuf;
+config_pack_t *setup_packet = (config_pack_t*) setupdatabuf;

 usb_LineCoding getLineCoding(){return lineCoding;}

@@ -131,7 +129,7 @@ _USB_LANG_ID_(LD, LANG_US);
 _USB_STRING_(SD, u"0.0.1");
 _USB_STRING_(MD, u"Prolific Technology Inc.");
 _USB_STRING_(PD, u"USB-Serial Controller");
-_USB_STRING_(ID, u"pl2303_emulator");
+_USB_STRING_(ID, u"USB-STM32");
 static void const *StringDescriptor[iDESCR_AMOUNT] = {
    [iLANGUAGE_DESCR] = &LD,
    [iMANUFACTURER_DESCR] = &MD,
@@ -266,15 +264,29 @@ static void transmit_Handler(){ // EP3IN
    send_next();
 }

+static uint8_t volatile rcvbuf[USB_RXBUFSZ];
+static uint8_t volatile rcvbuflen = 0;
+
+void chkin(){
+    if(bufovrfl) return;
+    if(!rcvbuflen) return;
+    int w = RB_write((ringbuffer*)&rbin, (uint8_t*)rcvbuf, rcvbuflen);
+    if(w < 0) return;
+    if(w != rcvbuflen) bufovrfl = 1;
+    rcvbuflen = 0;
+    uint16_t status = KEEP_DTOG(USB->EPnR[2]); // don't change DTOG
+    USB->EPnR[2] = status ^ USB_EPnR_STAT_RX;
+}
+
+// receiver reads data from local buffer and only then ACK'ed
 static void receive_Handler(){ // EP2OUT
-    uint8_t buf[USB_RXBUFSZ];
-    uint16_t epstatus = KEEP_DTOG(USB->EPnR[2]);
-    uint8_t sz = EP_Read(2, (uint8_t*)buf);
-    if(sz){
-        if(RB_write((ringbuffer*)&rbin, buf, sz) != sz) bufovrfl = 1;
+    uint16_t status = KEEP_DTOG_STAT(USB->EPnR[2]); // don't change DTOG and NACK
+    if(rcvbuflen){
+        bufovrfl = 1; // lost last data
+        rcvbuflen = 0;
    }
-    // keep stat_tx & set ACK rx, clear RX ctr
-    USB->EPnR[2] = (epstatus & ~USB_EPnR_CTR_RX) ^ USB_EPnR_STAT_RX;
+    rcvbuflen = EP_Read(2, (uint8_t*)rcvbuf);
+    USB->EPnR[2] = status & ~USB_EPnR_CTR_RX;
 }

 static inline void std_h2d_req(){
@@ -436,3 +448,103 @@ int EP_Read(uint8_t number, uint8_t *buf){
    return sz;
 }

+
+static uint16_t lastaddr = LASTADDR_DEFAULT;
+/**
+ * Endpoint initialisation
+ * @param number - EP num (0...7)
+ * @param type - EP type (EP_TYPE_BULK, EP_TYPE_CONTROL, EP_TYPE_ISO, EP_TYPE_INTERRUPT)
+ * @param txsz - transmission buffer size @ USB/CAN buffer
+ * @param rxsz - reception buffer size @ USB/CAN buffer
+ * @param uint16_t (*func)(ep_t *ep) - EP handler function
+ * @return 0 if all OK
+ */
+int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)(ep_t ep)){
+    if(number >= STM32ENDPOINTS) return 4; // out of configured amount
+    if(txsz > USB_BTABLE_SIZE || rxsz > USB_BTABLE_SIZE) return 1; // buffer too large
+    if(lastaddr + txsz + rxsz >= USB_BTABLE_SIZE/ACCESSZ) return 2; // out of btable
+    USB->EPnR[number] = (type << 9) | (number & USB_EPnR_EA);
+    USB->EPnR[number] ^= USB_EPnR_STAT_RX | USB_EPnR_STAT_TX_1;
+    if(rxsz & 1 || rxsz > USB_BTABLE_SIZE) return 3; // wrong rx buffer size
+    uint16_t countrx = 0;
+    if(rxsz < 64) countrx = rxsz / 2;
+    else{
+        if(rxsz & 0x1f) return 3; // should be multiple of 32
+        countrx = 31 + rxsz / 32;
+    }
+    USB_BTABLE->EP[number].USB_ADDR_TX = lastaddr;
+    endpoints[number].tx_buf = (uint16_t *)(USB_BTABLE_BASE + lastaddr * ACCESSZ);
+    endpoints[number].txbufsz = txsz;
+    lastaddr += txsz;
+    USB_BTABLE->EP[number].USB_COUNT_TX = 0;
+    USB_BTABLE->EP[number].USB_ADDR_RX = lastaddr;
+    endpoints[number].rx_buf = (uint8_t *)(USB_BTABLE_BASE + lastaddr * ACCESSZ);
+    lastaddr += rxsz;
+    USB_BTABLE->EP[number].USB_COUNT_RX = countrx << 10;
+    endpoints[number].func = func;
+    return 0;
+}
+
+// standard IRQ handler
+void USB_IRQ(){
+    if(USB->ISTR & USB_ISTR_RESET){
+        usbON = 0;
+        // Reinit registers
+        USB->CNTR = USB_CNTR_RESETM | USB_CNTR_CTRM | USB_CNTR_SUSPM | USB_CNTR_WKUPM;
+        // Endpoint 0 - CONTROL
+        // ON USB LS size of EP0 may be 8 bytes, but on FS it should be 64 bytes!
+        lastaddr = LASTADDR_DEFAULT;
+        // clear address, leave only enable bit
+        USB->DADDR = USB_DADDR_EF;
+        if(EP_Init(0, EP_TYPE_CONTROL, USB_EP0_BUFSZ, USB_EP0_BUFSZ, EP0_Handler)){
+            return;
+        }
+        USB->ISTR = ~USB_ISTR_RESET;
+    }
+    if(USB->ISTR & USB_ISTR_CTR){
+        // EP number
+        uint8_t n = USB->ISTR & USB_ISTR_EPID;
+        // copy status register
+        uint16_t epstatus = USB->EPnR[n];
+        // copy received bytes amount
+        endpoints[n].rx_cnt = USB_BTABLE->EP[n].USB_COUNT_RX & 0x3FF; // low 10 bits is counter
+        // check direction
+        if(USB->ISTR & USB_ISTR_DIR){ // OUT interrupt - receive data, CTR_RX==1 (if CTR_TX == 1 - two pending transactions: receive following by transmit)
+            if(n == 0){ // control endpoint
+                if(epstatus & USB_EPnR_SETUP){ // setup packet -> copy data to conf_pack
+                    EP_Read(0, setupdatabuf);
+                    // interrupt handler will be called later
+                }else if(epstatus & USB_EPnR_CTR_RX){ // data packet -> push received data to ep0databuf
+                    EP_Read(0, ep0databuf);
+                }
+            }
+        }
+        // call EP handler
+        if(endpoints[n].func) endpoints[n].func(endpoints[n]);
+    }
+    if(USB->ISTR & USB_ISTR_SUSP){ // suspend -> still no connection, may sleep
+        usbON = 0;
+#ifndef STM32F0
+        USB->CNTR |= USB_CNTR_FSUSP | USB_CNTR_LP_MODE;
+#else
+        USB->CNTR |= USB_CNTR_FSUSP | USB_CNTR_LPMODE;
+#endif
+        USB->ISTR = ~USB_ISTR_SUSP;
+    }
+    if(USB->ISTR & USB_ISTR_WKUP){ // wakeup
+#ifndef STM32F0
+        USB->CNTR &= ~(USB_CNTR_FSUSP | USB_CNTR_LP_MODE); // clear suspend flags
+#else
+        USB->CNTR &= ~(USB_CNTR_FSUSP | USB_CNTR_LPMODE);
+#endif
+        USB->ISTR = ~USB_ISTR_WKUP;
+    }
+}
+
+#if defined STM32F3
+void usb_lp_isr() __attribute__ ((alias ("USB_IRQ")));
+#elif defined STM32F1
+void usb_lp_can_rx0_isr() __attribute__ ((alias ("USB_IRQ")));
+#elif defined STM32F0
+void usb_isr() __attribute__ ((alias ("USB_IRQ")));
+#endif
--- a/F1:F103/PL2303_ringbuffer/usb_lib.h
+++ b/F1:F103/PL2303_ringbuffer/usb_lib.h
@@ -1,6 +1,5 @@
 /*
- * This file is part of the pl2303 project.
- * Copyright 2023 Edward V. Emelianov <edward.emelianoff@gmail.com>.
+ * Copyright 2024 Edward V. Emelianov <edward.emelianoff@gmail.com>.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,8 +14,8 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 #pragma once
+
 #include <wchar.h>
 #include "usbhw.h"

@@ -155,6 +154,7 @@ typedef struct {

 extern ep_t endpoints[];
 extern volatile uint8_t usbON;
+extern config_pack_t *setup_packet;
 extern uint8_t ep0databuf[], setupdatabuf[];

 void EP0_Handler();
@@ -168,3 +168,5 @@ void linecoding_handler(usb_LineCoding *lc);
 void clstate_handler(uint16_t val);
 void break_handler();
 void vendor_handler(config_pack_t *packet);
+void chkin();
+int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)());
--- a/F1:F103/PL2303_ringbuffer/usbhw.c
+++ b/F1:F103/PL2303_ringbuffer/usbhw.c
@@ -1,6 +1,5 @@
 /*
- * This file is part of the MLX90640 project.
- * Copyright 2022 Edward V. Emelianov <edward.emelianoff@gmail.com>.
+ * Copyright 2024 Edward V. Emelianov <edward.emelianoff@gmail.com>.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,109 +14,50 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 #include "usb.h"
-#include "usbhw.h"
 #include "usb_lib.h"

+// here we suppose that all PIN settings done in hw_setup earlier
 void USB_setup(){
+#if defined STM32F3
+    NVIC_DisableIRQ(USB_LP_IRQn);
+    // remap USB LP & Wakeup interrupts to 75 and 76 - works only on pure F303
+    RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN; // enable tacting of SYSCFG
+    SYSCFG->CFGR1 |= SYSCFG_CFGR1_USB_IT_RMP;
+#elif defined STM32F1
    NVIC_DisableIRQ(USB_LP_CAN1_RX0_IRQn);
    NVIC_DisableIRQ(USB_HP_CAN1_TX_IRQn);
-    USBPU_OFF();
+#elif defined STM32F0
+    NVIC_DisableIRQ(USB_IRQn);
+    RCC->APB1ENR |= RCC_APB1ENR_CRSEN;
+    RCC->CFGR3 &= ~RCC_CFGR3_USBSW; // reset USB
+    RCC->CR2 |= RCC_CR2_HSI48ON; // turn ON HSI48
+    uint32_t tmout = 16000000;
+    while(!(RCC->CR2 & RCC_CR2_HSI48RDY)){if(--tmout == 0) break;}
+    FLASH->ACR = FLASH_ACR_PRFTBE | FLASH_ACR_LATENCY;
+    CRS->CFGR &= ~CRS_CFGR_SYNCSRC;
+    CRS->CFGR |= CRS_CFGR_SYNCSRC_1; // USB SOF selected as sync source
+    CRS->CR |= CRS_CR_AUTOTRIMEN; // enable auto trim
+    CRS->CR |= CRS_CR_CEN; // enable freq counter & block CRS->CFGR as read-only
+    RCC->CFGR |= RCC_CFGR_SW;
+#endif
    RCC->APB1ENR |= RCC_APB1ENR_USBEN;
-    RCC->APB2ENR |= USB_RCC;
+    //??
    USB->CNTR   = USB_CNTR_FRES; // Force USB Reset
    for(uint32_t ctr = 0; ctr < 72000; ++ctr) nop(); // wait >1ms
-    //uint32_t ctr = 0;
    USB->CNTR   = 0;
    USB->BTABLE = 0;
    USB->DADDR  = 0;
    USB->ISTR   = 0;
    USB->CNTR   = USB_CNTR_RESETM | USB_CNTR_WKUPM; // allow only wakeup & reset interrupts
+#if defined STM32F3
+    NVIC_EnableIRQ(USB_LP_IRQn);
+#elif defined STM32F1
    NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn);
-    USBPU_ON();
+#elif defined STM32F0
+    USB->BCDR |= USB_BCDR_DPPU;
+    NVIC_EnableIRQ(USB_IRQn);
+#endif
 }

-static uint16_t lastaddr = LASTADDR_DEFAULT;
-/**
- * Endpoint initialisation
- * @param number - EP num (0...7)
- * @param type - EP type (EP_TYPE_BULK, EP_TYPE_CONTROL, EP_TYPE_ISO, EP_TYPE_INTERRUPT)
- * @param txsz - transmission buffer size @ USB/CAN buffer
- * @param rxsz - reception buffer size @ USB/CAN buffer
- * @param uint16_t (*func)(ep_t *ep) - EP handler function
- * @return 0 if all OK
- */
-int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)(ep_t ep)){
-    if(number >= STM32ENDPOINTS) return 4; // out of configured amount
-    if(txsz > USB_BTABLE_SIZE || rxsz > USB_BTABLE_SIZE) return 1; // buffer too large
-    if(lastaddr + txsz + rxsz >= USB_BTABLE_SIZE) return 2; // out of btable
-    USB->EPnR[number] = (type << 9) | (number & USB_EPnR_EA);
-    USB->EPnR[number] ^= USB_EPnR_STAT_RX | USB_EPnR_STAT_TX_1;
-    if(rxsz & 1 || rxsz > 512) return 3; // wrong rx buffer size
-    uint16_t countrx = 0;
-    if(rxsz < 64) countrx = rxsz / 2;
-    else{
-        if(rxsz & 0x1f) return 3; // should be multiple of 32
-        countrx = 31 + rxsz / 32;
-    }
-    USB_BTABLE->EP[number].USB_ADDR_TX = lastaddr;
-    endpoints[number].tx_buf = (uint16_t *)(USB_BTABLE_BASE + lastaddr * ACCESSZ);
-    endpoints[number].txbufsz = txsz;
-    lastaddr += txsz;
-    USB_BTABLE->EP[number].USB_COUNT_TX = 0;
-    USB_BTABLE->EP[number].USB_ADDR_RX = lastaddr;
-    endpoints[number].rx_buf = (uint8_t *)(USB_BTABLE_BASE + lastaddr * ACCESSZ);
-    lastaddr += rxsz;
-    USB_BTABLE->EP[number].USB_COUNT_RX = countrx << 10;
-    endpoints[number].func = func;
-    return 0;
-}

-// standard IRQ handler
-void usb_lp_can_rx0_isr(){
-    if(USB->ISTR & USB_ISTR_RESET){
-        usbON = 0;
-        // Reinit registers
-        USB->CNTR = USB_CNTR_RESETM | USB_CNTR_CTRM | USB_CNTR_SUSPM | USB_CNTR_WKUPM;
-        // Endpoint 0 - CONTROL
-        // ON USB LS size of EP0 may be 8 bytes, but on FS it should be 64 bytes!
-        lastaddr = LASTADDR_DEFAULT;
-        // clear address, leave only enable bit
-        USB->DADDR = USB_DADDR_EF;
-        if(EP_Init(0, EP_TYPE_CONTROL, USB_EP0_BUFSZ, USB_EP0_BUFSZ, EP0_Handler)){
-            return;
-        }
-        USB->ISTR = ~USB_ISTR_RESET;
-    }
-    if(USB->ISTR & USB_ISTR_CTR){
-        // EP number
-        uint8_t n = USB->ISTR & USB_ISTR_EPID;
-        // copy status register
-        uint16_t epstatus = USB->EPnR[n];
-        // copy received bytes amount
-        endpoints[n].rx_cnt = USB_BTABLE->EP[n].USB_COUNT_RX & 0x3FF; // low 10 bits is counter
-        // check direction
-        if(USB->ISTR & USB_ISTR_DIR){ // OUT interrupt - receive data, CTR_RX==1 (if CTR_TX == 1 - two pending transactions: receive following by transmit)
-            if(n == 0){ // control endpoint
-                if(epstatus & USB_EPnR_SETUP){ // setup packet -> copy data to conf_pack
-                    EP_Read(0, setupdatabuf);
-                    // interrupt handler will be called later
-                }else if(epstatus & USB_EPnR_CTR_RX){ // data packet -> push received data to ep0databuf
-                    EP_Read(0, ep0databuf);
-                }
-            }
-        }
-        // call EP handler
-        if(endpoints[n].func) endpoints[n].func(endpoints[n]);
-    }
-    if(USB->ISTR & USB_ISTR_SUSP){ // suspend -> still no connection, may sleep
-        usbON = 0;
-        USB->CNTR |= USB_CNTR_FSUSP | USB_CNTR_LP_MODE;
-        USB->ISTR = ~USB_ISTR_SUSP;
-    }
-    if(USB->ISTR & USB_ISTR_WKUP){ // wakeup
-        USB->CNTR &= ~(USB_CNTR_FSUSP | USB_CNTR_LP_MODE); // clear suspend flags
-        USB->ISTR = ~USB_ISTR_WKUP;
-    }
-}
--- a/F1:F103/PL2303_ringbuffer/usbhw.h
+++ b/F1:F103/PL2303_ringbuffer/usbhw.h
@@ -1,6 +1,5 @@
 /*
- * This file is part of the MLX90640 project.
- * Copyright 2022 Edward V. Emelianov <edward.emelianoff@gmail.com>.
+ * Copyright 2024 Edward V. Emelianov <edward.emelianoff@gmail.com>.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,22 +14,63 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 #pragma once
-#include <stm32f1.h>

-#define USB_RCC     RCC_APB2ENR_IOPAEN
-#define USBPU_port  GPIOA
-#define USBPU_pin   (1<<15)
-#define USBPU_ON()  pin_clear(USBPU_port, USBPU_pin)
-#define USBPU_OFF() pin_set(USBPU_port, USBPU_pin)
+#if defined STM32F0
+#include <stm32f0.h>
+#elif defined STM32F1
+#include <stm32f1.h>
+// there's no this define in standard header
+#define USB_BASE                ((uint32_t)0x40005C00)
+#elif defined STM32F3
+#include <stm32f3.h>
+#endif

 // max endpoints number
 #define STM32ENDPOINTS          8
 /**
 *                 Buffers size definition
 **/
+
+//  F0 - USB2_16; F1 - USB1_16; F3 - 1/2 depending on series
+#if !defined USB1_16 && !defined USB2_16
+#if defined STM32F0
+#define USB2_16
+#elif defined STM32F1
+#define USB1_16
+#else
+#error "Can't determine USB1_16 or USB2_16, define by hands"
+#endif
+#endif
+
+// BTABLE_SIZE FOR STM32F3:
+// In STM32F303/302xB/C, 512 bytes SRAM is not shared with CAN.
+// In STM32F302x6/x8 and STM32F30xxD/E, 726 bytes dedicated SRAM and 256 bytes shared SRAM with CAN i.e.
+//     1Kbytes dedicated SRAM in case CAN is disabled.
+// remember, that USB_BTABLE_SIZE will be divided by ACCESSZ, so don't divide it twice for 32-bit addressing
+
+#ifdef NOCAN
+#if defined STM32F0
+#define USB_BTABLE_SIZE         1024
+#elif defined STM32F3
 #define USB_BTABLE_SIZE         512
+#warning "Please, check real buffer size due to docs"
+#else
+#error "define STM32F0 or STM32F3"
+#endif
+#else // !NOCAN: F0/F3 with CAN or F1 (can't simultaneously run CAN and USB)
+#if defined STM32F0
+#define USB_BTABLE_SIZE         768
+#elif defined STM32F3
+#define USB_BTABLE_SIZE         512
+#warning "Please, check real buffer size due to docs"
+#else // STM32F103: 1024 bytes but with 32-bit addressing
+#define USB_BTABLE_SIZE         1024
+#endif
+#endif // NOCAN
+
+// first 64 bytes of USB_BTABLE are registers!
+//#define USB_EP0_BASEADDR        64
 // for USB FS EP0 buffers are from 8 to 64 bytes long (64 for PL2303)
 #define USB_EP0_BUFSZ           64
 // USB transmit buffer size (64 for PL2303)
@@ -41,7 +81,6 @@
 #define USB_EP1BUFSZ            8

 #define USB_BTABLE_BASE         0x40006000
-#define USB_BASE                ((uint32_t)0x40005C00)
 #define USB                     ((USB_TypeDef *) USB_BASE)

 #ifdef USB_BTABLE
@@ -87,6 +126,7 @@ typedef struct {
    __IO uint32_t BTABLE;
 } USB_TypeDef;

+// F303 D/E have 2x16 access scheme
 typedef struct{
 #if defined USB2_16
    __IO uint16_t USB_ADDR_TX;
@@ -107,9 +147,9 @@ typedef struct{
 #endif
 } USB_EPDATA_TypeDef;

+
 typedef struct{
    __IO USB_EPDATA_TypeDef EP[STM32ENDPOINTS];
 } USB_BtableDef;

 void USB_setup();
-int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)());
--- a/F1:F103/PL2303_ringbuffer/version.inc
+++ b/F1:F103/PL2303_ringbuffer/version.inc
@@ -1,2 +1,2 @@
-#define BUILD_NUMBER "80"
-#define BUILD_DATE "2023-06-11"
+#define BUILD_NUMBER "99"
+#define BUILD_DATE "2024-09-02"