Skip to content

Allow omitting interrupt number #109

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.

Sign up for GitHub

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

Merged
glopesdev merged 2 commits into from
Mar 13, 2026
Merged

Allow omitting interrupt number #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23ccd88
Add regression test for optional interrupt number
glopesdev Mar 13, 2026
927e775
Allow omitting interrupt number
glopesdev Mar 13, 2026
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
4 changes: 3 additions & 1 deletion src/AppRegsImpl.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ if (inputPins.Count > 0)
var pinInfo = pin.Value;
var port = pinInfo.Port;
var pinNumber = pinInfo.PinNumber.ToString();
var interruptNumber = pinInfo.InterruptNumber;
var pinName = FirmwareNamingConvention.Instance.Apply(pin.Key);
if (!pinInfo.InterruptNumber.HasValue)
Error($"({pinName}) Interrupt number must be specified if interrupt priority is set.");
var interruptNumber = pinInfo.InterruptNumber.GetValueOrDefault();
var interruptPriority = TemplateHelper.GetFirmwareInterruptPriority(pinInfo.InterruptPriority);
var descriptionPadding = new string(' ', 36 - port.Length - interruptPriority.Length - pinNumber.Length);
#>
Expand Down
3 changes: 1 addition & 2 deletions src/Firmware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,7 @@ public class InputPinInfo : PortPinInfo
/// <summary>
/// Specifies the interrupt number associated with this pin.
/// </summary>
[YamlMember(DefaultValuesHandling = DefaultValuesHandling.Preserve)]
public int InterruptNumber;
public int? InterruptNumber;
}

/// <summary>
Expand Down
5 changes: 4 additions & 1 deletion src/Interrupts.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,15 @@ foreach (var pin in interruptPins)
{
var pinInfo = pin.Value;
var pinName = FirmwareNamingConvention.Instance.Apply(pin.Key);
if (!pinInfo.InterruptNumber.HasValue)
Error($"({pinName}) Interrupt number must be specified if interrupt priority is set.");
var interruptNumber = pinInfo.InterruptNumber.GetValueOrDefault();
#>

/************************************************************************/
/* <#= pinName #><#= new string(' ', 69 - pinName.Length) #>*/
/************************************************************************/
ISR(<#= pinInfo.Port #>_INT<#= pinInfo.InterruptNumber #>_vect, ISR_NAKED)
ISR(<#= pinInfo.Port #>_INT<#= interruptNumber #>_vect, ISR_NAKED)
{
reti();
}
Expand Down
1 change: 0 additions & 1 deletion tests/Metadata/device.ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ ADC1_AVAILABLE:
pinMode: pulldown
triggerMode: toggle
interruptPriority: "off"
interruptNumber: 0
description: ADC1 is available on hardware
DI3:
port: PORTH
Expand Down
Loading