weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

xxx

Browse Source
This commit is contained in:
Applevangelist 2024-01-07 13:16:52 +01:00
parent 0009539eef
commit 7e842fbd46
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Moose Development/Moose/Core/Message.lua
View File

@ -505,6 +505,7 @@ function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,G
if PathToCredentials then if PathToCredentials then
_MESSAGESRS.MSRS:SetProviderOptionsGoogle(PathToCredentials) _MESSAGESRS.MSRS:SetProviderOptionsGoogle(PathToCredentials)
_MESSAGESRS.MSRS:SetProvider(MSRS.Provider.GOOGLE)
end end
_MESSAGESRS.label = Label or MSRS.Label or "MESSAGE" _MESSAGESRS.label = Label or MSRS.Label or "MESSAGE"

6
Moose Development/Moose/Sound/RadioQueue.lua
View File

@ -183,8 +183,10 @@ end
-- @param #number Port SRS port. Default 5002. -- @param #number Port SRS port. Default 5002.
-- @return #RADIOQUEUE self The RADIOQUEUE object. -- @return #RADIOQUEUE self The RADIOQUEUE object.
function RADIOQUEUE:SetSRS(PathToSRS, Port) function RADIOQUEUE:SetSRS(PathToSRS, Port)
self.msrs=MSRS:New(PathToSRS, self.frequency/1000000, self.modulation) local path = PathToSRS or MSRS.path
self.msrs:SetPort(Port) local port = Port or MSRS.port
self.msrs=MSRS:New(path, self.frequency/1000000, self.modulation)
self.msrs:SetPort(port)
return self return self
end end

14
Moose Development/Moose/Sound/SRS.lua
View File

@ -918,12 +918,16 @@ end
-- @param #string Provider -- @param #string Provider
-- @return #MSRS self -- @return #MSRS self
function MSRS:SetProvider(Provider) function MSRS:SetProvider(Provider)
self:F( {Provider=Provider} ) BASE:F( {Provider=Provider} )
self.provider = Provider or MSRS.Provider.WINDOWS if self then
return self self.provider = Provider or MSRS.Provider.WINDOWS
return self
else
MSRS.provider = Provider or MSRS.Provider.WINDOWS
end
return
end end
--- Get provider. --- Get provider.
-- @param #MSRS self -- @param #MSRS self
-- @return #MSRS self -- @return #MSRS self
@ -940,7 +944,7 @@ end
-- @param #string Region Region to use. -- @param #string Region Region to use.
-- @return #MSRS.ProviderOptions Provider optionas table. -- @return #MSRS.ProviderOptions Provider optionas table.
function MSRS:SetProviderOptions(Provider, CredentialsFile, AccessKey, SecretKey, Region) function MSRS:SetProviderOptions(Provider, CredentialsFile, AccessKey, SecretKey, Region)
self:F( {Provider, CredentialsFile, AccessKey, SecretKey, Region} ) BASE:F( {Provider, CredentialsFile, AccessKey, SecretKey, Region} )
local option=MSRS._CreateProviderOptions(Provider, CredentialsFile, AccessKey, SecretKey, Region) local option=MSRS._CreateProviderOptions(Provider, CredentialsFile, AccessKey, SecretKey, Region)
if self then if self then