Conflict resolving

README.md

@@ -1,8 +1 @@
-# Arduino AVR Boards
-
-[![Check Arduino status](https://github.com/arduino/ArduinoCore-avr/actions/workflows/check-arduino.yml/badge.svg)](https://github.com/arduino/ArduinoCore-avr/actions/workflows/check-arduino.yml)
-[![Compile Examples status](https://github.com/arduino/ArduinoCore-avr/actions/workflows/compile-platform-examples.yml/badge.svg)](https://github.com/arduino/ArduinoCore-avr/actions/workflows/compile-platform-examples.yml)
-[![Spell Check status](https://github.com/arduino/ArduinoCore-avr/actions/workflows/spell-check.yml/badge.svg)](https://github.com/arduino/ArduinoCore-avr/actions/workflows/spell-check.yml)
-
-This repository contains the source code and configuration files of the Arduino AVR Boards
-[platform](https://arduino.github.io/arduino-cli/latest/platform-specification/).
+# idiBus AVR Boards

package_idibus_index.json

@@ -1,33 +1,39 @@
 {
   "packages": [
     {
-      "name": "idiBus",
+      "name": "idiBus Master Arduino Board",
       "maintainer": "OLIMP LLC",
       "websiteURL": "https://olimp-z.ru/",
       "email": "office@olimp-z.ru",
+      "help": {
+        "online": "https://olimp-z.ru/"
+      },
       "platforms": [
         {
           "name": "idiBus Arduino Board",
           "architecture": "avr",
           "version": "1.0.0",
           "category": "idiBus",
-          "url": "idiBus-Master-Board-1.0.0.zip",
-          "archiveFileName": "idiBus-Master-Board-1.0.0.zip",
-          "checksum": "SHA-256:1bfe7707894907a2792884fc726e1fe9251842fac75eaf5ef451bba0c18cbb4e",
-          "size": "92824",
+          "help": {
+            "online": "https://olimp-z.ru/"
+          },
+          "url": "https://olimpds.ru/gitea/attachments/90cb256f-cc0b-477b-a841-33d3ba90834f",
+          "archiveFileName": "idiBus-Master-Arduino-Board-1.0.0.zip",
+          "checksum": "SHA-256:e096a9f0ffcf91d6d056d6a9d5cc41acde78a018d54b9b1abb20b87845b238e2",
+          "size": "217993",
           "boards": [
-            {"name": "idiBus Master Board"}
+            {"name": "idiBus Master Arduino Board"}
           ],
           "toolsDependencies": [
             {
               "packager": "arduino",
               "name": "avr-gcc",
-              "version": "4.8.1-arduino5"
+              "version": "7.3.0-atmel3.6.1-arduino7"
             },
             {
               "packager": "idiBus",
               "name": "avrdude",
-              "version": "6.0.1-arduino5"
+              "version": "6.3.0-arduino17"
             }
           ]
         }
@@ -82,4 +88,4 @@
 	  ]
     }
   ]
-}
+}