Skip to content

Commit

Permalink
Merge pull request #180 from DCSBIOSKit/master
Browse files Browse the repository at this point in the history 
Fix for the "attempt to concatenate local 'identifier' (a nil value)" issue
  • Loading branch information
@WarLord211
WarLord211 authored Aug 16, 2023
2 parents 7d0a183 + ca97316 commit bfd99e4
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 106 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
2 changes: 0 additions & 2 deletions Scripts/DCS-BIOS/doc/developerguide.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,6 @@ document {
address = tacanTestLEDState.address,
mask = tacanTestLEDState.mask,
shift_by = tacanTestLEDState.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, "BATTERY_POWER"),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, "BATTERY_POWER") .. "_ADDR",
max_value = 1,
description = "1 if light is on, 0 if light is off"
}
Expand Down
2 changes: 0 additions & 2 deletions Scripts/DCS-BIOS/doc/developerguide.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -926,8 +926,6 @@ <h3 id="_a_minimal_example">A Minimal Example</h3>
address = tacanTestLEDState.address,
mask = tacanTestLEDState.mask,
shift_by = tacanTestLEDState.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, "BATTERY_POWER"),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, "BATTERY_POWER") .. "_ADDR",
max_value = 1,
description = "1 if light is on, 0 if light is off"
}
Expand Down
6 changes: 0 additions & 6 deletions Scripts/DCS-BIOS/lib/A-10C.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ document {
address = cmsp1Alloc.address,
mask = cmsp1Alloc.mask,
shift_by = cmsp1Alloc.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_length = cmsp1Alloc.maxLength,
description = "CMSP Display Line 1 (19 characters)"
}
Expand All @@ -191,8 +189,6 @@ document {
mask = cmsp2Alloc.mask,
shift_by = cmsp2Alloc.shiftBy,
max_length = cmsp2Alloc.maxLength,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
description = "CMSP Display Line 2 (19 characters)"
}
}
Expand Down Expand Up @@ -488,8 +484,6 @@ local function defineCMSPSwitch(msg, device_id, down_command, up_command, arg_nu
address = alloc.address,
mask = alloc.mask,
shift_by = alloc.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 2,
description = "switch position: 0 - down, 1 - center, 2 - up"
}
Expand Down
6 changes: 0 additions & 6 deletions Scripts/DCS-BIOS/lib/AJS37.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ local function defineIndicatorLight1(msg, arg_number, category, description)
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "Afterburner Stage Light 1"
}
Expand Down Expand Up @@ -79,8 +77,6 @@ local function defineIndicatorLight2(msg, arg_number, category, description)
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "Afterburner Stage Light 2"
}
Expand Down Expand Up @@ -112,8 +108,6 @@ local function defineIndicatorLight3(msg, arg_number, category, description)
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "Afterburner Stage Light 3"
}
Expand Down
2 changes: 0 additions & 2 deletions Scripts/DCS-BIOS/lib/AV8BNA.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ local function defineAV8BCommSelector(msg, device_id, command, arg_delta, arg_nu
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 65535,
description = "rotation of the knob"
}
Expand Down
10 changes: 0 additions & 10 deletions Scripts/DCS-BIOS/lib/F-14.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ local function defineIndicatorLightMulti1(msg, arg_number, category, description
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "Multi Led Color 1; Light is on between 0.4 and 0.59"
}
Expand Down Expand Up @@ -81,8 +79,6 @@ local function defineIndicatorLightMulti2(msg, arg_number, category, description
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "Multi Led Color 2; Light is on between 0.8 and 0.98"
}
Expand Down Expand Up @@ -114,8 +110,6 @@ local function defineIndicatorLightLANTTop(msg, arg_number, category, descriptio
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "LANTRIN Led Top; Light is on between 0.24 and 0.48"
}
Expand Down Expand Up @@ -147,8 +141,6 @@ local function defineIndicatorLightLANT(msg, arg_number, category, description)
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "LANTRIN Led Booth; Light is on between 0.49 and 0.54"
}
Expand Down Expand Up @@ -180,8 +172,6 @@ local function defineIndicatorLightLANTBottom(msg, arg_number, category, descrip
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "LANTRIN Led Bottom; Light is on between 0.55 and 0.98"
}
Expand Down
4 changes: 0 additions & 4 deletions Scripts/DCS-BIOS/lib/F-15E.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ local function defineIndicatorLightMulti1(msg, arg_number, category, description
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "Multi Led Color 1; Light is on between 0.1 and 0.59"
}
Expand Down Expand Up @@ -80,8 +78,6 @@ local function defineIndicatorLightMulti2(msg, arg_number, category, description
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "Multi Led Color 2; Light is on between 0.61 and 1"
}
Expand Down
12 changes: 0 additions & 12 deletions Scripts/DCS-BIOS/lib/FA-18C_hornet.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ local function defineEmergencyParkingBrake(msg, device_id, emergency_command, pa
address = alloc.address,
mask = alloc.mask,
shift_by = alloc.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 2,
description = "switch position -- 0 = emergency, 1 = parking, 2 = release"
}
Expand Down Expand Up @@ -117,8 +115,6 @@ local function defineToggleSwitchToggleOnly2(msg, device_id, command, arg_number
address = alloc.address,
mask = alloc.mask,
shift_by = alloc.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "switch position -- 0 = off, 1 = on"
}
Expand Down Expand Up @@ -163,8 +159,6 @@ local function defineMissionComputerSwitch(msg, device_id, mc1_off_command, mc2_
address = alloc.address,
mask = alloc.mask,
shift_by = alloc.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 2,
description = "switch position -- 0 = 1OFF, 1 = NORM, 2 = 2OFF"
}
Expand Down Expand Up @@ -206,8 +200,6 @@ local function defineEjectionHandleSwitch(msg, device_id, command, arg_number, c
address = alloc.address,
mask = alloc.mask,
shift_by = alloc.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "switch position -- 0 = off, 1 = on"
}
Expand Down Expand Up @@ -244,8 +236,6 @@ local function defineFrequency(msg, id_device_number, category, description)
address = alloc.address,
mask = alloc.mask,
shift_by = alloc.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 65535,
description = "frequency"
}
Expand Down Expand Up @@ -322,8 +312,6 @@ local function defineFloatFromUFCChannel(msg, _channel, category, description)
address = alloc.address,
mask = alloc.mask,
shift_by = alloc.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 65535,
description = "gauge position"
}
Expand Down
2 changes: 0 additions & 2 deletions Scripts/DCS-BIOS/lib/Ka-50.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ local function definePushButtonLed(msg, arg_number, category, description)
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "0 if light is off, 1 if light is on"
}
Expand Down
4 changes: 0 additions & 4 deletions Scripts/DCS-BIOS/lib/P-47D.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ local function defineIndicatorLightMulti1(msg, arg_number, category, description
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "Light is on below 0.51"
}
Expand Down Expand Up @@ -76,8 +74,6 @@ local function defineIndicatorLightMulti2(msg, arg_number, category, description
address = value.address,
mask = value.mask,
shift_by = value.shiftBy,
address_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg),
address_only_identifier = BIOS.util.addressDefineIdentifier(moduleBeingDefined.name, msg) .. "_ADDR",
max_value = 1,
description = "Light is on grater than 0.51"
}
Expand Down
Loading

0 comments on commit bfd99e4

Please sign in to comment.