Anton Stadie 2 лет назад
Родитель
Сommit
ee08c7c362
5 измененных файлов с 14 добавлено и 5 удалено
  1. 6 0
      .gitignore
  2. 3 0
      .gitmodules
  3. 2 2
      eth_view_process.c
  4. 2 3
      eth_worker.c
  5. 1 0
      lib/ioLibrary_Driver/u8g2

+ 6 - 0
.gitignore

@@ -0,0 +1,6 @@
+dist/*
+.vscode
+.clang-format
+.editorconfig
+.env
+.ufbt

+ 3 - 0
.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/ioLibrary_Driver/u8g2"]
+	path = lib/ioLibrary_Driver/u8g2
+	url = https://github.com/olikraus/u8g2

+ 2 - 2
eth_view_process.c

@@ -4,13 +4,13 @@
 #include "eth_worker_i.h"
 #include "eth_worker_i.h"
 #include "finik_eth_icons.h"
 #include "finik_eth_icons.h"
 
 
+#include "lib/ioLibrary_Driver/u8g2/csrc/u8g2.h"
+
 #include <furi_hal.h>
 #include <furi_hal.h>
 #include <gui/gui.h>
 #include <gui/gui.h>
 #include <gui/canvas.h>
 #include <gui/canvas.h>
 #include <string.h>
 #include <string.h>
 
 
-#include "u8g2.h"
-
 #define TAG "EthView"
 #define TAG "EthView"
 
 
 EthViewProcess* ethernet_view_process_malloc(EthWorkerProcess type, EthernetSaveConfig* config) {
 EthViewProcess* ethernet_view_process_malloc(EthWorkerProcess type, EthernetSaveConfig* config) {

+ 2 - 3
eth_worker.c

@@ -5,7 +5,6 @@
 #include <furi_hal.h>
 #include <furi_hal.h>
 #include "dhcp.h"
 #include "dhcp.h"
 #include "socket.h"
 #include "socket.h"
-#include "stm32wbxx_hal_gpio.h"
 #include <wizchip_conf.h>
 #include <wizchip_conf.h>
 
 
 #define TAG "EthWorker"
 #define TAG "EthWorker"
@@ -226,8 +225,8 @@ void eth_run(EthWorker* worker, EthWorkerProcess process) {
 /************************** Ethernet Worker Thread *****************************/
 /************************** Ethernet Worker Thread *****************************/
 
 
 static uint8_t ip_assigned = 0;
 static uint8_t ip_assigned = 0;
-static GpioPin cspin = {.port = GPIOA, .pin = GPIO_PIN_4};
-static GpioPin resetpin = {.port = GPIOC, .pin = GPIO_PIN_3};
+static GpioPin cspin = {.port = GPIOA, .pin = LL_GPIO_PIN_4};
+static GpioPin resetpin = {.port = GPIOC, .pin = LL_GPIO_PIN_3};
 
 
 static void W5500_Select(void) {
 static void W5500_Select(void) {
     furi_hal_gpio_write(&cspin, false);
     furi_hal_gpio_write(&cspin, false);

+ 1 - 0
lib/ioLibrary_Driver/u8g2

@@ -0,0 +1 @@
+Subproject commit c4f9cd9f8717661c46be16bfbcb0017d785db3c1