Skip to content

Commit

Permalink
Update ZAP to tip.
Browse files Browse the repository at this point in the history
This lets us significantly simplify the EventList availability annotations.
  • Loading branch information
bzbarsky-apple committed Sep 13, 2023
1 parent 7f750af commit a90a6cd
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 138 deletions.
4 changes: 2 additions & 2 deletions scripts/setup/zap.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"mac-amd64",
"windows-amd64"
],
"tags": ["version:[email protected].05-nightly.1"]
"tags": ["version:[email protected].12-nightly.1"]
},
{
"_comment": "Always get the amd64 version on mac until usable arm64 zap build is available",
"path": "fuchsia/third_party/zap/mac-amd64",
"platforms": ["mac-arm64"],
"tags": ["version:[email protected].05-nightly.1"]
"tags": ["version:[email protected].12-nightly.1"]
}
]
}
2 changes: 1 addition & 1 deletion scripts/setup/zap.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2023.09.05-nightly
v2023.09.12-nightly
2 changes: 1 addition & 1 deletion scripts/tools/zap/zap_execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
# files may need updating for versions
#
MIN_ZAP_VERSION = '2023.9.5'
MIN_ZAP_VERSION = '2023.9.12'


class ZapTool:
Expand Down
144 changes: 10 additions & 134 deletions src/darwin/Framework/CHIP/templates/availability.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7402,146 +7402,13 @@
- DishwasherAlarm
- SampleMEI
attributes:
# EventList generally not stable yet.
Scenes:
- EventList
# New scenes bits not stable yet.
- SceneTableSize
- RemainingCapacity
OnOff:
- EventList
OnOffSwitchConfiguration:
- EventList
LevelControl:
- EventList
BinaryInputBasic:
- EventList
PulseWidthModulation:
- EventList
Descriptor:
- EventList
Binding:
- EventList
Identify:
- EventList
AccessControl:
- EventList
Actions:
- EventList
OTASoftwareUpdateProvider:
- EventList
OTASoftwareUpdateRequestor:
- EventList
LocalizationConfiguration:
- EventList
TimeFormatLocalization:
- EventList
UnitLocalization:
- EventList
PowerSourceConfiguration:
- EventList
PowerSource:
- EventList
GeneralCommissioning:
- EventList
NetworkCommissioning:
- EventList
DiagnosticLogs:
- EventList
GeneralDiagnostics:
- EventList
SoftwareDiagnostics:
- EventList
ThreadNetworkDiagnostics:
- EventList
WiFiNetworkDiagnostics:
- EventList
EthernetNetworkDiagnostics:
- EventList
TimeSynchronization:
- EventList
Switch:
- EventList
AdministratorCommissioning:
- EventList
OperationalCredentials:
- EventList
GroupKeyManagement:
- EventList
FixedLabel:
- EventList
UserLabel:
- EventList
BooleanState:
- EventList
ModeSelect:
- EventList
DoorLock:
- EventList
WindowCovering:
- EventList
BarrierControl:
- EventList
PumpConfigurationAndControl:
- EventList
FanControl:
- EventList
# New Fan Control bits not stable yet.
- AirflowDirection
ThermostatUserInterfaceConfiguration:
- EventList
ColorControl:
- EventList
BallastConfiguration:
- EventList
IlluminanceMeasurement:
- EventList
TemperatureMeasurement:
- EventList
PressureMeasurement:
- EventList
Thermostat:
- EventList
FlowMeasurement:
- EventList
RelativeHumidityMeasurement:
- EventList
OccupancySensing:
- EventList
WakeOnLAN:
- EventList
Channel:
- EventList
Groups:
- EventList
TargetNavigator:
- EventList
MediaPlayback:
- EventList
MediaInput:
- EventList
LowPower:
- EventList
KeypadInput:
- EventList
ContentLauncher:
- EventList
AudioOutput:
- EventList
ApplicationLauncher:
- EventList
ApplicationBasic:
- EventList
AccountLogin:
- EventList
ElectricalMeasurement:
- EventList
UnitTesting:
- EventList
BasicInformation:
- EventList
BridgedDeviceBasicInformation:
- EventList
commands:
FanControl:
# Not stable yet
Expand Down Expand Up @@ -7592,14 +7459,23 @@
- AirflowDirection
global attributes:
- EventList
# Once we actually unmark TimeSynchronization as provisional, all these bits should go away too, and we should instead
# Once we actually unmark TimeSynchronization as provisional, all these bits except EventList should go away too, and we should instead
# mark things as introduced/deprecated as needed. The "ids" entries should go away, in particular.
ids:
attributes:
TimeSynchronization:
- TimeZoneListMaxSize
- DSTOffsetListMaxSize
- SupportsDNSResolve
# Because we are special-casing ids for TimeSynchronization
# above, we need to explicitly mark the EventList id
# provisional.
- EventList
PulseWidthModulation:
# Because we are special-casing ids for PulseWidthModulation
# above, we need to explicitly mark the EventList id
# provisional.
- EventList
commands:
TimeSynchronization:
- SetUTCTime
Expand Down

0 comments on commit a90a6cd

Please sign in to comment.