Skip to content

Commit

Permalink
make stuff work
Browse files Browse the repository at this point in the history
  • Loading branch information
Anton Stadie committed Jan 20, 2024
1 parent d4d5a81 commit ee08c7c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dist/*
.vscode
.clang-format
.editorconfig
.env
.ufbt
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lib/ioLibrary_Driver/u8g2"]
path = lib/ioLibrary_Driver/u8g2
url = https://github.com/olikraus/u8g2
4 changes: 2 additions & 2 deletions eth_view_process.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#include "eth_worker_i.h"
#include "finik_eth_icons.h"

#include "lib/ioLibrary_Driver/u8g2/csrc/u8g2.h"

#include <furi_hal.h>
#include <gui/gui.h>
#include <gui/canvas.h>
#include <string.h>

#include "u8g2.h"

#define TAG "EthView"

EthViewProcess* ethernet_view_process_malloc(EthWorkerProcess type, EthernetSaveConfig* config) {
Expand Down
5 changes: 2 additions & 3 deletions eth_worker.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <furi_hal.h>
#include "dhcp.h"
#include "socket.h"
#include "stm32wbxx_hal_gpio.h"
#include <wizchip_conf.h>

#define TAG "EthWorker"
Expand Down Expand Up @@ -226,8 +225,8 @@ void eth_run(EthWorker* worker, EthWorkerProcess process) {
/************************** Ethernet Worker Thread *****************************/

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) {
furi_hal_gpio_write(&cspin, false);
Expand Down
1 change: 1 addition & 0 deletions lib/ioLibrary_Driver/u8g2
Submodule u8g2 added at c4f9cd

0 comments on commit ee08c7c

Please sign in to comment.