Commit Graph

340 Commits

Author SHA1 Message Date
L-diy
4181b98f83 Improve the Modbus TCP server
The 'modbus_tcp.c' file has been extensively rewritten to handle parsing TCP Application Data Units (ADUs), handling incoming Modbus requests, and generating appropriate responses. The modbus tcp server now interacts better with the LWIP TCP functionality, due to better utilization of the callback functions.

temp: modbus refactor
2024-02-06 12:45:42 +01:00
e5273c7012 clangformat everything 2023-12-23 21:37:08 +01:00
e19e7c9253 website backend
fix warning
2023-12-23 16:25:16 +01:00
Roelandts_Gert
fc87693d64 Merge pull request #35 from Sani7/website_02
Website 02
2023-12-11 14:57:16 +01:00
TeunBugwood
5279b14975 img 0 0 2023-12-11 14:45:27 +01:00
TeunBugwood
af0c6ad421 data file 2023-12-11 14:43:09 +01:00
TeunBugwood
d1991d9abc updated tabs etc 2023-12-11 14:03:42 +01:00
TeunBugwood
5b0666920c Update main.c 2023-12-11 14:01:24 +01:00
TeunBugwood
cd2839e6ca Update website_backend.c 2023-12-11 13:34:47 +01:00
TeunBugwood
dd176256bb WBE update
Fixed some things that made the site not work. This is not the final version, just for the demo.
2023-12-11 13:31:46 +01:00
TeunBugwood
ec09cb9625 New website branch
previous was doomed, that is why I made a new brench that was updated with the main.
2023-12-11 13:20:19 +01:00
Roelandts_Gert
0fef710b8f Merge pull request #34 from Sani7/TCP-CMD-Interface-2.0
quick fix
2023-12-11 13:17:34 +01:00
Roelandts_Gert
f58c22ba34 quick fix 2023-12-11 13:14:57 +01:00
Roelandts_Gert
c4b21ee3b3 Merge pull request #33 from Sani7/TCP-CMD-Interface-2.0
Tcp cmd interface 2.0
2023-12-11 12:42:36 +01:00
Roelandts_Gert
4b75f21a7d Most changes okay, code works 2023-12-11 12:10:46 +01:00
Roelandts_Gert
f9eb677dc0 reverted to original files 2023-12-11 11:37:39 +01:00
RobinVdB8
692917d112 Merge branch 'main' into MQTT_Robin 2023-12-10 15:58:57 +01:00
RobinVdB8
247e53f133 Removed duplicate define 2023-12-10 15:58:17 +01:00
8a03831d78 tftp
make tftp_* functions for context static + tftp_context
2023-12-09 14:20:21 +01:00
611ce460fb llfs
Add const to llfs_get_filename_ext
2023-12-08 18:25:13 +01:00
a3da9017bf cmake
update cmake minimum version
2023-12-08 18:19:00 +01:00
050d79e6b0 llfs
Lornez asked to add static to the TAG
2023-12-08 18:18:43 +01:00
6b9f517556 TFTP
Move some log around
2023-12-08 13:31:05 +01:00
27c8d0c0bc tftp
move concatenation from custom functions to string functions
2023-12-07 11:24:05 +01:00
0023659552 tftp
- Remove the suggestion of null terimination of the custom_fread custom_fwrite functions
- Update the tests
2023-12-06 14:58:41 +01:00
d9204ad9ed tftp
try to fix a bug Lorenz told me about
in fread
2023-12-06 08:05:37 +01:00
a8537ba6d4 tftp
try to fix a bug Lorenz told me about
in fwrite
2023-12-06 07:50:24 +01:00
5fd8bb3044 tftp
fix null termination in str_cat_str
fix check if not possible to fit string (did not check if null terminator fits
suggested by Lorenz
2023-12-06 07:50:24 +01:00
Obe Van Lierde
51d0fca23c Merge branch 'Modbus_TCP_Obe' of https://github.com/Sani7/2023-Webservices_And_Applications into Modbus_TCP_Obe 2023-12-05 21:09:48 +01:00
30a3732d64 modbus_tcp
remove newlines from init
2023-12-04 20:52:00 +01:00
2b63720fbf modbus_tcp
Add comment for Obe
2023-12-04 14:55:34 +01:00
Obe Van Lierde
725a29e2d3 Update modbus_tcp.c 2023-12-04 14:54:08 +01:00
e1832cf54e UDP_broadcast
convert owner_name_*_pos to uint32
2023-12-04 11:10:26 +01:00
25c8f5b750 modbus_tcp
change over to the new lcd function so we don't have to loop over the files again
2023-12-03 22:22:08 +01:00
d77fca56b7 lcd_api
Add lcd_draw_img_from_llfs_file and lcd_draw_gif_from_llfs_file
2023-12-03 22:01:14 +01:00
xoreo
0b9c1984ac Switch all position params in LCD_API to uint32_t 2023-12-03 14:51:47 +01:00
0cc34bfd6b LLFS
add llfs_get_filename_ext
2023-12-02 23:01:06 +01:00
7dcc0ff4da Logger
make it so that the logger timestamp is alligned
2023-12-01 18:56:24 +01:00
97783c69c5 Fix almost all compiler warnings
lcd_api: isalpha expects type in so I cast char to int
lcd_api: uint32 in printf where %d instead of %lu
llfs: filter_ok was set but unused so I removed it
tftp: wrong casting char to uint8_t but needed to be cast to const char* instead
2023-12-01 11:31:53 +01:00
b06ec97075 Testing
Update tests so it uses llfs data and lffs
2023-11-29 18:03:04 +01:00
930034d146 Merge pull request #27 from Sani7/Modbus_TCP_Obe
modbus_tcp
2023-11-28 18:55:53 +01:00
5812dce80b modbus_tcp
fix casting of registers from payload
2023-11-28 18:24:19 +01:00
Van Lierde Obe
066aba706c Merge pull request #21 from Sani7/Modbus_TCP_Obe
Modbus tcp obe
2023-11-28 14:47:43 +01:00
3fcb117b73 modbus_tcp
Fix typo
2023-11-28 13:31:47 +01:00
5787a0eda4 modbus_tcp
make the log more usefull
2023-11-28 13:13:17 +01:00
090389ae6f modbus_tcp
format
2023-11-28 13:11:21 +01:00
984f1dbe26 modbus_tcp
checking if ext is null but not utilising it to skip over the strcmp's
2023-11-28 13:10:34 +01:00
103098d2a7 modbus_tcp
remove unused return variable and redundant comments
2023-11-28 13:09:24 +01:00
f0ac068f51 modbus_tcp
Add log if no valid extension is found
2023-11-28 13:08:51 +01:00
fe08ae3109 modbus_tcp
Move duplicate common code outside of the image draw part
2023-11-28 13:06:29 +01:00