decomposition

CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 pico_sdk_init()
 
-add_executable(${PROJECT_NAME} main.c Thread.c DrawBezier.c font_data.c)
+add_executable(${PROJECT_NAME} main.c Thread.c DrawBezier.c font_data.c Reverse.c SineWave.c SetPixel.c)
 
 target_link_libraries(${PROJECT_NAME}
     pico_stdlib

DrawBezier.c

@@ -1,11 +1,5 @@
 #include "DrawBezier.h"
-// Установка пикселя в буфере (с проверкой границ)
+#include "SetPixel.h"
-void set_pixel(uint16_t x, uint16_t y, uint16_t color) {
-    if (x >= 0 && x < WIDTH && y >= 0 && y < HEIGHT) {
-        frame_buffer[y * WIDTH + x] = color;
-    }
-}
-
 // Функция для вычисления базисного полинома Бернштейна
 float bernstein(int i, int n, float t) {
     // Вычисление биномиального коэффициента C(n, i)

DrawBezier.h

@@ -1,9 +1,8 @@
 #include <stdint.h>
 #include <stddef.h>
-#include <stdbool.h>
 #include <math.h>
 #include "Thread.h"
 
-void set_pixel(uint16_t x, uint16_t y, uint16_t color);
+
 float bernstein(int i, int n, float t);
 void draw_bezier(const int *points_x, const int *points_y, size_t num_points, uint16_t color);

Reverse.c

@@ -0,0 +1,5 @@
+unsigned short reverse(unsigned short x)
+{
+    x = (x & 0xFF) << 8 | (x & 0xFF00) >>  8;
+    return x;
+}

Reverse.h

@@ -0,0 +1,4 @@
+#ifndef REVERSE_H
+#define REVERSE_H
+unsigned short reverse(unsigned short x);
+#endif

SetPixel.c

@@ -0,0 +1,8 @@
+#include "SetPixel.h"
+#include "Thread.h"
+// Установка пикселя в буфере (с проверкой границ)
+void set_pixel(uint16_t x, uint16_t y, uint16_t color) {
+    if (x >= 0 && x < WIDTH && y >= 0 && y < HEIGHT) {
+        frame_buffer[y * WIDTH + x] = color;
+    }
+}

SetPixel.h

@@ -0,0 +1,5 @@
+#ifndef SET_PIXEL_H
+#define SET_PIXEL_H
+#include <stdint.h>
+void set_pixel(uint16_t x, uint16_t y, uint16_t color);
+#endif

SineWave.c

@@ -0,0 +1,20 @@
+#include "SineWave.h"
+#include "font_data.h"
+#include "Thread.h"
+#include "Reverse.h"
+#include "SetPixel.h"
+#include <math.h>
+void generate_sine_wave_points(size_t num_points, int amplitude, float frequency, int offset_x, int offset_y, float phase_shift) {
+    if (num_points == 0) {
+        return;
+    }
+
+    float step = (2.0f * M_PI * frequency) / (num_points - 1);
+    float x_step = (float)WIDTH / (num_points - 1);
+
+    for (size_t i = 0; i < num_points; i++) {
+        int x = offset_x + (int)(i * x_step);
+        int y = offset_y + (int)(amplitude * sinf(i * step + phase_shift)); // Добавлен сдвиг фазы
+        set_pixel(x, y, reverse(0b0000011111100000));
+    }
+}

SineWave.h

@@ -0,0 +1,4 @@
+#ifdef SINE_WAVE_H
+#define SINE_WAVE_H
+void generate_sine_wave_points(size_t num_points, int amplitude, float frequency, int offset_x, int offset_y, float phase_shift);
+#endif

font_data.c

@@ -1,8 +1,8 @@
 // Шрифт, сгенерированный из /home/smikhai/Repo/rp_pico_test/Font/font_grid_with_cyrillic.bmp
 #include "font_data.h"
 #include "Thread.h"
-#include "DrawBezier.h"
+#include "SetPixel.h"
-
+#include <stdbool.h>
 
 const uint16_t image_linear_width = 704;
 const uint8_t char_width = 22;

font_data_dirt.c

@@ -1,8 +0,0 @@
-// Изображение, сгенерированное из Font/font_grid_with_cyrillic.bmp
-#include <stdint.h>
-
-const uint16_t image_linear_width = 7744;
-const uint8_t char_width = 22;
-const uint8_t char_height = 22;
-const uint16_t total_chars = 352;
-

font_data_dirt.h

@@ -1,12 +0,0 @@
-#ifndef IMAGE_DATA_H
-#define IMAGE_DATA_H
-
-#include <stdint.h>
-
-extern const uint16_t image_linear_width;
-extern const uint8_t char_width;
-extern const uint8_t char_height;
-extern const uint16_t total_chars;
-extern const uint8_t image_data[];
-
-#endif // IMAGE_DATA_H

main.c

@@ -4,7 +4,7 @@
 #include "pico/stdlib.h"
 #include "DrawBezier.h"
 #include "font_data.h"
-
+#include "Reverse.h"
 int main() {
     uint16_t red = 0;
     uint16_t green = 0;
@@ -65,23 +65,3 @@ void fillBufer (uint16_t* buffer,uint16_t color){
     
 }
 
-unsigned short reverse(unsigned short x)
-{
-    x = (x & 0xFF) << 8 | (x & 0xFF00) >>  8;
-    return x;
-}
-
-void generate_sine_wave_points(size_t num_points, int amplitude, float frequency, int offset_x, int offset_y, float phase_shift) {
-    if (num_points == 0) {
-        return;
-    }
-
-    float step = (2.0f * M_PI * frequency) / (num_points - 1);
-    float x_step = (float)WIDTH / (num_points - 1);
-
-    for (size_t i = 0; i < num_points; i++) {
-        int x = offset_x + (int)(i * x_step);
-        int y = offset_y + (int)(amplitude * sinf(i * step + phase_shift)); // Добавлен сдвиг фазы
-        set_pixel(x, y, reverse(0b0000011111100000));
-    }
-}

main.h

@@ -1,3 +1,4 @@
+
 #include <stdio.h>
 void fillBufer (uint16_t* buffer,uint16_t color);
 unsigned short reverse(unsigned short x);