diff options
| author | Sjory <Mgj32000@gmail.com> | 2025-02-13 13:51:44 +0100 |
|---|---|---|
| committer | Sjory <Mgj32000@gmail.com> | 2025-02-13 13:51:44 +0100 |
| commit | fe57c288077ec03d78fdf4445b8fdcb2b984f17a (patch) | |
| tree | 94b05e85ea3d11f4cdac4c25bd61b63bffa826ad | |
| parent | 7bfb8277f8d47d6528f598439c909e55722d7de2 (diff) | |
SerialCommunication
update serial comm for PI4 and added Arduino/ESP32 controller code to get and parse serial code for moving the carousel and runing the pump.
need to add a command for pouring the alcohol after moving posiiton
21 files changed, 210 insertions, 133 deletions
diff --git a/Arduino2024/NewMotor/NewMotor.ino b/Arduino2024/NewMotor/NewMotor.ino index 794dd00..48745fa 100644 --- a/Arduino2024/NewMotor/NewMotor.ino +++ b/Arduino2024/NewMotor/NewMotor.ino @@ -14,7 +14,7 @@ long pos5 = 3312; long pos6 = 4140; long pos7 = 4968; long pos8 = 5796; -long pos9 = 6624; +long pos9 = 6624; long pos10 = 7452; int stepsToMove = 828; @@ -24,7 +24,8 @@ MoToStepper stepper( 400, STEPDIR ); void setup() { - Serial.begin(9600); + Serial.begin(115200); + Serial.println("ESP32 is ready"); stepper.attach( stepPin, dirPin ); stepper.setSpeedSteps(20000); // = 75 steps/second (steps in 10 seconds) @@ -34,7 +35,51 @@ void setup() void loop() { - stepper.moveTo(pos9); + if (Serial.available()>0){ + String command = Serial.readStringUntil('/n'); //read communication until next line + command.trim();//removes any spaces before and after + + int firstSpaceIndex = command.indexOf(' ');//find the first space + if(firstSpaceIndex != -1) + { + String commandName = command.substring(0, firstSpaceIndex); + + int secondSpaceIndex = command.indexOf(' ', firstSpaceIndex + 1); + if(secondSpaceIndex != -1){ + int pumpNumber = command.substring(firstSpaceIndex + 1, secondSpaceIndex).toInt(); + int pumpValue = command.substring(secondSpaceIndex + 1).toInt(); + + if(commandName == "Pump") + { + Pump(pumpNumber, pumpValue); + } + } else{ + int positionValue = command.substring(firstSpaceIndex + 1).toInt(); + + if(commandName == "Position"){ + GoToPosition(positionValue); + } + } + } + } + +} + +void GoToPosition(int value){ + //execute code + Serial.print("Position command executed with value: "); + Serial.println(value); +} +void Pump(int number,int value){ + //Execute code + Serial.print("Pump: "); + Serial.println(number); + Serial.println(" value: "); + Serial.println(value); + +} +/* +stepper.moveTo(pos9); while(stepper.distanceToGo() > 0); Serial.write("current position :"); delay(stepDelay); @@ -48,5 +93,4 @@ void loop() while(stepper.distanceToGo() > 0); delay(stepDelay); - -}
\ No newline at end of file +*/
\ No newline at end of file diff --git a/Website/.vs/ProjectEvaluation/website.metadata.v9.bin b/Website/.vs/ProjectEvaluation/website.metadata.v9.bin Binary files differindex 4146105..2ffda85 100644 --- a/Website/.vs/ProjectEvaluation/website.metadata.v9.bin +++ b/Website/.vs/ProjectEvaluation/website.metadata.v9.bin diff --git a/Website/.vs/ProjectEvaluation/website.projects.v9.bin b/Website/.vs/ProjectEvaluation/website.projects.v9.bin Binary files differindex 02fb1eb..b23787d 100644 --- a/Website/.vs/ProjectEvaluation/website.projects.v9.bin +++ b/Website/.vs/ProjectEvaluation/website.projects.v9.bin diff --git a/Website/.vs/ProjectEvaluation/website.strings.v9.bin b/Website/.vs/ProjectEvaluation/website.strings.v9.bin Binary files differindex cee6a02..1ce1428 100644 --- a/Website/.vs/ProjectEvaluation/website.strings.v9.bin +++ b/Website/.vs/ProjectEvaluation/website.strings.v9.bin diff --git a/Website/.vs/Website/CopilotIndices/17.12.31.40377/CodeChunks.db b/Website/.vs/Website/CopilotIndices/17.12.31.40377/CodeChunks.db Binary files differindex bbfb471..1c7abc5 100644 --- a/Website/.vs/Website/CopilotIndices/17.12.31.40377/CodeChunks.db +++ b/Website/.vs/Website/CopilotIndices/17.12.31.40377/CodeChunks.db diff --git a/Website/.vs/Website/CopilotIndices/17.12.31.40377/SemanticSymbols.db-shm b/Website/.vs/Website/CopilotIndices/17.12.31.40377/SemanticSymbols.db-shm Binary files differindex 6be74d4..c4614d3 100644 --- a/Website/.vs/Website/CopilotIndices/17.12.31.40377/SemanticSymbols.db-shm +++ b/Website/.vs/Website/CopilotIndices/17.12.31.40377/SemanticSymbols.db-shm diff --git a/Website/.vs/Website/CopilotIndices/17.12.31.40377/SemanticSymbols.db-wal b/Website/.vs/Website/CopilotIndices/17.12.31.40377/SemanticSymbols.db-wal Binary files differindex 9bcc46c..6143d5a 100644 --- a/Website/.vs/Website/CopilotIndices/17.12.31.40377/SemanticSymbols.db-wal +++ b/Website/.vs/Website/CopilotIndices/17.12.31.40377/SemanticSymbols.db-wal diff --git a/Website/.vs/Website/DesignTimeBuild/.dtbcache.v2 b/Website/.vs/Website/DesignTimeBuild/.dtbcache.v2 Binary files differindex b1dabda..bdb321f 100644 --- a/Website/.vs/Website/DesignTimeBuild/.dtbcache.v2 +++ b/Website/.vs/Website/DesignTimeBuild/.dtbcache.v2 diff --git a/Website/.vs/Website/FileContentIndex/1debd591-654d-4d32-96bd-000c11bfcc28.vsidx b/Website/.vs/Website/FileContentIndex/1debd591-654d-4d32-96bd-000c11bfcc28.vsidx Binary files differdeleted file mode 100644 index 70aef67..0000000 --- a/Website/.vs/Website/FileContentIndex/1debd591-654d-4d32-96bd-000c11bfcc28.vsidx +++ /dev/null diff --git a/Website/.vs/Website/FileContentIndex/18607ba3-8542-47ab-a68d-91a803a21855.vsidx b/Website/.vs/Website/FileContentIndex/42864a1a-61a2-4608-a77f-dd91dc64e789.vsidx Binary files differindex 70aef67..70aef67 100644 --- a/Website/.vs/Website/FileContentIndex/18607ba3-8542-47ab-a68d-91a803a21855.vsidx +++ b/Website/.vs/Website/FileContentIndex/42864a1a-61a2-4608-a77f-dd91dc64e789.vsidx diff --git a/Website/.vs/Website/FileContentIndex/4b65fab3-dabb-4096-a0d2-64c47ffdc2f3.vsidx b/Website/.vs/Website/FileContentIndex/4b65fab3-dabb-4096-a0d2-64c47ffdc2f3.vsidx Binary files differnew file mode 100644 index 0000000..1bc964c --- /dev/null +++ b/Website/.vs/Website/FileContentIndex/4b65fab3-dabb-4096-a0d2-64c47ffdc2f3.vsidx diff --git a/Website/.vs/Website/FileContentIndex/926f782b-6220-4b62-ad35-5d437f3c379e.vsidx b/Website/.vs/Website/FileContentIndex/bdbd10bb-b3cc-4375-85ea-74a5a2ee89f9.vsidx Binary files differindex 13a8de3..031ccab 100644 --- a/Website/.vs/Website/FileContentIndex/926f782b-6220-4b62-ad35-5d437f3c379e.vsidx +++ b/Website/.vs/Website/FileContentIndex/bdbd10bb-b3cc-4375-85ea-74a5a2ee89f9.vsidx diff --git a/Website/.vs/Website/FileContentIndex/feb41ca5-c9ff-4cde-b62e-e88c7ed6d555.vsidx b/Website/.vs/Website/FileContentIndex/c20857f9-8a19-432a-9662-d9d2e20fec73.vsidx Binary files differindex cb07b25..cb07b25 100644 --- a/Website/.vs/Website/FileContentIndex/feb41ca5-c9ff-4cde-b62e-e88c7ed6d555.vsidx +++ b/Website/.vs/Website/FileContentIndex/c20857f9-8a19-432a-9662-d9d2e20fec73.vsidx diff --git a/Website/.vs/Website/copilot-chat/cf23d55a/sessions/99194014-349d-4776-850e-b365b3c58e45 b/Website/.vs/Website/copilot-chat/cf23d55a/sessions/99194014-349d-4776-850e-b365b3c58e45 Binary files differindex d2cc25e..f5e9ff8 100644 --- a/Website/.vs/Website/copilot-chat/cf23d55a/sessions/99194014-349d-4776-850e-b365b3c58e45 +++ b/Website/.vs/Website/copilot-chat/cf23d55a/sessions/99194014-349d-4776-850e-b365b3c58e45 diff --git a/Website/.vs/Website/v17/.futdcache.v2 b/Website/.vs/Website/v17/.futdcache.v2 Binary files differindex 8ec162c..b2c5f88 100644 --- a/Website/.vs/Website/v17/.futdcache.v2 +++ b/Website/.vs/Website/v17/.futdcache.v2 diff --git a/Website/.vs/Website/v17/.suo b/Website/.vs/Website/v17/.suo Binary files differindex 83a4c3e..6304c2c 100644 --- a/Website/.vs/Website/v17/.suo +++ b/Website/.vs/Website/v17/.suo diff --git a/Website/.vs/Website/v17/DocumentLayout.backup.json b/Website/.vs/Website/v17/DocumentLayout.backup.json index 05ddfb9..177a0d0 100644 --- a/Website/.vs/Website/v17/DocumentLayout.backup.json +++ b/Website/.vs/Website/v17/DocumentLayout.backup.json @@ -3,14 +3,18 @@ "WorkspaceRootPath": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}", - "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}" + "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\services\\carouselcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\services\\carouselcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\services\\controllerservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\services\\controllerservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { + "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}", + "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}" + }, + { "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\services\\drinkdataservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\services\\drinkdataservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -94,20 +98,32 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 3, + "SelectedChildIndex": 0, "Children": [ { "$type": "Document", - "DocumentIndex": 3, - "Title": "Website", + "DocumentIndex": 0, + "Title": "CarouselController.cs", + "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Services\\CarouselController.cs", + "RelativeDocumentMoniker": "Website\\Services\\CarouselController.cs", + "ToolTip": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Services\\CarouselController.cs", + "RelativeToolTip": "Website\\Services\\CarouselController.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABoAAAAtAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-13T12:38:44.062Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Website.csproj", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Website.csproj", "RelativeDocumentMoniker": "Website\\Website.csproj", "ToolTip": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Website.csproj", "RelativeToolTip": "Website\\Website.csproj", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2025-02-13T11:37:54.291Z", - "EditorCaption": "" + "WhenOpened": "2025-02-13T11:37:54.291Z" }, { "$type": "Document", @@ -117,14 +133,14 @@ "RelativeDocumentMoniker": "Website\\Services\\ControllerService.cs", "ToolTip": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Services\\ControllerService.cs", "RelativeToolTip": "Website\\Services\\ControllerService.cs", - "ViewState": "AgIAAAMAAAAAAAAAAAAAADAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAsAAAAAAAAAAAAQwDAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-13T11:26:13.583Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 11, "Title": "Weather.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Pages\\Weather.razor", "RelativeDocumentMoniker": "Website\\Components\\Pages\\Weather.razor", @@ -132,12 +148,11 @@ "RelativeToolTip": "Website\\Components\\Pages\\Weather.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAACoAAAAFAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:16.776Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.776Z" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 2, "Title": "Home.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Pages\\Home.razor", "RelativeDocumentMoniker": "Website\\Components\\Pages\\Home.razor", @@ -150,7 +165,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 12, "Title": "Alcohols.json", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\wwwroot\\data\\Alcohols.json", "RelativeDocumentMoniker": "Website\\wwwroot\\data\\Alcohols.json", @@ -158,12 +173,11 @@ "RelativeToolTip": "Website\\wwwroot\\data\\Alcohols.json", "ViewState": "AgIAAAAAAAAAAAAAAAAAADQAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-01-12T08:25:16.849Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.849Z" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 3, "Title": "DrinkDataService.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Services\\DrinkDataService.cs", "RelativeDocumentMoniker": "Website\\Services\\DrinkDataService.cs", @@ -171,12 +185,11 @@ "RelativeToolTip": "Website\\Services\\DrinkDataService.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABYAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:16.861Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.861Z" }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 13, "Title": "MainLayout.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Layout\\MainLayout.razor", "RelativeDocumentMoniker": "Website\\Components\\Layout\\MainLayout.razor", @@ -184,12 +197,11 @@ "RelativeToolTip": "Website\\Components\\Layout\\MainLayout.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:16.868Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.868Z" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 6, "Title": "Drinks.json", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\wwwroot\\data\\Drinks.json", "RelativeDocumentMoniker": "Website\\wwwroot\\data\\Drinks.json", @@ -197,12 +209,11 @@ "RelativeToolTip": "Website\\wwwroot\\data\\Drinks.json", "ViewState": "AgIAAAAAAAAAAAAAAAAAAFcAAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-01-12T08:25:16.874Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.874Z" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 10, "Title": "Liquids.json", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\wwwroot\\data\\Liquids.json", "RelativeDocumentMoniker": "Website\\wwwroot\\data\\Liquids.json", @@ -210,12 +221,11 @@ "RelativeToolTip": "Website\\wwwroot\\data\\Liquids.json", "ViewState": "AgIAAAAAAAAAAAAAAAAYwCkAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-01-12T08:25:16.883Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.883Z" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 5, "Title": "Program.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Program.cs", "RelativeDocumentMoniker": "Website\\Program.cs", @@ -223,12 +233,11 @@ "RelativeToolTip": "Website\\Program.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:16.89Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.89Z" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 8, "Title": "Alcohol.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Models\\Alcohol.cs", "RelativeDocumentMoniker": "Website\\Models\\Alcohol.cs", @@ -236,12 +245,11 @@ "RelativeToolTip": "Website\\Models\\Alcohol.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAkAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:16.897Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.897Z" }, { "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 19, "Title": "Website.Client.csproj", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website.Client\\Website.Client.csproj", "RelativeDocumentMoniker": "Website.Client\\Website.Client.csproj", @@ -249,12 +257,11 @@ "RelativeToolTip": "Website.Client\\Website.Client.csproj", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2025-01-12T08:25:16.909Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.909Z" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 7, "Title": "Drink.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Models\\Drink.cs", "RelativeDocumentMoniker": "Website\\Models\\Drink.cs", @@ -262,12 +269,11 @@ "RelativeToolTip": "Website\\Models\\Drink.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:17.029Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.029Z" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 9, "Title": "Liquid.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Models\\Liquid.cs", "RelativeDocumentMoniker": "Website\\Models\\Liquid.cs", @@ -275,12 +281,11 @@ "RelativeToolTip": "Website\\Models\\Liquid.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:17.04Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.04Z" }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 18, "Title": "Routes.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Routes.razor", "RelativeDocumentMoniker": "Website\\Components\\Routes.razor", @@ -288,12 +293,11 @@ "RelativeToolTip": "Website\\Components\\Routes.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.046Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.046Z" }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 17, "Title": "App.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\App.razor", "RelativeDocumentMoniker": "Website\\Components\\App.razor", @@ -301,12 +305,11 @@ "RelativeToolTip": "Website\\Components\\App.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.054Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.054Z" }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 16, "Title": "_Imports.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\_Imports.razor", "RelativeDocumentMoniker": "Website\\Components\\_Imports.razor", @@ -314,12 +317,11 @@ "RelativeToolTip": "Website\\Components\\_Imports.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.061Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.061Z" }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 15, "Title": "Error.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Pages\\Error.razor", "RelativeDocumentMoniker": "Website\\Components\\Pages\\Error.razor", @@ -327,12 +329,11 @@ "RelativeToolTip": "Website\\Components\\Pages\\Error.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.069Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.069Z" }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 14, "Title": "NavMenu.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Layout\\NavMenu.razor", "RelativeDocumentMoniker": "Website\\Components\\Layout\\NavMenu.razor", @@ -340,12 +341,11 @@ "RelativeToolTip": "Website\\Components\\Layout\\NavMenu.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.076Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.076Z" }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 20, "Title": "Program.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website.Client\\Program.cs", "RelativeDocumentMoniker": "Website.Client\\Program.cs", @@ -353,12 +353,11 @@ "RelativeToolTip": "Website.Client\\Program.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:17.085Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.085Z" }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 21, "Title": "launchSettings.json", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Properties\\launchSettings.json", "RelativeDocumentMoniker": "Website\\Properties\\launchSettings.json", @@ -366,8 +365,7 @@ "RelativeToolTip": "Website\\Properties\\launchSettings.json", "ViewState": "AgIAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-01-12T08:25:17.092Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.092Z" } ] } diff --git a/Website/.vs/Website/v17/DocumentLayout.json b/Website/.vs/Website/v17/DocumentLayout.json index 05ddfb9..177a0d0 100644 --- a/Website/.vs/Website/v17/DocumentLayout.json +++ b/Website/.vs/Website/v17/DocumentLayout.json @@ -3,14 +3,18 @@ "WorkspaceRootPath": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}", - "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}" + "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\services\\carouselcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\services\\carouselcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\services\\controllerservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\services\\controllerservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { + "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}", + "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\components\\pages\\home.razor||{40D31677-CBC0-4297-A9EF-89D907823A98}" + }, + { "AbsoluteMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|c:\\users\\mgj32\\documents\\github\\drinksmachine\\website\\website\\services\\drinkdataservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{084F13A9-0DD5-4770-9F93-5F9A7F2F8575}|Website\\Website.csproj|solutionrelative:website\\services\\drinkdataservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -94,20 +98,32 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 3, + "SelectedChildIndex": 0, "Children": [ { "$type": "Document", - "DocumentIndex": 3, - "Title": "Website", + "DocumentIndex": 0, + "Title": "CarouselController.cs", + "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Services\\CarouselController.cs", + "RelativeDocumentMoniker": "Website\\Services\\CarouselController.cs", + "ToolTip": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Services\\CarouselController.cs", + "RelativeToolTip": "Website\\Services\\CarouselController.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAABoAAAAtAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-13T12:38:44.062Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Website.csproj", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Website.csproj", "RelativeDocumentMoniker": "Website\\Website.csproj", "ToolTip": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Website.csproj", "RelativeToolTip": "Website\\Website.csproj", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2025-02-13T11:37:54.291Z", - "EditorCaption": "" + "WhenOpened": "2025-02-13T11:37:54.291Z" }, { "$type": "Document", @@ -117,14 +133,14 @@ "RelativeDocumentMoniker": "Website\\Services\\ControllerService.cs", "ToolTip": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Services\\ControllerService.cs", "RelativeToolTip": "Website\\Services\\ControllerService.cs", - "ViewState": "AgIAAAMAAAAAAAAAAAAAADAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAsAAAAAAAAAAAAQwDAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-13T11:26:13.583Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 11, "Title": "Weather.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Pages\\Weather.razor", "RelativeDocumentMoniker": "Website\\Components\\Pages\\Weather.razor", @@ -132,12 +148,11 @@ "RelativeToolTip": "Website\\Components\\Pages\\Weather.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAACoAAAAFAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:16.776Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.776Z" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 2, "Title": "Home.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Pages\\Home.razor", "RelativeDocumentMoniker": "Website\\Components\\Pages\\Home.razor", @@ -150,7 +165,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 12, "Title": "Alcohols.json", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\wwwroot\\data\\Alcohols.json", "RelativeDocumentMoniker": "Website\\wwwroot\\data\\Alcohols.json", @@ -158,12 +173,11 @@ "RelativeToolTip": "Website\\wwwroot\\data\\Alcohols.json", "ViewState": "AgIAAAAAAAAAAAAAAAAAADQAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-01-12T08:25:16.849Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.849Z" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 3, "Title": "DrinkDataService.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Services\\DrinkDataService.cs", "RelativeDocumentMoniker": "Website\\Services\\DrinkDataService.cs", @@ -171,12 +185,11 @@ "RelativeToolTip": "Website\\Services\\DrinkDataService.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABYAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:16.861Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.861Z" }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 13, "Title": "MainLayout.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Layout\\MainLayout.razor", "RelativeDocumentMoniker": "Website\\Components\\Layout\\MainLayout.razor", @@ -184,12 +197,11 @@ "RelativeToolTip": "Website\\Components\\Layout\\MainLayout.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:16.868Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.868Z" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 6, "Title": "Drinks.json", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\wwwroot\\data\\Drinks.json", "RelativeDocumentMoniker": "Website\\wwwroot\\data\\Drinks.json", @@ -197,12 +209,11 @@ "RelativeToolTip": "Website\\wwwroot\\data\\Drinks.json", "ViewState": "AgIAAAAAAAAAAAAAAAAAAFcAAAAXAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-01-12T08:25:16.874Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.874Z" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 10, "Title": "Liquids.json", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\wwwroot\\data\\Liquids.json", "RelativeDocumentMoniker": "Website\\wwwroot\\data\\Liquids.json", @@ -210,12 +221,11 @@ "RelativeToolTip": "Website\\wwwroot\\data\\Liquids.json", "ViewState": "AgIAAAAAAAAAAAAAAAAYwCkAAAABAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-01-12T08:25:16.883Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.883Z" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 5, "Title": "Program.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Program.cs", "RelativeDocumentMoniker": "Website\\Program.cs", @@ -223,12 +233,11 @@ "RelativeToolTip": "Website\\Program.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:16.89Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.89Z" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 8, "Title": "Alcohol.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Models\\Alcohol.cs", "RelativeDocumentMoniker": "Website\\Models\\Alcohol.cs", @@ -236,12 +245,11 @@ "RelativeToolTip": "Website\\Models\\Alcohol.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAAkAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:16.897Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.897Z" }, { "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 19, "Title": "Website.Client.csproj", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website.Client\\Website.Client.csproj", "RelativeDocumentMoniker": "Website.Client\\Website.Client.csproj", @@ -249,12 +257,11 @@ "RelativeToolTip": "Website.Client\\Website.Client.csproj", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2025-01-12T08:25:16.909Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:16.909Z" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 7, "Title": "Drink.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Models\\Drink.cs", "RelativeDocumentMoniker": "Website\\Models\\Drink.cs", @@ -262,12 +269,11 @@ "RelativeToolTip": "Website\\Models\\Drink.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:17.029Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.029Z" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 9, "Title": "Liquid.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Models\\Liquid.cs", "RelativeDocumentMoniker": "Website\\Models\\Liquid.cs", @@ -275,12 +281,11 @@ "RelativeToolTip": "Website\\Models\\Liquid.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:17.04Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.04Z" }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 18, "Title": "Routes.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Routes.razor", "RelativeDocumentMoniker": "Website\\Components\\Routes.razor", @@ -288,12 +293,11 @@ "RelativeToolTip": "Website\\Components\\Routes.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.046Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.046Z" }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 17, "Title": "App.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\App.razor", "RelativeDocumentMoniker": "Website\\Components\\App.razor", @@ -301,12 +305,11 @@ "RelativeToolTip": "Website\\Components\\App.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.054Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.054Z" }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 16, "Title": "_Imports.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\_Imports.razor", "RelativeDocumentMoniker": "Website\\Components\\_Imports.razor", @@ -314,12 +317,11 @@ "RelativeToolTip": "Website\\Components\\_Imports.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.061Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.061Z" }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 15, "Title": "Error.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Pages\\Error.razor", "RelativeDocumentMoniker": "Website\\Components\\Pages\\Error.razor", @@ -327,12 +329,11 @@ "RelativeToolTip": "Website\\Components\\Pages\\Error.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.069Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.069Z" }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 14, "Title": "NavMenu.razor", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Components\\Layout\\NavMenu.razor", "RelativeDocumentMoniker": "Website\\Components\\Layout\\NavMenu.razor", @@ -340,12 +341,11 @@ "RelativeToolTip": "Website\\Components\\Layout\\NavMenu.razor", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000759|", - "WhenOpened": "2025-01-12T08:25:17.076Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.076Z" }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 20, "Title": "Program.cs", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website.Client\\Program.cs", "RelativeDocumentMoniker": "Website.Client\\Program.cs", @@ -353,12 +353,11 @@ "RelativeToolTip": "Website.Client\\Program.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-12T08:25:17.085Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.085Z" }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 21, "Title": "launchSettings.json", "DocumentMoniker": "C:\\Users\\mgj32\\Documents\\GitHub\\DrinksMachine\\Website\\Website\\Properties\\launchSettings.json", "RelativeDocumentMoniker": "Website\\Properties\\launchSettings.json", @@ -366,8 +365,7 @@ "RelativeToolTip": "Website\\Properties\\launchSettings.json", "ViewState": "AgIAAAAAAAAAAAAAAAAAAB4AAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-01-12T08:25:17.092Z", - "EditorCaption": "" + "WhenOpened": "2025-01-12T08:25:17.092Z" } ] } diff --git a/Website/Website/Services/CarouselController.cs b/Website/Website/Services/CarouselController.cs new file mode 100644 index 0000000..318fee4 --- /dev/null +++ b/Website/Website/Services/CarouselController.cs @@ -0,0 +1,37 @@ +namespace Website.Services +{ + public class CarouselController + { + int[] carouselPositions = new int[10] + { + 0, //Position 1 + 828, //Position 2 + 1656, //Position 3 + 2484, //Position 4 + 3312, //Position 5 + 4140, //Position 6 + 4968, //Position 7 + 5796, //Position 8 + 6624, //Position 9 + 7452 //Position 10 + }; + + private int carouselCurrentPosition = 0; + private ControllerService controllerService; + + public CarouselController(ControllerService controllerService) + { + this.controllerService = controllerService; + } + + public void MoveCarousel(int position) + { + //controllerService.sendCommand("carousel 0"); + if (position >= 0 && position < carouselPositions.Length) + { + // Move the carousel to the specified position + carouselCurrentPosition = position; + } + } + } +} diff --git a/Website/Website/obj/Debug/net8.0/Website.AssemblyInfo.cs b/Website/Website/obj/Debug/net8.0/Website.AssemblyInfo.cs index 07dd6ba..a550409 100644 --- a/Website/Website/obj/Debug/net8.0/Website.AssemblyInfo.cs +++ b/Website/Website/obj/Debug/net8.0/Website.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Website")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+0a35d88b1bb9afe63e5dc49e226fb7a2898fe4d9")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7bfb8277f8d47d6528f598439c909e55722d7de2")] [assembly: System.Reflection.AssemblyProductAttribute("Website")] [assembly: System.Reflection.AssemblyTitleAttribute("Website")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Website/Website/obj/Debug/net8.0/Website.AssemblyInfoInputs.cache b/Website/Website/obj/Debug/net8.0/Website.AssemblyInfoInputs.cache index 9556532..5777c67 100644 --- a/Website/Website/obj/Debug/net8.0/Website.AssemblyInfoInputs.cache +++ b/Website/Website/obj/Debug/net8.0/Website.AssemblyInfoInputs.cache @@ -1 +1 @@ -47c16b4f47236c91abb750271a3e86987e857e77cec3ee8327039b892a0bfd03 +338e82e25aee43e7329becb91cb309cbfa3f626fd97a828a44fb4d7471dca94a |