Skip to content

Commit 8fecfb9

Browse files
committed
Default start node in OPERATIONAL state and activate temperature and ultrasonic
1 parent 0452de7 commit 8fecfb9

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

objdict/CO_OD.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct sCO_OD_ROM CO_OD_ROM = {
2828
/*1007*/ 0x0000L,
2929
/*1008*/ {'J', 'P', ' ', 'G', 'a', 'r', 't', 'e', 'n', 'n', 'o', 'd', 'e', ' ', '[', 'Z', 'y', 's', 't', 'e', 'r', 'n', 'e', ']'},
3030
/*1009*/ {'1', '.', '0'},
31-
/*100a*/ {'0', '.', '0', '.', '1', '7'},
31+
/*100a*/ {'0', '.', '0', '.', '1', '8'},
3232
/*1012*/ 0x0000L,
3333
/*1014*/ 0x0080L,
3434
/*1015*/ 0x64,
@@ -79,10 +79,10 @@ struct sCO_OD_RAM CO_OD_RAM = {
7979
/*2104*/ 0x0000L,
8080
/*2105*/ 0x0L,
8181
/*2106*/ 0x0000L,
82-
/*2107*/ 0x0L,
82+
/*2107*/ 0x1L,
8383
/*2108*/ 0x0064L,
8484
/*2109*/ 0x0000L,
85-
/*2110*/ 0x0L,
85+
/*2110*/ 0x1L,
8686
/*2111*/ 0x0064L,
8787
/*2112*/ {0x00, 0x00},
8888

@@ -340,6 +340,6 @@ const CO_OD_entry_t CO_OD[55] = {
340340
{0x2109, 0x00, 0xa6, 4, (void*)&CO_OD_RAM.ultrasonicDistance},
341341
{0x2110, 0x00, 0x3e, 1, (void*)&CO_OD_RAM.temperatureEnable},
342342
{0x2111, 0x00, 0xbe, 4, (void*)&CO_OD_RAM.temperaturePeriode},
343-
{0x2112, 0x02, 0xbe, 2, (void*)&CO_OD_RAM.temperatureValue[0]},
343+
{0x2112, 0x02, 0x8e, 2, (void*)&CO_OD_RAM.temperatureValue[0]},
344344
};
345345
// clang-format on

objdict/CO_OD.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
#define CO_NO_LSS_CLIENT 0 //LSS Master
8484
#define CO_NO_RPDO 4 //Associated objects: 14xx, 16xx
8585
#define CO_NO_TPDO 4 //Associated objects: 18xx, 1Axx
86-
#define CO_NO_NMT_MASTER 0
86+
#define CO_NO_NMT_MASTER 1
8787

8888

8989
/*******************************************************************************

objdict/objdict.eds

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Description=
88
CreationTime=2:52PM
99
CreationDate=09-18-2019
1010
CreatedBy=
11-
ModificationTime=4:36PM
12-
ModificationDate=03-13-2025
11+
ModificationTime=8:22PM
12+
ModificationDate=03-27-2025
1313
ModifiedBy=
1414

1515
[DeviceInfo]
@@ -313,7 +313,7 @@ ObjectType=0x7
313313
;StorageLocation=ROM
314314
DataType=0x0009
315315
AccessType=const
316-
DefaultValue=0.0.17
316+
DefaultValue=0.0.18
317317
PDOMapping=0
318318

319319
[1010]
@@ -1768,7 +1768,7 @@ ObjectType=0x7
17681768
;StorageLocation=ROM
17691769
DataType=0x0007
17701770
AccessType=rw
1771-
DefaultValue=0x00000000
1771+
DefaultValue=0x00000001
17721772
PDOMapping=0
17731773

17741774
[ManufacturerObjects]
@@ -1856,7 +1856,7 @@ ObjectType=0x7
18561856
;StorageLocation=RAM
18571857
DataType=0x0005
18581858
AccessType=rw
1859-
DefaultValue=0
1859+
DefaultValue=1
18601860
PDOMapping=1
18611861

18621862
[2108]
@@ -1883,7 +1883,7 @@ ObjectType=0x7
18831883
;StorageLocation=RAM
18841884
DataType=0x0005
18851885
AccessType=rw
1886-
DefaultValue=0
1886+
DefaultValue=1
18871887
PDOMapping=1
18881888

18891889
[2111]

objdict/objdict.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<description />
6565
<accessFunctionPreCode />
6666
</CANopenObject>
67-
<CANopenObject index="100a" name="Manufacturer software version" objectType="VAR" memoryType="ROM" dataType="0x09" accessType="const" PDOmapping="no" defaultValue="0.0.17" highValue="" lowValue="" subNumber="0" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
67+
<CANopenObject index="100a" name="Manufacturer software version" objectType="VAR" memoryType="ROM" dataType="0x09" accessType="const" PDOmapping="no" defaultValue="0.0.18" highValue="" lowValue="" subNumber="0" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
6868
<description />
6969
<accessFunctionPreCode />
7070
</CANopenObject>
@@ -624,7 +624,7 @@
624624
</CANopenSubObject>
625625
<accessFunctionPreCode />
626626
</CANopenObject>
627-
<CANopenObject index="1f80" name="NMT startup" objectType="VAR" memoryType="ROM" dataType="0x07" accessType="rw" PDOmapping="no" defaultValue="0x00000000" highValue="" lowValue="" subNumber="0" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
627+
<CANopenObject index="1f80" name="NMT startup" objectType="VAR" memoryType="ROM" dataType="0x07" accessType="rw" PDOmapping="no" defaultValue="0x00000001" highValue="" lowValue="" subNumber="0" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
628628
<description />
629629
<accessFunctionPreCode />
630630
</CANopenObject>
@@ -656,7 +656,7 @@
656656
<description />
657657
<accessFunctionPreCode />
658658
</CANopenObject>
659-
<CANopenObject index="2107" name="Ultrasonic enable" objectType="VAR" memoryType="RAM" dataType="0x05" accessType="rw" PDOmapping="optional" defaultValue="0" highValue="" lowValue="" subNumber="0" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
659+
<CANopenObject index="2107" name="Ultrasonic enable" objectType="VAR" memoryType="RAM" dataType="0x05" accessType="rw" PDOmapping="optional" defaultValue="1" highValue="" lowValue="" subNumber="0" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
660660
<description />
661661
<accessFunctionPreCode />
662662
</CANopenObject>
@@ -668,15 +668,15 @@
668668
<description />
669669
<accessFunctionPreCode />
670670
</CANopenObject>
671-
<CANopenObject index="2110" name="Temperature enable" objectType="VAR" memoryType="RAM" dataType="0x05" accessType="rw" PDOmapping="optional" defaultValue="0" highValue="" lowValue="" subNumber="0" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
671+
<CANopenObject index="2110" name="Temperature enable" objectType="VAR" memoryType="RAM" dataType="0x05" accessType="rw" PDOmapping="optional" defaultValue="1" highValue="" lowValue="" subNumber="0" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
672672
<description />
673673
<accessFunctionPreCode />
674674
</CANopenObject>
675675
<CANopenObject index="2111" name="Temperature periode" objectType="VAR" memoryType="RAM" dataType="0x07" accessType="rw" PDOmapping="optional" defaultValue="100" highValue="" lowValue="" subNumber="0" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
676676
<description />
677677
<accessFunctionPreCode />
678678
</CANopenObject>
679-
<CANopenObject index="2112" name="Temperature value" objectType="ARRAY" memoryType="RAM" dataType="0x03" accessType="rw" PDOmapping="optional" defaultValue="" highValue="" lowValue="" subNumber="3" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
679+
<CANopenObject index="2112" name="Temperature value" objectType="ARRAY" memoryType="RAM" dataType="0x03" accessType="rw" PDOmapping="no" defaultValue="" highValue="" lowValue="" subNumber="3" accessFunctionName="" disabled="false" TPDOdetectCOS="false">
680680
<description />
681681
<CANopenSubObject subIndex="00" name="max sub-index" objectType="VAR" dataType="0x05" accessType="ro" PDOmapping="optional" defaultValue="2" highValue="" lowValue="" TPDOdetectCOS="false">
682682
<description />
@@ -691,7 +691,7 @@
691691
</CANopenObject>
692692
</CANopenObjectList>
693693
<other>
694-
<file fileCreator="" fileCreationDate="09-18-2019" fileCreationTime="2:52nachm." fileModifedBy="" fileMotifcationDate="03-13-2025" fileModificationTime="4:36nachm." fileVersion="1" fileRevision="1" exportFolder="" EdsFile="/mnt/Daten/Programmierung/Zypher/test_workspace/application/gartennode_zysterne/objdict/objdict.eds" />
694+
<file fileCreator="" fileCreationDate="09-18-2019" fileCreationTime="2:52nachm." fileModifedBy="" fileMotifcationDate="03-27-2025" fileModificationTime="8:22nachm." fileVersion="1" fileRevision="1" exportFolder="" EdsFile="/mnt/Daten/Programmierung/zephyr/zephyr_gartennode_zysternenmodul/objdict/objdict.eds" />
695695
<DeviceIdentity>
696696
<vendorName>Jaster Products</vendorName>
697697
<vendorNumber>0</vendorNumber>

0 commit comments

Comments
 (0)