RGBLED working + added 16 Bit Bus, and 16 Bit IN?OUT the 16 Bit merges and Splits arent working yet

Parshwa · Parshwa · commit 7cbe789f033b · 2025-04-27T10:49:08.000+05:30
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+      "visualstudiotoolsforunity.vstuc"
+    ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,10 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Attach to Unity",
+            "type": "vstuc",
+            "request": "attach"
+        }
+     ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,70 @@
+{
+    "files.exclude": {
+        "**/.DS_Store": true,
+        "**/.git": true,
+        "**/.vs": true,
+        "**/.gitmodules": true,
+        "**/.vsconfig": true,
+        "**/*.booproj": true,
+        "**/*.pidb": true,
+        "**/*.suo": true,
+        "**/*.user": true,
+        "**/*.userprefs": true,
+        "**/*.unityproj": true,
+        "**/*.dll": true,
+        "**/*.exe": true,
+        "**/*.pdf": true,
+        "**/*.mid": true,
+        "**/*.midi": true,
+        "**/*.wav": true,
+        "**/*.gif": true,
+        "**/*.ico": true,
+        "**/*.jpg": true,
+        "**/*.jpeg": true,
+        "**/*.png": true,
+        "**/*.psd": true,
+        "**/*.tga": true,
+        "**/*.tif": true,
+        "**/*.tiff": true,
+        "**/*.3ds": true,
+        "**/*.3DS": true,
+        "**/*.fbx": true,
+        "**/*.FBX": true,
+        "**/*.lxo": true,
+        "**/*.LXO": true,
+        "**/*.ma": true,
+        "**/*.MA": true,
+        "**/*.obj": true,
+        "**/*.OBJ": true,
+        "**/*.asset": true,
+        "**/*.cubemap": true,
+        "**/*.flare": true,
+        "**/*.mat": true,
+        "**/*.meta": true,
+        "**/*.prefab": true,
+        "**/*.unity": true,
+        "build/": true,
+        "Build/": true,
+        "Library/": true,
+        "library/": true,
+        "obj/": true,
+        "Obj/": true,
+        "Logs/": true,
+        "logs/": true,
+        "ProjectSettings/": true,
+        "UserSettings/": true,
+        "temp/": true,
+        "Temp/": true
+    },
+    "files.associations": {
+        "*.asset": "yaml",
+        "*.meta": "yaml",
+        "*.prefab": "yaml",
+        "*.unity": "yaml",
+    },
+    "explorer.fileNesting.enabled": true,
+    "explorer.fileNesting.patterns": {
+        "*.sln": "*.csproj",
+    },
+    "dotnet.defaultSolution": "Digital-Logic-Sim.sln"
+}
diff --git a/Assets/Scripts/Description/Helpers/ChipTypeHelper.cs b/Assets/Scripts/Description/Helpers/ChipTypeHelper.cs
@@ -21,15 +21,22 @@ public static class ChipTypeHelper
 			{ ChipType.Split_4To1Bit, "4-1BIT" },
 			{ ChipType.Split_8To1Bit, "8-1BIT" },
 			{ ChipType.Split_8To4Bit, "8-4BIT" },
+			{ ChipType.Split_16To1Bit, "16-1BIT" },
+			{ ChipType.Split_16To4Bit, "16-4BIT" },
+			{ ChipType.Split_16To8Bit, "16-8BIT" },
 			{ ChipType.Merge_4To8Bit, "4-8BIT" },
 			{ ChipType.Merge_1To8Bit, "1-8BIT" },
 			{ ChipType.Merge_1To4Bit, "1-4BIT" },
+			{ ChipType.Merge_1To16Bit, "1-16BIT" },
+			{ ChipType.Merge_4To16Bit, "4-16BIT" },
+			{ ChipType.Merge_8To16Bit, "8-16BIT" },
 
 			// ---- Displays -----
 			{ ChipType.DisplayRGB, "RGB DISPLAY" },
 			{ ChipType.DisplayDot, "DOT DISPLAY" },
 			{ ChipType.SevenSegmentDisplay, "7-SEGMENT" },
 			{ ChipType.DisplayLED, "LED" },
+			{ ChipType.DisplayRGBLED, "RGBLED" },
 
 			// ---- Not really chips (but convenient to treat them as such anyway) ----
 
@@ -58,9 +65,9 @@ public static class ChipTypeHelper
 
 		public static bool IsBusType(ChipType type) => IsBusOriginType(type) || IsBusTerminusType(type);
 
-		public static bool IsBusOriginType(ChipType type) => type is ChipType.Bus_1Bit or ChipType.Bus_4Bit or ChipType.Bus_8Bit;
+		public static bool IsBusOriginType(ChipType type) => type is ChipType.Bus_1Bit or ChipType.Bus_4Bit or ChipType.Bus_8Bit or ChipType.Bus_16Bit;
 
-		public static bool IsBusTerminusType(ChipType type) => type is ChipType.BusTerminus_1Bit or ChipType.BusTerminus_4Bit or ChipType.BusTerminus_8Bit;
+		public static bool IsBusTerminusType(ChipType type) => type is ChipType.BusTerminus_1Bit or ChipType.BusTerminus_4Bit or ChipType.BusTerminus_8Bit or ChipType.BusTerminus_16Bit;
 
 		public static bool IsRomType(ChipType type) => type == ChipType.Rom_256x16;
 
diff --git a/Assets/Scripts/Description/Types/SubTypes/ChipTypes.cs b/Assets/Scripts/Description/Types/SubTypes/ChipTypes.cs
@@ -15,18 +15,27 @@ public enum ChipType
 		Rom_256x16,
 
 		// ---- Displays ----
+		//TODO: Make all displays use 0 to 255 for RGB, and make sure you duplicate them first so only if needed overide them, also make the RGBLED
 		SevenSegmentDisplay,
 		DisplayRGB,
 		DisplayDot,
 		DisplayLED,
+		DisplayRGBLED,
 
 		// ---- Merge / Split ----
+		//TODO: Make the 16 MERGES AND SPLITS atcually work
 		Merge_1To4Bit,
 		Merge_1To8Bit,
 		Merge_4To8Bit,
+		Merge_1To16Bit,
+		Merge_4To16Bit,
+		Merge_8To16Bit,
 		Split_4To1Bit,
 		Split_8To4Bit,
 		Split_8To1Bit,
+		Split_16To1Bit,
+		Split_16To4Bit,
+		Split_16To8Bit,
 
 		// ---- In / Out Pins ----
 		In_1Bit,
diff --git a/Assets/Scripts/Game/Elements/DevPinInstance.cs b/Assets/Scripts/Game/Elements/DevPinInstance.cs
@@ -42,6 +42,7 @@ public DevPinInstance(PinDescription pinDescription, bool isInput)
 				PinBitCount.Bit1 => new Vector2Int(1, 1),
 				PinBitCount.Bit4 => new Vector2Int(2, 2),
 				PinBitCount.Bit8 => new Vector2Int(4, 2),
+				PinBitCount.Bit16 => new Vector2Int(4, 4),
 				_ => throw new Exception("Bit count not implemented")
 			};
 			StateGridSize = BitCount switch
diff --git a/Assets/Scripts/Game/Elements/SubChipInstance.cs b/Assets/Scripts/Game/Elements/SubChipInstance.cs
@@ -304,7 +304,7 @@ public static float PinHeightFromBitCount(PinBitCount bitCount)
 				PinBitCount.Bit1 => DrawSettings.PinRadius * 2,
 				PinBitCount.Bit4 => DrawSettings.PinHeight4Bit,
 				PinBitCount.Bit8 => DrawSettings.PinHeight8Bit,
-				PinBitCount.Bit8 => DrawSettings.PinHeight16Bit,
+				PinBitCount.Bit16 => DrawSettings.PinHeight16Bit,
 				_ => throw new Exception("Bit count not implemented " + bitCount)
 			};
 		}
diff --git a/Assets/Scripts/Game/Project/BuiltinChipCreator.cs b/Assets/Scripts/Game/Project/BuiltinChipCreator.cs
@@ -36,15 +36,23 @@ public static ChipDescription[] CreateAllBuiltinChipDescriptions()
 				CreateBitConversionChip(ChipType.Split_4To1Bit, PinBitCount.Bit4, PinBitCount.Bit1, 1, 4),
 				CreateBitConversionChip(ChipType.Split_8To4Bit, PinBitCount.Bit8, PinBitCount.Bit4, 1, 2),
 				CreateBitConversionChip(ChipType.Split_8To1Bit, PinBitCount.Bit8, PinBitCount.Bit1, 1, 8),
+				CreateBitConversionChip(ChipType.Split_16To1Bit, PinBitCount.Bit16, PinBitCount.Bit1, 1, 8),
+				CreateBitConversionChip(ChipType.Split_16To4Bit, PinBitCount.Bit16, PinBitCount.Bit4, 1, 4),
+				CreateBitConversionChip(ChipType.Split_16To8Bit, PinBitCount.Bit16, PinBitCount.Bit8, 1, 2),
 
 				CreateBitConversionChip(ChipType.Merge_1To8Bit, PinBitCount.Bit1, PinBitCount.Bit8, 8, 1),
 				CreateBitConversionChip(ChipType.Merge_1To4Bit, PinBitCount.Bit1, PinBitCount.Bit4, 4, 1),
 				CreateBitConversionChip(ChipType.Merge_4To8Bit, PinBitCount.Bit4, PinBitCount.Bit8, 2, 1),
+				CreateBitConversionChip(ChipType.Merge_1To16Bit, PinBitCount.Bit1, PinBitCount.Bit16, 16, 1),
+				CreateBitConversionChip(ChipType.Merge_4To16Bit, PinBitCount.Bit4, PinBitCount.Bit16, 4, 1),
+				CreateBitConversionChip(ChipType.Merge_8To16Bit, PinBitCount.Bit8, PinBitCount.Bit16, 2, 1),
+
 				// ---- Displays ----
 				CreateDisplay7Seg(),
 				CreateDisplayRGB(),
 				CreateDisplayDot(),
 				CreateDisplayLED(),
+				CreateDisplayRGBLED(),
 				// ---- Bus ----
 				CreateBus(PinBitCount.Bit1),
 				CreateBusTerminus(PinBitCount.Bit1),
@@ -330,7 +338,36 @@ static ChipDescription CreateBus(PinBitCount bitCount)
 
 			return CreateBuiltinChipDescription(type, BusChipSize(bitCount), col, inputs, outputs, hideName: true);
 		}
+		static ChipDescription CreateDisplayRGBLED()
+		{
+			PinDescription[] inputPins =
+			{
+				CreatePinDescription("IN", 0),
+				CreatePinDescription("RED", 1, PinBitCount.Bit8),
+				CreatePinDescription("GREEN", 2, PinBitCount.Bit8),
+				CreatePinDescription("BLUE", 3, PinBitCount.Bit8),
+			};
+
+			float height = SubChipInstance.MinChipHeightForPins(inputPins, null);
+			float width = height;
+			float displayWidth = height - GridSize * 0.5f;
+
+			Color col = new(0.1f, 0.1f, 0.1f);
+			Vector2 size = new(width, height);
 
+
+			DisplayDescription[] displays =
+			{
+				new()
+				{
+					Position = Vector2.right * PinRadius / 3 * 0,
+					Scale = displayWidth,
+					SubChipID = -1
+				}
+			};
+
+			return CreateBuiltinChipDescription(ChipType.DisplayRGBLED, size, col, inputPins, null, displays, true);
+		}
 		static ChipDescription CreateDisplayLED()
 		{
 			PinDescription[] inputPins =
diff --git a/Assets/Scripts/Game/Project/BuiltinCollectionCreator.cs b/Assets/Scripts/Game/Project/BuiltinCollectionCreator.cs
@@ -39,9 +39,15 @@ public static ChipCollection[] CreateDefaultChipCollections()
 					ChipType.Merge_1To4Bit,
 					ChipType.Merge_1To8Bit,
 					ChipType.Merge_4To8Bit,
+					ChipType.Merge_1To16Bit,
+					ChipType.Merge_4To16Bit,
+					ChipType.Merge_8To16Bit,
 					ChipType.Split_4To1Bit,
 					ChipType.Split_8To4Bit,
-					ChipType.Split_8To1Bit
+					ChipType.Split_8To1Bit,
+					ChipType.Split_16To1Bit,
+					ChipType.Split_16To4Bit,
+					ChipType.Split_16To8Bit
 				),
 				CreateChipCollection("BUS",
 					ChipType.Bus_1Bit,
@@ -53,7 +59,8 @@ public static ChipCollection[] CreateDefaultChipCollections()
 					ChipType.SevenSegmentDisplay,
 					ChipType.DisplayDot,
 					ChipType.DisplayRGB,
-					ChipType.DisplayLED
+					ChipType.DisplayLED,
+					ChipType.DisplayRGBLED
 				),
 				CreateChipCollection("MEMORY",
 					ChipType.Rom_256x16
diff --git a/Assets/Scripts/Graphics/World/DevSceneDrawer.cs b/Assets/Scripts/Graphics/World/DevSceneDrawer.cs
@@ -437,6 +437,13 @@ public static Bounds2D DrawDisplay(DisplayInstance display, Vector2 posParent, f
 				bounds = DrawDisplay_DisplayLED(posWorld, scaleWorld, isOn);
 			}
 
+			else if (display.DisplayType == ChipType.DisplayRGBLED)
+			{
+				bool simActive = sim != null; 
+				bool isOn = simActive && sim.InputPins[0].FirstBitHigh;
+				bounds = DrawDisplay_DisplayRGBLED(posWorld, scaleWorld, isOn, sim);
+			}
+
 			display.LastDrawBounds = bounds;
 			return bounds;
 		}
@@ -566,6 +573,32 @@ public static Bounds2D DrawDisplay_SevenSegment(Vector2 centre, float scale, int
 
 			return Bounds2D.CreateFromCentreAndSize(centre, boundsSize);
 		}
+		public static Bounds2D DrawDisplay_DisplayRGBLED(Vector2 centre, float scale, bool isOn, SimChip sim)
+		{
+			const float pixelSizeT = 0.975f;
+			float pixelSize = scale;
+
+			// Draw background
+			Draw.Quad(centre, Vector2.one * scale, Color.black);
+			Vector2 pixelDrawSize = Vector2.one * (pixelSize * pixelSizeT);
+			Color onColor = ActiveTheme.DisplayLEDCols[1]; // default fallback
+			if (sim == null)
+			{
+				onColor = Color.white;
+			}
+			else
+			{
+				onColor = new Color(
+						Unpack8BitColChannel(sim.InternalState[0]),
+						Unpack8BitColChannel(sim.InternalState[1]),
+						Unpack8BitColChannel(sim.InternalState[2]),
+						1
+					);
+			}
+			Color col = isOn ? onColor : ActiveTheme.DisplayLEDCols[0];
+			Draw.Quad(centre, pixelDrawSize, col);
+			return Bounds2D.CreateFromCentreAndSize(centre, Vector2.one * scale);
+		}
 
 		public static Bounds2D DrawDisplay_DisplayLED(Vector2 centre, float scale, bool isOn)
 		{
@@ -581,6 +614,11 @@ public static Bounds2D DrawDisplay_DisplayLED(Vector2 centre, float scale, bool
 			return Bounds2D.CreateFromCentreAndSize(centre, Vector2.one * scale);
 		}
 
+		static float Unpack8BitColChannel(uint raw)
+		{
+			return (raw & 0b11111111) / 255f;
+		}
+
 		public static void DrawDevPin(DevPinInstance devPin)
 		{
 			if (devPin.BitCount == PinBitCount.Bit1)
diff --git a/Assets/Scripts/Simulation/SimChip.cs b/Assets/Scripts/Simulation/SimChip.cs
@@ -60,6 +60,10 @@ public SimChip(ChipDescription desc, int id, uint[] internalState, SimChip[] sub
 				// first 256 bits = display buffer, next 256 bits = back buffer, last bit = clock state (to allow edge-trigger behaviour)
 				InternalState = new uint[addressSize_8Bit * 2 + 1];
 			}
+			else if (ChipType is ChipType.DisplayRGBLED)
+			{
+				InternalState = new uint[3];
+			}
 			else if (ChipType is ChipType.DisplayDot)
 			{
 				// first 256 bits = display buffer, next 256 bits = back buffer, last bit = clock state (to allow edge-trigger behaviour)
diff --git a/Assets/Scripts/Simulation/Simulator.cs b/Assets/Scripts/Simulation/Simulator.cs
@@ -328,6 +328,16 @@ static void ProcessBuiltinChip(SimChip chip)
 					chip.OutputPins[0].State = isHeld ? PinState.LogicHigh : PinState.LogicLow;
 					break;
 				}
+				case ChipType.DisplayRGBLED:
+				{
+					uint redPin = chip.InputPins[1].State;
+					uint greenPin = chip.InputPins[2].State;
+					uint bluePin = chip.InputPins[3].State;
+					chip.InternalState[0] = redPin;
+					chip.InternalState[1] = greenPin;
+					chip.InternalState[2] = bluePin;
+					break;
+				}
 				case ChipType.DisplayRGB:
 				{
 					const uint addressSpace = 256;
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.0.46f1
-m_EditorVersionWithRevision: 6000.0.46f1 (fb93bc360d3a)
+m_EditorVersion: 6000.0.47f1
+m_EditorVersionWithRevision: 6000.0.47f1 (2ad1ed33fd3b)
diff --git a/TestData/Projects/MainTest/ProjectDescription.json b/TestData/Projects/MainTest/ProjectDescription.json
@@ -2,8 +2,8 @@
   "ProjectName": "MainTest",
   "DLSVersion_LastSaved": "2.1.4",
   "DLSVersion_EarliestCompatible": "2.0.0",
-  "CreationTime": "2025-03-14T18:23:30.404+01:00",
-  "LastSaveTime": "2025-04-25T17:44:29.842+02:00",
+  "CreationTime": "2025-03-14T22:53:30.404+05:30",
+  "LastSaveTime": "2025-04-27T10:46:43.427+05:30",
   "Prefs_MainPinNamesDisplayMode": 2,
   "Prefs_ChipPinNamesDisplayMode": 1,
   "Prefs_GridDisplayMode": 1,
@@ -111,7 +111,7 @@
     },
     {
       "Chips":["7-SEGMENT","DECIMAL-4","DECIMAL-8","DOT DISPLAY","RGB DISPLAY","LED"],
-      "IsToggledOpen":false,
+      "IsToggledOpen":true,
       "Name":"DISPLAY"
     },
     {
@@ -135,7 +135,7 @@
       "Name":"TEST"
     },
     {
-      "Chips":["PULSE","TEST MergeSplit"],
+      "Chips":["PULSE","TEST MergeSplit","IN-16","OUT-16","16-1BIT","16-4BIT","16-8BIT","1-16BIT","4-16BIT","8-16BIT","RGBLED","BUS-16","#"],
       "IsToggledOpen":true,
       "Name":"OTHER"
     }
diff --git a/TestData/Projects/l/Chips/16.json b/TestData/Projects/l/Chips/16.json
diff --git a/TestData/Projects/l/ProjectDescription.json b/TestData/Projects/l/ProjectDescription.json
diff --git a/TestData/Projects/te/ProjectDescription.json b/TestData/Projects/te/ProjectDescription.json
diff --git a/TestData/Projects/test/ProjectDescription.json b/TestData/Projects/test/ProjectDescription.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "recommendations": [
 +      "visualstudiotoolsforunity.vstuc"
 +    ]
 +}
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ public static float PinHeightFromBitCount(PinBitCount bitCount)`
`304`	`304`	`PinBitCount.Bit1 => DrawSettings.PinRadius * 2,`
`305`	`305`	`PinBitCount.Bit4 => DrawSettings.PinHeight4Bit,`
`306`	`306`	`PinBitCount.Bit8 => DrawSettings.PinHeight8Bit,`
`307`		`- PinBitCount.Bit8 => DrawSettings.PinHeight16Bit,`
	`307`	`+ PinBitCount.Bit16 => DrawSettings.PinHeight16Bit,`
`308`	`308`	`_ => throw new Exception("Bit count not implemented " + bitCount)`
`309`	`309`	`};`
`310`	`310`	`}`