Aqara US Wall Switch single and double rocker have different device type

[Mitalca5]

For some reason, the 2 versions of the Aqara US Wall Switch No Neutral, lumi.switch.b1naus01 (Single rocker) and lumi.switch.b2naus01 (Double rocker) behave in different ways under HA.
I've tracked the reasons for a long time, and apparently while the "b1naus01" are just handled as any zigpy device, "b2naus01" is handled via a quirk (zhaquirks.xiaomi.aqara.opple_switch.XiaomiOpple2ButtonSwitchFace2)
This means that, while the "b1naus01" switch is treated as a Light (ON_OFF_LIGHT = 0x0100), the "b2naus01" switch is treated as a generic Switch (ON_OFF_SWITCH = 0x0000).
This obviously means that half the switches in the house are handled one way, while the other have are handled differently

I'm not sure if this should be fixed through a modification of the XiaomiOpple2ButtonSwitchFace2 Class; trough adding a new class to handle the b1naus01, or just through a local quirk.

For reference, here are the different signatures each device have:

B1NAUS01

{
  "node_descriptor": "NodeDescriptor(logical_type=<LogicalType.Router: 1>, complex_descriptor_available=0, user_descriptor_available=0, reserved=0, aps_flags=0, frequency_band=<FrequencyBand.Freq2400MHz: 8>, mac_capability_flags=<MACCapabilityFlags.AllocateAddress|RxOnWhenIdle|MainsPowered|FullFunctionDevice: 142>, manufacturer_code=4447, maximum_buffer_size=127, maximum_incoming_transfer_size=100, server_mask=11264, maximum_outgoing_transfer_size=100, descriptor_capability_field=<DescriptorCapability.NONE: 0>, *allocate_address=True, *is_alternate_pan_coordinator=False, *is_coordinator=False, *is_end_device=False, *is_full_function_device=True, *is_mains_powered=True, *is_receiver_on_when_idle=True, *is_router=True, *is_security_capable=False)",
  "endpoints": {
    "1": {
      "profile_id": 260,
      "device_type": "0x0100",
      "in_clusters": [
        "0x0000",
        "0x0002",
        "0x0003",
        "0x0004",
        "0x0005",
        "0x0006",
        "0x0009",
        "0x0702",
        "0x0b04"
      ],
      "out_clusters": [
        "0x000a",
        "0x0019"
      ]
    },
    "242": {
      "profile_id": 41440,
      "device_type": "0x0061",
      "in_clusters": [],
      "out_clusters": [
        "0x0021"
      ]
    }
  },
  "manufacturer": "LUMI",
  "model": "lumi.switch.b1naus01",
  "class": "zigpy.device.Device"
}

B2NAUS01:

{
  "node_descriptor": "NodeDescriptor(logical_type=<LogicalType.Router: 1>, complex_descriptor_available=0, user_descriptor_available=0, reserved=0, aps_flags=0, frequency_band=<FrequencyBand.Freq2400MHz: 8>, mac_capability_flags=<MACCapabilityFlags.AllocateAddress|RxOnWhenIdle|MainsPowered|FullFunctionDevice: 142>, manufacturer_code=4447, maximum_buffer_size=127, maximum_incoming_transfer_size=100, server_mask=11264, maximum_outgoing_transfer_size=100, descriptor_capability_field=<DescriptorCapability.NONE: 0>, *allocate_address=True, *is_alternate_pan_coordinator=False, *is_coordinator=False, *is_end_device=False, *is_full_function_device=True, *is_mains_powered=True, *is_receiver_on_when_idle=True, *is_router=True, *is_security_capable=False)",
  "endpoints": {
    "1": {
      "profile_id": 260,
      "device_type": "0x0000",
      "in_clusters": [
        "0x0000",
        "0x0002",
        "0x0003",
        "0x0004",
        "0x0005",
        "0x0006",
        "0x0009",
        "0x0012",
        "0x0702",
        "0xfcc0"
      ],
      "out_clusters": [
        "0x000a",
        "0x0019"
      ]
    },
    "2": {
      "profile_id": 260,
      "device_type": "0x0000",
      "in_clusters": [
        "0x0000",
        "0x0003",
        "0x0004",
        "0x0005",
        "0x0006",
        "0x0012",
        "0xfcc0"
      ],
      "out_clusters": []
    },
    "21": {
      "profile_id": 260,
      "device_type": "0x0100",
      "in_clusters": [
        "0x000c"
      ],
      "out_clusters": []
    },
    "31": {
      "profile_id": 260,
      "device_type": "0x0100",
      "in_clusters": [
        "0x000c"
      ],
      "out_clusters": []
    },
    "41": {
      "profile_id": 260,
      "device_type": "0x0100",
      "in_clusters": [
        "0x0012"
      ],
      "out_clusters": []
    },
    "42": {
      "profile_id": 260,
      "device_type": "0x0100",
      "in_clusters": [
        "0x0012"
      ],
      "out_clusters": []
    },
    "51": {
      "profile_id": 260,
      "device_type": "0x0100",
      "in_clusters": [
        "0x0012"
      ],
      "out_clusters": []
    },
    "61": {
      "profile_id": 260,
      "device_type": "0x0100",
      "in_clusters": [
        "0x0012"
      ],
      "out_clusters": []
    },
    "242": {
      "profile_id": 41440,
      "device_type": "0x0061",
      "in_clusters": [],
      "out_clusters": [
        "0x0021"
      ]
    }
  },
  "manufacturer": "LUMI",
  "model": "lumi.switch.b2naus01",
  "class": "zhaquirks.xiaomi.aqara.opple_switch.XiaomiOpple2ButtonSwitchFace2"
}

[Mitalca5]

For now, I was able to create a custom quirk that fixed this, by making the double rocker a light switch once again.
I believe I have A LOT of extra code on the custom quirk, but for now, it works
If anybody is interested in this, let me know

[TheJulianJES]

Also see this section for modifying the device type without using a custom quirk: https://www.home-assistant.io/integrations/zha/#modifying-the-device-type

The switches should behave the same though and quirks should be fixed. Changing the device type will be a breaking change for users though.

[Hedda]

switches should behave the same though and quirks should be fixed. Changing the device type will be a breaking change for users

I think should would be great, as long as mention the breaking change in the release changelog. Anyway, just wanted suggest notifying the writer of Home Assistant release notes when zha-quirks get bumped there so that they mention it under their "Breaking changes" section.

[Hedda]

FYI, related consistency issue now also reported here -> home-assistant/core#101093

[ekalle-swe]

Yes, EU version have the same issue.
The single rocker version applies a quirk that fixes it but not the double rocker version