Skip to content

Commit

Permalink
fix compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
karasevia committed Sep 2, 2023
1 parent 19f7020 commit d4d5a81
Show file tree
Hide file tree
Showing 7 changed files with 605 additions and 659 deletions.
31 changes: 23 additions & 8 deletions application.fam
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,30 @@ App(
"Ethernet",
"Internet/DHCP",
"Internet/DNS",
"Internet/FTPClient",
"Internet/FTPServer",
"Internet/httpServer",
# "Internet/FTPClient",
# "Internet/FTPServer",
# "Internet/httpServer",
"Internet/ICMP",
"Internet/MQTT",
"Internet/MQTT/MQTTPacket/src",
"Internet/SNMP",
"Internet/SNTP",
"Internet/TFTP",
# "Internet/MQTT",
# "Internet/MQTT/MQTTPacket/src",
# "Internet/SNMP",
# "Internet/SNTP",
# "Internet/TFTP",
],
sources=[
"Ethernet/W5500/*.c",
"Ethernet/*.c",
"Internet/DHCP/*.c",
"Internet/DNS/*.c",
# "Internet/FTPClient/*.c",
# "Internet/FTPServer/*.c",
# "Internet/httpServer/*.c",
"Internet/ICMP/*.c",
# "Internet/MQTT/*.c",
# "Internet/MQTT/MQTTPacket/src/*.c",
# "Internet/SNMP/*.c",
# "Internet/SNTP/*.c",
# "Internet/TFTP/*.c",
],
),
],
Expand Down
2 changes: 1 addition & 1 deletion eth_save_process.c
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ void ehternet_save_process_print(EthernetSaveConfig* config, const char* str) {
furi_assert(config);
FuriHalRtcDateTime datetime = {0};
furi_hal_rtc_get_datetime(&datetime);
bool res = storage_printf(
storage_printf(
config->log_file,
"%4d.%02d.%02d-%02d:%2d:%02d || %s",
datetime.year,
Expand Down
8 changes: 3 additions & 5 deletions eth_worker.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ void eth_worker_set_active_process(EthWorker* worker, EthWorkerProcess state) {
case EthWorkerProcessReset:
worker->active_process = worker->reset_process;
break;
default:
break;
}
}

Expand All @@ -105,7 +107,7 @@ static EthViewProcess* get_process(EthWorker* worker, EthWorkerProcess process)
case EthWorkerProcessActive:
return worker->active_process;
default:
NULL;
return NULL;
}
}

Expand Down Expand Up @@ -263,10 +265,6 @@ static void W5500_WriteByte(uint8_t byte) {
W5500_WriteBuff(&byte, sizeof(byte));
}

static void wait_ms(int ms) {
furi_delay_ms(ms);
}

static wiz_NetInfo gWIZNETINFO;
void update_WIZNETINFO(uint8_t is_dhcp) {
furi_assert(static_worker);
Expand Down
1 change: 1 addition & 0 deletions eth_worker_dhcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
#include <dhcp.h>

void dhcp_timer_callback(void* context) {
UNUSED(context);
DHCP_time_handler();
}
1 change: 0 additions & 1 deletion finik_eth_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ static void finik_eth_app_draw_callback(Canvas* canvas, void* ctx) {

canvas_clear(canvas);

DrawMode mode = app->draw_mode;
DrawProcess process = app->draw_process;
CursorPosition cursor = app->cursor_position;
float consumption = app->info.current_gauge;
Expand Down
Loading

0 comments on commit d4d5a81

Please sign in to comment.