Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified dependencies.txt
Binary file not shown.
5 changes: 3 additions & 2 deletions src/IP-Router-Release.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
<op:config name="%NET_ServiceNTP%" value="1" />

<op:nowarn id="1" regex="%BASE_" />
<op:nowarn id="3" regex="BASE_getUnsupportedEtsModules" />

<op:ETS OpenKnxId="0xA1"
ApplicationNumber="31"
ApplicationVersion="0.3"
ApplicationVersion="0.3.0"
ReplacesVersions="0.2 0.1"
ApplicationRevision="0"
ProductName="IP-Router"
Expand All @@ -25,7 +26,7 @@
/>

<op:define prefix="BASE" ModuleType="10" >
<op:verify File="../lib/OGM-Common/library.json" ModuleVersion="1.4" />
<op:verify File="../lib/OGM-Common/library.json" ModuleVersion="1.5" />
</op:define>
<op:define prefix="NET" ModuleType="11" share="../lib/OFM-Network/src/Network.share.xml" >
<op:verify File="../lib/OFM-Network/library.json" ModuleVersion="0.5" />
Expand Down
2 changes: 1 addition & 1 deletion src/IP-Router.share.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
</ComObjectRefs>
</Static>
<Dynamic>
<Channel Id="%AID%_CH-%PREFIX%-Routing" Number="%PREFIX%-Routing" Name="IP-Router" Text="IP-Router" Icon="router-network">
<Channel Id="%AID%_CH-%PREFIX%-Routing" Number="%PREFIX%" Name="IP-Router" Text="IP-Router" Icon="router-network">
<ParameterBlock Id="%AID%_PB-nnn" Name="RoutingKNXIP" Text="Routing KNX -&gt; IP" Icon="router" HelpContext="ROUTE-KNXIP">
<ParameterSeparator Id="%AID%_PS-" Text="Einstellungen für das Routing von Telegrammen von TP nach IP" UIHint="Headline" />
<ParameterRefRef RefId="%AID%_P-%TT%00007_R-%TT%0000701" IndentLevel="1"/>
Expand Down
5 changes: 3 additions & 2 deletions src/IP-Router.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
<op:config name="%NET_ServiceNTP%" value="1" />

<op:nowarn id="1" regex="%BASE_" />
<op:nowarn id="3" regex="BASE_getUnsupportedEtsModules" />

<op:ETS OpenKnxId="0xA1"
ApplicationNumber="30"
ApplicationVersion="5.2"
ApplicationVersion="5.2.2"
ReplacesVersions="5.1 2.10 2.11 2.12 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 3.13 3.14 3.15 4.5 4.6 4.7 4.12 4.13 4.14 4.15 5.0"
ApplicationRevision="0"
ProductName="IP-Router"
Expand All @@ -25,7 +26,7 @@
/>

<op:define prefix="BASE" ModuleType="10" >
<op:verify File="../lib/OGM-Common/library.json" ModuleVersion="1.4" />
<op:verify File="../lib/OGM-Common/library.json" ModuleVersion="1.5" />
</op:define>
<op:define prefix="NET" ModuleType="11" share="../lib/OFM-Network/src/Network.share.xml" >
<op:verify File="../lib/OFM-Network/library.json" ModuleVersion="0.5" />
Expand Down
2 changes: 1 addition & 1 deletion src/TemplateRouter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</CatalogSection>
</Catalog>
<ApplicationPrograms>
<op:version OpenKnxId="%OpenKnxId%" ApplicationNumber="%ApplicationNumber%" ApplicationVersion="%ApplicationVersion%" ReplacesVersions="%ReplacesVersions%" ApplicationRevision="%ApplicationRevision%" />
<op:version OpenKnxId="%OpenKnxId%" ApplicationNumber="%ApplicationNumber%" ApplicationVersion="%ApplicationVersion%" ReplacesVersions="%ReplacesVersions%" ApplicationRevision="%ApplicationRevision%" FirmwareRevision="%FirmwareRevision%" />
<ApplicationProgram Id="%AID%" ProgramType="ApplicationProgram" MaskVersion="%MaskVersion%" Name="%ApplicationName%%BuildSuffix%" LoadProcedureStyle="MergedProcedure" PeiType="0" DefaultLanguage="de-DE" DynamicTableManagement="false" Linkable="false" MinEtsVersion="5.0" ContextHelpFile="%FILE-HELP-de%" IconFile="%FILE-ICONS%" ApplicationNumber="0" ApplicationVersion="0" ReplacesVersions="0" AdditionalAddressesCount="%Tunnelcount%" MaxTunnelingUserEntries="%Tunnelcount%">
<Static>
<Code>
Expand Down
3 changes: 1 addition & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ void activity(uint8_t info)

void setup()
{
const uint8_t firmwareRevision = 2;
openknx.init(firmwareRevision);
openknx.init();

openknx.addModule(7, openknxNetwork);
#ifdef ARDUINO_ARCH_RP2040
Expand Down