#17 API Work

Tried to add the camera and buzzer to the api, but it didn't like something
David032 · Nov 26, 2023 · 8c1dbed · 8c1dbed
1 parent 3897ea9
commit 8c1dbed
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 8 deletions.
diff --git a/ServoSkull.sln b/ServoSkull.sln
@@ -31,6 +31,7 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skullOS.API", "skullOS.API\skullOS.API.csproj", "{5E1EC385-4B61-4E8C-82C7-46695A33AC72}"
 	ProjectSection(ProjectDependencies) = postProject
 		{464B162B-62FC-49CC-A6AB-72DBE959DD8C} = {464B162B-62FC-49CC-A6AB-72DBE959DD8C}
+		{DE800E5A-E68B-4BCA-AC99-4BC9DB44FD56} = {DE800E5A-E68B-4BCA-AC99-4BC9DB44FD56}
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skullOS.Modules", "skullOS.Modules\skullOS.Modules.csproj", "{DE800E5A-E68B-4BCA-AC99-4BC9DB44FD56}"

diff --git a/skullOS.API/Controllers/BuzzerController.cs b/skullOS.API/Controllers/BuzzerController.cs
@@ -0,0 +1,28 @@
+using Microsoft.AspNetCore.Mvc;
+using skullOS.Modules.Interfaces;
+using static skullOS.Modules.BuzzerLibrary;
+
+namespace skullOS.API.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class BuzzerController : ControllerBase
+    {
+        private readonly ILogger<BuzzerController> _logger;
+        private IBuzzerModule _module;
+
+        public BuzzerController(ILogger<BuzzerController> logger, IBuzzerModule buzzer)
+        {
+            _logger = logger;
+            _module = buzzer;
+        }
+
+        public string PlayTune(string tune)
+        {
+            Tunes tuneToPlay = (Tunes)Enum.Parse(typeof(Tunes), tune);
+            _module.PlayTune(tuneToPlay);
+            return "Playing " + tuneToPlay.ToString();
+        }
+
+    }
+}
diff --git a/skullOS.API/Controllers/CameraController.cs b/skullOS.API/Controllers/CameraController.cs
@@ -0,0 +1,33 @@
+using Microsoft.AspNetCore.Mvc;
+using skullOS.Modules.Interfaces;
+
+namespace skullOS.API.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class CameraController : ControllerBase
+    {
+        private readonly ILogger<CameraController> _logger;
+        private ICameraModule _module;
+
+        public CameraController(ILogger<CameraController> logger, ICameraModule camera)
+        {
+            _logger = logger;
+            _module = camera;
+        }
+
+        [HttpGet]
+        public string TakePicture()
+        {
+            _module.TakePicture();
+            return "Picture Taken!";
+        }
+
+        [HttpGet]
+        public string RecordVideo()
+        {
+            _module.RecordShortVideo();
+            return "Video Recorded!";
+        }
+    }
+}
diff --git a/skullOS.API/Runner.cs b/skullOS.API/Runner.cs
@@ -1,4 +1,7 @@
-namespace skullOS.API
+using skullOS.Modules;
+using skullOS.Modules.Interfaces;
+
+namespace skullOS.API
 {
     public class Runner
     {
@@ -14,6 +17,11 @@ public Task StartWebAPI(string[] args)
             builder.Services.AddSwaggerGen();
             builder.WebHost.UseUrls("http://*:5000;https://*:5001");
 
+            #region Skull Modules
+            builder.Services.AddScoped<ICameraModule, Camera>();
+            builder.Services.AddScoped<IBuzzerModule, Buzzer>();
+            #endregion
+
 
             var app = builder.Build();
 

diff --git a/skullOS.API/skullOS.API.csproj b/skullOS.API/skullOS.API.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\skullOS.Core\skullOS.Core.csproj" />
+    <ProjectReference Include="..\skullOS.Modules\skullOS.Modules.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/skullOS.Modules/Buzzer.cs b/skullOS.Modules/Buzzer.cs
@@ -261,7 +261,7 @@ public static class BuzzerStructures
         /// <summary>
         /// Represents all twelve notes.
         /// </summary>
-        internal enum Note
+        public enum Note
         {
             C = 1,
             Db = 2,
@@ -280,7 +280,7 @@ internal enum Note
         /// <summary>
         /// Represents music octave.
         /// </summary>
-        internal enum Octave
+        public enum Octave
         {
             First = 1,
             Second = 2,
@@ -295,7 +295,7 @@ internal enum Octave
         /// <summary>
         /// Represents music note duration.
         /// </summary>
-        internal enum Duration
+        public enum Duration
         {
             Whole = 1,
             Half = 2,

diff --git a/skullOS.Modules/Interfaces/IBuzzerModule.cs b/skullOS.Modules/Interfaces/IBuzzerModule.cs
@@ -1,6 +1,7 @@
 namespace skullOS.Modules.Interfaces
 {
-    internal interface IBuzzerModule
+    public interface IBuzzerModule
     {
+        void PlayTune(BuzzerLibrary.Tunes tuneToPlay);
     }
 }
diff --git a/skullOS.Modules/Interfaces/ICameraModule.cs b/skullOS.Modules/Interfaces/ICameraModule.cs
@@ -1,6 +1,8 @@
 namespace skullOS.Modules.Interfaces
 {
-    internal interface ICameraModule
+    public interface ICameraModule
     {
+        void RecordShortVideo();
+        void TakePicture();
     }
 }
diff --git a/skullOS/Data/Modules.txt b/skullOS/Data/Modules.txt
@@ -3,4 +3,4 @@ Downlink=True
 Uplink=True
 Prop=True
 QrCodeReader=True
-
+Buzzer=True
diff --git a/skullOS/Program.cs b/skullOS/Program.cs
@@ -60,8 +60,13 @@ static void Run(bool shouldCreateDirectory = true)
                 logger.LogMessage("Enabling API...");
                 if (bool.Parse(useAPI))
                 {
+                    string[] arguments = new string[1];
+#if DEBUG
+                    arguments[0] = "environment=development";
+                    logger.LogMessage("Set first argument to " + arguments[0]);
+#endif
                     Runner apiRunner = new();
-                    Task apiStatus = apiRunner.StartWebAPI(null);
+                    Task apiStatus = apiRunner.StartWebAPI(arguments);
                     deviceManager.AttachApi(apiStatus);
                     logger.LogMessage("API enabled");
                 }