Compare commits
1 Commits
master
...
c9c6115bf3
Author | SHA1 | Date | |
---|---|---|---|
c9c6115bf3 |
@ -207,7 +207,7 @@ func (c *Client) SetModem(ctx context.Context, funcs ...protocol.SetModemOptions
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetModemConfiguration implements protocol.Operations.
|
// SetModem implements protocol.Operations.
|
||||||
func (c *Client) GetModemConfiguration(ctx context.Context) (any, error) {
|
func (c *Client) GetModemConfiguration(ctx context.Context) (any, error) {
|
||||||
_, ops, err := c.getProtocol(ctx)
|
_, ops, err := c.getProtocol(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -377,29 +377,6 @@ var testCases = []operationTestCase{
|
|||||||
t.Logf("Message : %+v", taskMsg)
|
t.Logf("Message : %+v", taskMsg)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
Name: "GetModemConfiguration",
|
|
||||||
Run: func(t *testing.T, ops protocol.Operations) {
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
if err := ops.Connect(ctx); err != nil {
|
|
||||||
t.Errorf("%+v", errors.WithStack(err))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
defer func() {
|
|
||||||
if err := ops.Close(ctx); err != nil {
|
|
||||||
t.Errorf("%+v", errors.WithStack(err))
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
config, err := ops.GetModemConfiguration(ctx)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("%+v", errors.WithStack(err))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
t.Logf("Modem configuration : %+v", config)
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestOperations(t *testing.T, opsFactory OperationsFactoryFunc) {
|
func TestOperations(t *testing.T, opsFactory OperationsFactoryFunc) {
|
||||||
|
@ -174,10 +174,10 @@ func (o *Operations) PostModem(ctx context.Context, config *model.ModemAuthentic
|
|||||||
return &updated, nil
|
return &updated, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (o *Operations) GetModem(ctx context.Context) (*model.ModemConfiguration, error) {
|
func (o *Operations) GetModem(ctx context.Context) (*model.ModemAuthentication, error) {
|
||||||
config := &model.ModemConfiguration{}
|
config := &model.ModemAuthentication{}
|
||||||
|
|
||||||
if err := o.GetJSON("/modem/1/info", config); err != nil {
|
if err := o.GetJSON("/modem/1/settings", config); err != nil {
|
||||||
return nil, errors.WithStack(err)
|
return nil, errors.WithStack(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,25 +10,3 @@ type ModemAuthentication struct {
|
|||||||
Password string `json:"password,omitempty"`
|
Password string `json:"password,omitempty"`
|
||||||
} `json:"authentication"`
|
} `json:"authentication"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ModemConfiguration struct {
|
|
||||||
AccessTechnology string `json:"access_technology"`
|
|
||||||
AllowedModes []string `json:"allowed_modes"`
|
|
||||||
AvailableAPNs []string `json:"available_apns,omitempty"`
|
|
||||||
CurrentAPN string `json:"current_apn"`
|
|
||||||
CurrentMode string `json:"current_mode"`
|
|
||||||
FailReason *string `json:"fail_reason,omitempty"`
|
|
||||||
IMEI string `json:"imei"`
|
|
||||||
InternetAvailable string `json:"internet_available,omitempty"`
|
|
||||||
LockReason *string `json:"lock_reason,omitempty"`
|
|
||||||
OperatorName string `json:"operator_name"`
|
|
||||||
PreferredMode string `json:"preferred_mode"`
|
|
||||||
RegistrationState string `json:"registration_state"`
|
|
||||||
RSSI int `json:"rssi"`
|
|
||||||
State string `json:"state"`
|
|
||||||
Stats struct {
|
|
||||||
Since string `json:"since"`
|
|
||||||
UsageMB string `json:"usage_mb"`
|
|
||||||
} `json:"stats"`
|
|
||||||
UnlockRetries int `json:"unlock_retries"`
|
|
||||||
}
|
|
||||||
|
@ -281,6 +281,17 @@ func (o *Operations) AveragePosition(ctx context.Context) (*protocol.TaskMessage
|
|||||||
if err = o.client.Emit("task", &model.Action{Name: "average_base_coordinates"}); err != nil {
|
if err = o.client.Emit("task", &model.Action{Name: "average_base_coordinates"}); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
ch, err := o.On(ctx, "task_status")
|
||||||
|
for message := range ch {
|
||||||
|
var taskMsg protocol.TaskMessage[protocol.AveragePositionPayload]
|
||||||
|
if err := mapstructure.Decode(message, &taskMsg); err != nil {
|
||||||
|
return nil, errors.WithStack(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if taskMsg.State == "completed" {
|
||||||
|
return &taskMsg, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user