diff --git a/data/devices/device.example b/data/devices/device.example index b08f8a57..83973489 100644 --- a/data/devices/device.example +++ b/data/devices/device.example @@ -80,7 +80,7 @@ DpiRange=100:16000@100 [Driver/sinowealth/devices/ADeviceNameWithoutSpaces] # Number of buttons. # Default to 0. -ButtonCount=6 +Buttons=6 # Device name DeviceName=CoolVendor CoolMouse @@ -100,7 +100,7 @@ LedType=RGB # Number of profiles, called "modes" in official software utilities. # If you are unsure what the "mode" thing is about, don't set this field. # Defaults to 1. -ProfileCount=2 +Profiles=1 # Sensor type. # This field is unused, only used for book-keeping purposes. diff --git a/data/devices/glorious-model-d.device b/data/devices/glorious-model-d.device index 010117d4..8d316b94 100644 --- a/data/devices/glorious-model-d.device +++ b/data/devices/glorious-model-d.device @@ -5,7 +5,7 @@ DeviceType=mouse Driver=sinowealth [Driver/sinowealth/devices/GloriousModelD] -ButtonCount=6 +Buttons=6 DeviceName=Glorious Model D FwVersion=V102 LedType=RBG diff --git a/data/devices/glorious-model-o.device b/data/devices/glorious-model-o.device index ec2ec8eb..160cff70 100644 --- a/data/devices/glorious-model-o.device +++ b/data/devices/glorious-model-o.device @@ -5,7 +5,7 @@ DeviceType=mouse Driver=sinowealth [Driver/sinowealth/devices/GloriousModelO] -ButtonCount=6 +Buttons=6 DeviceName=Glorious Model O/O- (updated firmware) FwVersion=V103 LedType=RBG diff --git a/data/devices/sinowealth-0027.device b/data/devices/sinowealth-0027.device index 6be64598..afe6ba55 100644 --- a/data/devices/sinowealth-0027.device +++ b/data/devices/sinowealth-0027.device @@ -5,14 +5,14 @@ Driver=sinowealth Name=SinoWealth Generic Mouse (0027) [Driver/sinowealth/devices/DreamMachinesDM5Blink] -ButtonCount=8 +Buttons=8 DeviceName=DreamMachines DM5 Blink FwVersion=3106 LedType=RGB SensorType=PMW3389 [Driver/sinowealth/devices/GWolvesHatiHTM] -ButtonCount=6 +Buttons=6 # Can be both `Ace` and `Classic` version. DeviceName=G-Wolves Hati HT-M Wired FwVersion=V161 @@ -25,14 +25,14 @@ SensorType=PMW3360 # Side buttons are detachable. # There can be either 3 or 9 buttons on the side. # Going for the maximum count: 5 + 9 = 14. -ButtonCount=14 +Buttons=14 DeviceName=Genesys Xenon 770 FwVersion=3110 LedType=RGB SensorType=PMW3327 [Driver/sinowealth/devices/GloriousModelOOld] -ButtonCount=6 +Buttons=6 DeviceName=Glorious Model O (old firmware) FwVersion=V102 LedType=RBG diff --git a/data/devices/sinowealth-0029.device b/data/devices/sinowealth-0029.device index ea76b433..05f76be0 100644 --- a/data/devices/sinowealth-0029.device +++ b/data/devices/sinowealth-0029.device @@ -7,7 +7,7 @@ Name=SinoWealth Generic Mouse (0029) # Configuration data size: 131 bytes. # https://github.com/libratbag/libratbag/issues/1361 [Driver/sinowealth/devices/MachenikeM620] -ButtonCount=6 +Buttons=6 DeviceName=Machenike M620 FwVersion=V127 LedType=RGB diff --git a/data/devices/sinowealth-0051.device b/data/devices/sinowealth-0051.device index deb034b7..a07c9926 100644 --- a/data/devices/sinowealth-0051.device +++ b/data/devices/sinowealth-0051.device @@ -7,9 +7,9 @@ Name=Sinowealth Generic Mouse (0051) # Configuration data size: 123 bytes. # https://github.com/libratbag/libratbag/issues/1444. [Driver/sinowealth/devices/TDaggerImperialTTGM310] -ButtonCount=8 +Buttons=8 DeviceName=T-Dagger Imperial T-TGM310 FwVersion=2642 LedType=RGB -ProfileCount=2 +Profiles=2 SensorType=PMW3212 diff --git a/data/devices/sinowealth-1007.device b/data/devices/sinowealth-1007.device index 8b7a3496..f0dffa82 100644 --- a/data/devices/sinowealth-1007.device +++ b/data/devices/sinowealth-1007.device @@ -7,7 +7,7 @@ Name=SinoWealth Generic Mouse (1007) # This does NOT work. See libratbag/libratbag#1296. # For future: ID of A3050 sensor is 0x2, and maximum DPI is 4000. #[Driver/sinowealth/devices/AntEsportsGM500] -#ButtonCount=7 +#Buttons=7 #DeviceName=Ant Esports GM500 #FwVersion=0910 #LedType=RBG @@ -16,7 +16,7 @@ Name=SinoWealth Generic Mouse (1007) # Configuration size: 123 bytes. # https://github.com/libratbag/libratbag/issues/1091 [Driver/sinowealth/devices/MarvoScorpionG961] -ButtonCount=6 +Buttons=6 DeviceName=Marvo Scorpion G961 FwVersion=9677 LedType=RGB diff --git a/src/libratbag-data.c b/src/libratbag-data.c index f66bfb3b..55555910 100644 --- a/src/libratbag-data.c +++ b/src/libratbag-data.c @@ -248,7 +248,7 @@ init_data_sinowealth(struct ratbag *ratbag, struct sinowealth_device_data *device = zalloc(sizeof(struct sinowealth_device_data)); - rc = g_key_file_get_integer(keyfile, device_group, "ButtonCount", &error); + rc = g_key_file_get_integer(keyfile, device_group, "Buttons", &error); if (rc != 0 && !error) { device->button_count = rc; } else { @@ -278,7 +278,7 @@ init_data_sinowealth(struct ratbag *ratbag, } g_clear_error(&error); - rc = g_key_file_get_integer(keyfile, device_group, "ProfileCount", &error); + rc = g_key_file_get_integer(keyfile, device_group, "Profiles", &error); if (rc != 0 && !error) { device->profile_count = rc; } else { diff --git a/test/data-parse-test.py b/test/data-parse-test.py index c52493ba..b4b2ec04 100755 --- a/test/data-parse-test.py +++ b/test/data-parse-test.py @@ -283,8 +283,8 @@ SINOWEALTH_REQUIRED_KEYS = ( ) SINOWEALTH_PERMITTED_KEYS = ( *SINOWEALTH_REQUIRED_KEYS, - "ButtonCount", - "ProfileCount", + "Buttons", + "Profiles", "SensorType", )