Merge pull request #17 from DCC-EX/development

Fixes for LCD/OLED compile in json, add delete command for publish
DCC-EX · Nov 19, 2020 · 1d4c769 · 1d4c769
2 parents f07e0c5 + 3fe9795
commit 1d4c769
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/BaseStationInstaller/config.json b/BaseStationInstaller/config.json
@@ -78,12 +78,36 @@
                 "Location": "libraries/Ethernet",
                 "LibraryDownloadAvailable": false
             },
-          {
-            "Name": "mathertel/LiquidCrystal_PCF8574",
-            "Repo": "https://github.com/mathertel/LiquidCrystal_PCF8574.git",
-            "Location": "libraries/LiquidCrystal_PCF8574",
-            "LibraryDownloadAvailable": false
-          }
+            {
+                "Name": "mathertel/LiquidCrystal_PCF8574",
+                "Repo": "https://github.com/mathertel/LiquidCrystal_PCF8574.git",
+                "Location": "libraries/LiquidCrystal_PCF8574",
+                "LibraryDownloadAvailable": false
+            },
+            {
+                "Name": "johnrickman/LiquidCrystal_I2C",
+                "Repo": "https://github.com/johnrickman/LiquidCrystal_I2C.git",
+                "Location": "libraries/LiquidCrystal_I2C",
+                "LibraryDownloadAvailable": false
+            },
+            {
+                "Name": "Adafruit BusIO",
+                "Repo": "https://github.com/adafruit/Adafruit_BusIO.git",
+                "Location": "libraries/Adafruit_BusIO",
+                "LibraryDownloadAvailable": false
+            },
+            {
+                "Name": "Adafruit SSD1306",
+                "Repo": "https://github.com/adafruit/Adafruit_SSD1306.git",
+                "Location": "libraries/Adafruit_SSD1306",
+                "LibraryDownloadAvailable": false
+            },
+            {
+                "Name": "Adafruit GFX Library",
+                "Repo": "https://github.com/adafruit/Adafruit-GFX-Library.git",
+                "Location": "libraries/Adafruit-GFX-Library",
+                "LibraryDownloadAvailable": false
+            }
         ],
         "SupportedBoards": [
             {

diff --git a/publish.ps1 b/publish.ps1
@@ -4,11 +4,11 @@ dotnet publish -c release -r win-x86
 dotnet publish -c release -r osx-x64
 dotnet publish -c release -r linux-arm64
 dotnet publish -c release -r linux-arm
-
+del exInstaller-*
 wsl tar -czf exInstaller-arm.tar.gz "BaseStationInstaller/bin/Release/netcoreapp3.1/linux-arm/publish/*"
 wsl tar -czf exInstaller-arm64.tar.gz "BaseStationInstaller/bin/Release/netcoreapp3.1/linux-arm64/publish/*"
 wsl tar -czf exInstaller-linux-x64.tar.gz "BaseStationInstaller/bin/Release/netcoreapp3.1/linux-x64/publish/*"
-wsl zip -r exInstaller-win32.zip "BaseStationInstaller/bin/Release/netcoreapp3.1/win-x86/publish"
-wsl zip -r exInstaller-win64.zip "BaseStationInstaller/bin/Release/netcoreapp3.1/win-x64/publish"
+wsl zip -r exInstaller-win-x86.zip "BaseStationInstaller/bin/Release/netcoreapp3.1/win-x86/publish"
+wsl zip -r exInstaller-win-x64.zip "BaseStationInstaller/bin/Release/netcoreapp3.1/win-x64/publish"
 wsl tar -czf exInstaller-osx.tar.gz "BaseStationInstaller/bin/Release/netcoreapp3.1/osx-x64/publish/*"