Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Davkim add el6001 #71

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
bb19505
Structuring jsd driver for el6001
davidinkyu-kim Feb 14, 2023
d515989
Building up jsd6001 driver
davidinkyu-kim Feb 16, 2023
fe111be
Adding transmit/receive
davidinkyu-kim Feb 22, 2023
33b668c
Finished transmit
davidinkyu-kim Feb 22, 2023
49ce628
Added controlword write
davidinkyu-kim Feb 22, 2023
7007fe8
Adding SDO config function
davidinkyu-kim Mar 1, 2023
786ee0f
Added function pointer for sdo configuration
davidinkyu-kim Mar 1, 2023
103fa80
Added autoincrement func for test
davidinkyu-kim Mar 1, 2023
1c7febd
Added device test for el6001
davidinkyu-kim Mar 6, 2023
3e5bab8
Added communication test
davidinkyu-kim Mar 6, 2023
1b5b294
Added pub func for set persistent transmit data
davidinkyu-kim Mar 7, 2023
4a1d881
Running test on playground
Mar 7, 2023
cf17352
Refined communication test
Mar 7, 2023
3ca4b11
using jsd timer
davidinkyu-kim Mar 7, 2023
30a6b97
Code cleaning
davidinkyu-kim Mar 8, 2023
9f8153f
Merge branch 'master' into davkim-add-el6001
davidinkyu-kim Mar 15, 2023
01f8f21
fixed pushing to rxpdo while transmitting
Mar 21, 2023
ce7f261
Rearranging writing register command
Mar 21, 2023
03cdbcf
Fixing state machine pipeline
davidinkyu-kim Mar 22, 2023
016a067
Fixed transmit state machine by clearing data length correctly
Mar 23, 2023
ea67fec
Debugging receive data
davidinkyu-kim Mar 27, 2023
5f43595
Merging master to stay uptodate
davidinkyu-kim Mar 29, 2023
1887177
Splited on sms and transmit_sms
davidinkyu-kim Mar 29, 2023
4c0e48d
Merge branch 'master' into davkim-add-el6001
davidinkyu-kim Apr 11, 2023
d0b66cf
Fix for making rxpdo, txpdo as array
davidinkyu-kim Apr 25, 2023
048d6a2
Fixed persistent transmit
davidinkyu-kim May 1, 2023
d4fff0b
fixing el6001 driver
casah-dev Jun 28, 2023
352d0f3
Revert "fixing el6001 driver"
casah-dev Jun 28, 2023
c08c60e
fixing state machine for transmit
casah-dev Jun 28, 2023
195ab28
Merge branch 'master' into davkim-add-el6001
casah-dev Jun 28, 2023
224c874
fix for workflow for math lib import
davidinkyu-kim Jul 13, 2023
e5174be
Clean up code
davidinkyu-kim Jul 13, 2023
18ce171
Fixing persistent transmit sms
davidinkyu-kim Jul 13, 2023
79340f7
fixing printout
davidinkyu-kim Jul 13, 2023
f74fe76
Removing unused function
davidinkyu-kim Jul 13, 2023
2ba1e45
Added loopback test
davidinkyu-kim Jul 13, 2023
8aba8c6
Removed unused rxpdo entries
Aug 23, 2023
386b38c
Added full payload transmit function
Aug 23, 2023
6de1467
Updated with memcpy func, updated function description
Aug 23, 2023
a490e02
Separated public and private state
Aug 23, 2023
112edb5
Added read out function
Aug 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ add_library(jsd-lib STATIC
jsd_el3318.c
jsd_el3162.c
jsd_el4102.c
jsd_el6001.c
jsd_ild1900.c
jsd_epd.c
)
Expand All @@ -33,8 +34,8 @@ target_include_directories(
)

find_package(Threads REQUIRED)
target_link_libraries(jsd-lib
PUBLIC soem
target_link_libraries(jsd-lib
PUBLIC soem m
PRIVATE Threads::Threads
PRIVATE rt
)
5 changes: 5 additions & 0 deletions src/jsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "jsd/jsd_el3356.h"
#include "jsd/jsd_el3602.h"
#include "jsd/jsd_el4102.h"
#include "jsd/jsd_el6001.h"
#include "jsd/jsd_epd.h"
#include "jsd/jsd_ild1900.h"
#include "jsd/jsd_jed0101.h"
Expand Down Expand Up @@ -475,6 +476,10 @@ bool jsd_init_single_device(jsd_t* self, uint16_t slave_id) {
return jsd_el4102_init(self, slave_id);
break;
}
case JSD_EL6001_PRODUCT_CODE: {
return jsd_el6001_init(self, slave_id);
break;
}
case JSD_ILD1900_PRODUCT_CODE: {
return jsd_ild1900_init(self, slave_id);
break;
Expand Down
Loading