Skip to content

Commit

Permalink
Release 0.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Breitschopp committed May 18, 2024
1 parent 8914dde commit fdd29f8
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 67 deletions.
Binary file modified dependencies.txt
View file
Binary file not shown.
132 changes: 66 additions & 66 deletions include/knxprod.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
(time & 0x3FFF) * 3600000 ) : 0 )

#define MAIN_OpenKnxId 0xA6
#define MAIN_ApplicationNumber 1
#define MAIN_ApplicationVersion 44
#define MAIN_ParameterSize 25180
#define MAIN_MaxKoNumber 3496
#define MAIN_ApplicationNumber 0
#define MAIN_ApplicationVersion 1
#define MAIN_ParameterSize 14406
#define MAIN_MaxKoNumber 1239
#define MAIN_OrderNumber "OpenKnxFingerprint"
#define BASE_ModuleVersion 17
#define LOG_ModuleVersion 50
Expand Down Expand Up @@ -281,7 +281,7 @@
// Touch-Front: LED grün
#define KoFIN_TouchPcbLedGreen (knx.getGroupObject(FIN_KoTouchPcbLedGreen))

#define FIN_ChannelCount 999
#define FIN_ChannelCount 200

// Parameter per channel
#define FIN_ParamBlockOffset 51
Expand Down Expand Up @@ -323,10 +323,10 @@
#define ParamFIN_ActionOnOff ((bool)(knx.paramByte(FIN_ParamCalcIndex(FIN_ActionOnOff)) & FIN_ActionOnOffMask))

// deprecated
#define FIN_KoOffset 500
#define FIN_KoOffset 100

// Communication objects per channel (multiple occurrence)
#define FIN_KoBlockOffset 500
#define FIN_KoBlockOffset 100
#define FIN_KoBlockSize 3

#define FIN_KoCalcNumber(index) (index + FIN_KoBlockOffset + _channelIndex * FIN_KoBlockSize)
Expand All @@ -344,15 +344,15 @@
// Eingang
#define KoFIN_ActionCall (knx.getGroupObject(FIN_KoCalcNumber(FIN_KoActionCall)))

#define FINACT_FingerActionCount 21030 // uint16_t
#define FINACT_FingerActionCount 4251 // uint16_t

// Verfügbare Zuordnungen
#define ParamFINACT_FingerActionCount (knx.paramWord(FINACT_FingerActionCount))

#define FINACT_ChannelCount 999
#define FINACT_ChannelCount 200

// Parameter per channel
#define FINACT_ParamBlockOffset 21032
#define FINACT_ParamBlockOffset 4253
#define FINACT_ParamBlockSize 4
#define FINACT_ParamCalcIndex(index) (index + FINACT_ParamBlockOffset + _channelIndex * FINACT_ParamBlockSize)

Expand All @@ -364,125 +364,125 @@
// Scanner Finger ID
#define ParamFINACT_faFingerId (knx.paramWord(FINACT_ParamCalcIndex(FINACT_faFingerId)))

#define LOG_BuzzerInstalled 25028 // 1 Bit, Bit 7
#define LOG_BuzzerInstalled 5053 // 1 Bit, Bit 7
#define LOG_BuzzerInstalledMask 0x80
#define LOG_BuzzerInstalledShift 7
#define LOG_LedInstalled 25028 // 1 Bit, Bit 6
#define LOG_LedInstalled 5053 // 1 Bit, Bit 6
#define LOG_LedInstalledMask 0x40
#define LOG_LedInstalledShift 6
#define LOG_VacationKo 25028 // 1 Bit, Bit 5
#define LOG_VacationKo 5053 // 1 Bit, Bit 5
#define LOG_VacationKoMask 0x20
#define LOG_VacationKoShift 5
#define LOG_HolidayKo 25028 // 1 Bit, Bit 4
#define LOG_HolidayKo 5053 // 1 Bit, Bit 4
#define LOG_HolidayKoMask 0x10
#define LOG_HolidayKoShift 4
#define LOG_VacationRead 25028 // 1 Bit, Bit 3
#define LOG_VacationRead 5053 // 1 Bit, Bit 3
#define LOG_VacationReadMask 0x08
#define LOG_VacationReadShift 3
#define LOG_HolidaySend 25028 // 1 Bit, Bit 2
#define LOG_HolidaySend 5053 // 1 Bit, Bit 2
#define LOG_HolidaySendMask 0x04
#define LOG_HolidaySendShift 2
#define LOG_Neujahr 25029 // 1 Bit, Bit 7
#define LOG_Neujahr 5054 // 1 Bit, Bit 7
#define LOG_NeujahrMask 0x80
#define LOG_NeujahrShift 7
#define LOG_DreiKoenige 25029 // 1 Bit, Bit 6
#define LOG_DreiKoenige 5054 // 1 Bit, Bit 6
#define LOG_DreiKoenigeMask 0x40
#define LOG_DreiKoenigeShift 6
#define LOG_Weiberfastnacht 25029 // 1 Bit, Bit 5
#define LOG_Weiberfastnacht 5054 // 1 Bit, Bit 5
#define LOG_WeiberfastnachtMask 0x20
#define LOG_WeiberfastnachtShift 5
#define LOG_Rosenmontag 25029 // 1 Bit, Bit 4
#define LOG_Rosenmontag 5054 // 1 Bit, Bit 4
#define LOG_RosenmontagMask 0x10
#define LOG_RosenmontagShift 4
#define LOG_Fastnachtsdienstag 25029 // 1 Bit, Bit 3
#define LOG_Fastnachtsdienstag 5054 // 1 Bit, Bit 3
#define LOG_FastnachtsdienstagMask 0x08
#define LOG_FastnachtsdienstagShift 3
#define LOG_Aschermittwoch 25029 // 1 Bit, Bit 2
#define LOG_Aschermittwoch 5054 // 1 Bit, Bit 2
#define LOG_AschermittwochMask 0x04
#define LOG_AschermittwochShift 2
#define LOG_Frauentag 25029 // 1 Bit, Bit 1
#define LOG_Frauentag 5054 // 1 Bit, Bit 1
#define LOG_FrauentagMask 0x02
#define LOG_FrauentagShift 1
#define LOG_Gruendonnerstag 25029 // 1 Bit, Bit 0
#define LOG_Gruendonnerstag 5054 // 1 Bit, Bit 0
#define LOG_GruendonnerstagMask 0x01
#define LOG_GruendonnerstagShift 0
#define LOG_Karfreitag 25030 // 1 Bit, Bit 7
#define LOG_Karfreitag 5055 // 1 Bit, Bit 7
#define LOG_KarfreitagMask 0x80
#define LOG_KarfreitagShift 7
#define LOG_Ostersonntag 25030 // 1 Bit, Bit 6
#define LOG_Ostersonntag 5055 // 1 Bit, Bit 6
#define LOG_OstersonntagMask 0x40
#define LOG_OstersonntagShift 6
#define LOG_Ostermontag 25030 // 1 Bit, Bit 5
#define LOG_Ostermontag 5055 // 1 Bit, Bit 5
#define LOG_OstermontagMask 0x20
#define LOG_OstermontagShift 5
#define LOG_TagDerArbeit 25030 // 1 Bit, Bit 4
#define LOG_TagDerArbeit 5055 // 1 Bit, Bit 4
#define LOG_TagDerArbeitMask 0x10
#define LOG_TagDerArbeitShift 4
#define LOG_Himmelfahrt 25030 // 1 Bit, Bit 3
#define LOG_Himmelfahrt 5055 // 1 Bit, Bit 3
#define LOG_HimmelfahrtMask 0x08
#define LOG_HimmelfahrtShift 3
#define LOG_Pfingstsonntag 25030 // 1 Bit, Bit 2
#define LOG_Pfingstsonntag 5055 // 1 Bit, Bit 2
#define LOG_PfingstsonntagMask 0x04
#define LOG_PfingstsonntagShift 2
#define LOG_Pfingstmontag 25030 // 1 Bit, Bit 1
#define LOG_Pfingstmontag 5055 // 1 Bit, Bit 1
#define LOG_PfingstmontagMask 0x02
#define LOG_PfingstmontagShift 1
#define LOG_Fronleichnam 25030 // 1 Bit, Bit 0
#define LOG_Fronleichnam 5055 // 1 Bit, Bit 0
#define LOG_FronleichnamMask 0x01
#define LOG_FronleichnamShift 0
#define LOG_Friedensfest 25031 // 1 Bit, Bit 7
#define LOG_Friedensfest 5056 // 1 Bit, Bit 7
#define LOG_FriedensfestMask 0x80
#define LOG_FriedensfestShift 7
#define LOG_MariaHimmelfahrt 25031 // 1 Bit, Bit 6
#define LOG_MariaHimmelfahrt 5056 // 1 Bit, Bit 6
#define LOG_MariaHimmelfahrtMask 0x40
#define LOG_MariaHimmelfahrtShift 6
#define LOG_DeutscheEinheit 25031 // 1 Bit, Bit 5
#define LOG_DeutscheEinheit 5056 // 1 Bit, Bit 5
#define LOG_DeutscheEinheitMask 0x20
#define LOG_DeutscheEinheitShift 5
#define LOG_Nationalfeiertag 25032 // 1 Bit, Bit 1
#define LOG_Nationalfeiertag 5057 // 1 Bit, Bit 1
#define LOG_NationalfeiertagMask 0x02
#define LOG_NationalfeiertagShift 1
#define LOG_Reformationstag 25031 // 1 Bit, Bit 4
#define LOG_Reformationstag 5056 // 1 Bit, Bit 4
#define LOG_ReformationstagMask 0x10
#define LOG_ReformationstagShift 4
#define LOG_Allerheiligen 25031 // 1 Bit, Bit 3
#define LOG_Allerheiligen 5056 // 1 Bit, Bit 3
#define LOG_AllerheiligenMask 0x08
#define LOG_AllerheiligenShift 3
#define LOG_BussBettag 25031 // 1 Bit, Bit 2
#define LOG_BussBettag 5056 // 1 Bit, Bit 2
#define LOG_BussBettagMask 0x04
#define LOG_BussBettagShift 2
#define LOG_MariaEmpfaengnis 25032 // 1 Bit, Bit 0
#define LOG_MariaEmpfaengnis 5057 // 1 Bit, Bit 0
#define LOG_MariaEmpfaengnisMask 0x01
#define LOG_MariaEmpfaengnisShift 0
#define LOG_Advent1 25031 // 1 Bit, Bit 1
#define LOG_Advent1 5056 // 1 Bit, Bit 1
#define LOG_Advent1Mask 0x02
#define LOG_Advent1Shift 1
#define LOG_Advent2 25031 // 1 Bit, Bit 0
#define LOG_Advent2 5056 // 1 Bit, Bit 0
#define LOG_Advent2Mask 0x01
#define LOG_Advent2Shift 0
#define LOG_Advent3 25032 // 1 Bit, Bit 7
#define LOG_Advent3 5057 // 1 Bit, Bit 7
#define LOG_Advent3Mask 0x80
#define LOG_Advent3Shift 7
#define LOG_Advent4 25032 // 1 Bit, Bit 6
#define LOG_Advent4 5057 // 1 Bit, Bit 6
#define LOG_Advent4Mask 0x40
#define LOG_Advent4Shift 6
#define LOG_Heiligabend 25032 // 1 Bit, Bit 5
#define LOG_Heiligabend 5057 // 1 Bit, Bit 5
#define LOG_HeiligabendMask 0x20
#define LOG_HeiligabendShift 5
#define LOG_Weihnachtstag1 25032 // 1 Bit, Bit 4
#define LOG_Weihnachtstag1 5057 // 1 Bit, Bit 4
#define LOG_Weihnachtstag1Mask 0x10
#define LOG_Weihnachtstag1Shift 4
#define LOG_Weihnachtstag2 25032 // 1 Bit, Bit 3
#define LOG_Weihnachtstag2 5057 // 1 Bit, Bit 3
#define LOG_Weihnachtstag2Mask 0x08
#define LOG_Weihnachtstag2Shift 3
#define LOG_Silvester 25032 // 1 Bit, Bit 2
#define LOG_Silvester 5057 // 1 Bit, Bit 2
#define LOG_SilvesterMask 0x04
#define LOG_SilvesterShift 2
#define LOG_BuzzerSilent 25033 // uint16_t
#define LOG_BuzzerNormal 25035 // uint16_t
#define LOG_BuzzerLoud 25037 // uint16_t
#define LOG_VisibleChannels 25039 // uint8_t
#define LOG_LedMapping 25040 // 3 Bits, Bit 7-5
#define LOG_BuzzerSilent 5058 // uint16_t
#define LOG_BuzzerNormal 5060 // uint16_t
#define LOG_BuzzerLoud 5062 // uint16_t
#define LOG_VisibleChannels 5064 // uint8_t
#define LOG_LedMapping 5065 // 3 Bits, Bit 7-5
#define LOG_LedMappingMask 0xE0
#define LOG_LedMappingShift 5

Expand Down Expand Up @@ -590,10 +590,10 @@
// Buzzer sperren
#define KoLOG_BuzzerLock (knx.getGroupObject(LOG_KoBuzzerLock))

#define LOG_ChannelCount 1
#define LOG_ChannelCount 99

// Parameter per channel
#define LOG_ParamBlockOffset 25041
#define LOG_ParamBlockOffset 5066
#define LOG_ParamBlockSize 84
#define LOG_ParamCalcIndex(index) (index + LOG_ParamBlockOffset + _channelIndex * LOG_ParamBlockSize)

Expand Down Expand Up @@ -2238,10 +2238,10 @@
#define ParamLOG_fOOffKOSendNumber (knx.paramWord(LOG_ParamCalcIndex(LOG_fOOffKOSendNumber)) & LOG_fOOffKOSendNumberMask)

// deprecated
#define LOG_KoOffset 100
#define LOG_KoOffset 700

// Communication objects per channel (multiple occurrence)
#define LOG_KoBlockOffset 100
#define LOG_KoBlockOffset 700
#define LOG_KoBlockSize 3

#define LOG_KoCalcNumber(index) (index + LOG_KoBlockOffset + _channelIndex * LOG_KoBlockSize)
Expand All @@ -2259,9 +2259,9 @@
// Ausgang
#define KoLOG_KOfO (knx.getGroupObject(LOG_KoCalcNumber(LOG_KoKOfO)))

#define BTN_ReactionTimeMultiClick 25125 // 8 Bits, Bit 7-0
#define BTN_ReactionTimeLong 25126 // 8 Bits, Bit 7-0
#define BTN_ReactionTimeExtraLong 25127 // 8 Bits, Bit 7-0
#define BTN_ReactionTimeMultiClick 13382 // 8 Bits, Bit 7-0
#define BTN_ReactionTimeLong 13383 // 8 Bits, Bit 7-0
#define BTN_ReactionTimeExtraLong 13384 // 8 Bits, Bit 7-0

// Mehrfach-Klick
#define ParamBTN_ReactionTimeMultiClick (knx.paramByte(BTN_ReactionTimeMultiClick))
Expand All @@ -2270,10 +2270,10 @@
// Extra langer Tastedruck
#define ParamBTN_ReactionTimeExtraLong (knx.paramByte(BTN_ReactionTimeExtraLong))

#define BTN_ChannelCount 1
#define BTN_ChannelCount 20

// Parameter per channel
#define BTN_ParamBlockOffset 25129
#define BTN_ParamBlockOffset 13386
#define BTN_ParamBlockSize 51
#define BTN_ParamCalcIndex(index) (index + BTN_ParamBlockOffset + _channelIndex * BTN_ParamBlockSize)

Expand Down Expand Up @@ -2784,10 +2784,10 @@
#define ParamBTN_ChannelStatusFallbackTimeMS (paramDelay(knx.paramWord(BTN_ParamCalcIndex(BTN_ChannelStatusFallbackTime))))

// deprecated
#define BTN_KoOffset 400
#define BTN_KoOffset 1000

// Communication objects per channel (multiple occurrence)
#define BTN_KoBlockOffset 400
#define BTN_KoBlockOffset 1000
#define BTN_KoBlockSize 12

#define BTN_KoCalcNumber(index) (index + BTN_KoBlockOffset + _channelIndex * BTN_KoBlockSize)
Expand Down Expand Up @@ -2836,11 +2836,11 @@

// Header generation for Module 'BASE_KommentarModule'

#define BASE_KommentarModuleCount 1
#define BASE_KommentarModuleCount 99
#define BASE_KommentarModuleModuleParamSize 0
#define BASE_KommentarModuleSubmodulesParamSize 0
#define BASE_KommentarModuleParamSize 0
#define BASE_KommentarModuleParamOffset 25180
#define BASE_KommentarModuleParamOffset 14406
#define BASE_KommentarModuleCalcIndex(index, m1) (index + BASE_KommentarModuleParamOffset + _channelIndex * BASE_KommentarModuleCount * BASE_KommentarModuleParamSize + m1 * BASE_KommentarModuleParamSize)


Expand Down
2 changes: 1 addition & 1 deletion include/versions.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#define MAIN_Version "30cc6ef"
#define MAIN_Version "8914dde"
#define KNX_Version "1f8c4e7"
#define MODULE_Common_Version "1.1.1+7d5ea92"
#define MODULE_Common_ETS 17
Expand Down

0 comments on commit fdd29f8

Please sign in to comment.