support H7 and L4; use second ADC for input

3 files changed, 88 insertions, 11 deletions

diff --git a/gui/stmdsp.cpp b/gui/stmdsp.cpp
index 5ea18af..2293c71 100644
--- a/gui/stmdsp.cpp
+++ b/gui/stmdsp.cpp
@@ -31,8 +31,16 @@ namespace stmdsp
     {
         if (m_serial.isOpen()) {
            m_serial.write("i");
-           if (m_serial.read(6) != "stmdsp")
+           if (auto id = m_serial.read(7); id.starts_with("stmdsp")) {
+                if (id.back() == 'h')
+                    m_platform = platform::H7;
+                else if (id.back() == 'l')
+                    m_platform = platform::L4;
+                else
+                    m_serial.close();
+           } else {
                m_serial.close();
+           }
         }
     }
 
diff --git a/gui/stmdsp.hpp b/gui/stmdsp.hpp
index a22a55d..d56a1ab 100644
--- a/gui/stmdsp.hpp
+++ b/gui/stmdsp.hpp
@@ -39,6 +39,13 @@ namespace stmdsp
     using adcsample_t = uint16_t;
     using dacsample_t = uint16_t;
 
+    enum class platform {
+        Unknown,
+        H7,
+        L4,
+        G4
+    };
+
     class device
     {
     public:
@@ -52,8 +59,7 @@ namespace stmdsp
             return m_serial.isOpen();
         }
 
-        //std::vector<adcsample_t> sample(unsigned long int count = 1);
-
+        auto get_platform() const { return m_platform; }
         void continuous_set_buffer_size(unsigned int size);
         unsigned int get_buffer_size() const { return m_buffer_size; }
         void set_sample_rate(unsigned int id);
@@ -76,6 +82,7 @@ namespace stmdsp
 
     private:
         serial::Serial m_serial;
+        platform m_platform = platform::Unknown;
         unsigned int m_buffer_size = SAMPLES_MAX;
         bool m_is_siggening = false;
     };
diff --git a/gui/wxmain.cpp b/gui/wxmain.cpp
index e5f0d4d..d020bef 100644
--- a/gui/wxmain.cpp
+++ b/gui/wxmain.cpp
@@ -46,10 +46,10 @@ static const std::array<unsigned int, 6> srateNums {
     96000
 };
 
-static const char *makefile_text = R"make(
+static const char *makefile_text_h7 = R"make(
 all:
 	@arm-none-eabi-g++ -x c++ -Os -fno-exceptions -fno-rtti \
-	                   -mcpu=cortex-m7 -mthumb -mfloat-abi=hard -mfpu=fpv5-d16 -mtune=cortex-m7 \
+                       -mcpu=cortex-m7 -mthumb -mfloat-abi=hard -mfpu=fpv5-d16 -mtune=cortex-m7 \
 	                   -nostartfiles \
 	                   -Wl,-Ttext-segment=0x00000000 -Wl,-zmax-page-size=512 -Wl,-eprocess_data_entry \
 	                   $0 -o $0.o
@@ -61,8 +61,23 @@ all:
                            $0.o
 	arm-none-eabi-size $0.o
 )make";
+static const char *makefile_text_l4 = R"make(
+all:
+	@arm-none-eabi-g++ -x c++ -Os -fno-exceptions -fno-rtti \
+	                   -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mtune=cortex-m4 \
+	                   -nostartfiles \
+	                   -Wl,-Ttext-segment=0x10000000 -Wl,-zmax-page-size=512 -Wl,-eprocess_data_entry \
+	                   $0 -o $0.o
+	@cp $0.o $0.orig.o
+	@arm-none-eabi-strip -s -S --strip-unneeded $0.o
+	@arm-none-eabi-objcopy --remove-section .ARM.attributes \
+                           --remove-section .comment \
+                           --remove-section .noinit \
+                           $0.o
+	arm-none-eabi-size $0.o
+)make";
 
-static const char *file_header = R"cpp(
+static const char *file_header_h7 = R"cpp(
 #include <cstdint>
 
 using adcsample_t = uint16_t;
@@ -103,18 +118,63 @@ return 0;
 }
 __attribute__((naked))
 auto sqrt(double x) {
-asm("vmov.f64 r1, r2, d0;"
-	"mov r0, #3;"
+asm("vsqrt.f64 d0, d0; bx lr");
+return 0;
+}
+
+// End stmdspgui header code
+
+)cpp";
+static const char *file_header_l4 = R"cpp(
+#include <cstdint>
+
+using adcsample_t = uint16_t;
+constexpr unsigned int SIZE = $0;
+adcsample_t *process_data(adcsample_t *samples, unsigned int size);
+extern "C" void process_data_entry()
+{
+    ((void (*)())process_data)();
+}
+
+constexpr float PI = 3.14159265358979L;
+__attribute__((naked))
+auto sin(float x) {
+asm("vmov.f32 r1, s0;"
+    "eor r0, r0;"
+    "svc 1;"
+    "vmov.f32 s0, r1;"
+    "bx lr");
+return 0;
+}
+__attribute__((naked))
+auto cos(float x) {
+asm("vmov.f32 r1, s0;"
+	"mov r0, #1;"
 	"svc 1;"
-	"vmov.f64 d0, r1, r2;"
+	"vmov.f32 s0, r1;"
+	"bx lr");
+return 0;
+}
+__attribute__((naked))
+auto tan(double x) {
+asm("vmov.f32 r1, s0;"
+	"mov r0, #2;"
+	"svc 1;"
+	"vmov.f32 s0, r1;"
 	"bx lr");
 return 0;
 }
+__attribute__((naked))
+auto sqrt(float) {
+asm("vsqrt.f32 s0, s0; bx lr");
+return 0;
+}
 
 // End stmdspgui header code
 
 )cpp";
 
+
 static const char *file_content = 
 R"cpp(adcsample_t *process_data(adcsample_t *samples, unsigned int size)
 {
@@ -416,14 +476,16 @@ wxString MainFrame::compileEditorCode()
         m_temp_file_name = wxFileName::CreateTempFileName("stmdspgui");
 
     wxFile file (m_temp_file_name, wxFile::write);
-    wxString file_text (file_header);
+    wxString file_text (m_device->get_platform() == stmdsp::platform::L4 ? file_header_l4
+                                                                         : file_header_h7);
     file_text.Replace("$0", std::to_string(m_device ? m_device->get_buffer_size()
                                                     : stmdsp::SAMPLES_MAX));
     file.Write(wxString(file_text) + m_text_editor->GetText());
     file.Close();
 
     wxFile makefile (m_temp_file_name + "make", wxFile::write);
-    wxString make_text (makefile_text);
+    wxString make_text (m_device->get_platform() == stmdsp::platform::L4 ? makefile_text_l4
+                                                                         : makefile_text_h7);
     make_text.Replace("$0", m_temp_file_name);
     makefile.Write(make_text);
     makefile.Close();