add dragino sensor #25

JohnN193 · 2025-02-13T23:05:54Z

initial dragino sensor.

big changes

add helpers for making Nodes
Allow for gateways to be implicit dependencies(without breaking if made explicit instead)
add the dragino sensor with the decoder file included(via http)

also tweaks the gomod/adds some nolints to prevent the linter from breaking everything

JohnN193 · 2025-02-13T23:07:52Z

draginolht65n/sensor.go

+func (conf *Config) getNodeConfig(decoderFilePath string) node.Config {
+	return node.Config{
+		JoinType:    conf.JoinType,
+		DecoderPath: decoderFilePath,
+		Interval:    conf.Interval,
+		DevEUI:      conf.DevEUI,
+		AppKey:      conf.AppKey,
+		AppSKey:     conf.AppSKey,
+		NwkSKey:     conf.NwkSKey,
+		DevAddr:     conf.DevAddr,
+		Gateways:    conf.Gateways,
+	}
+}


Basically we have other sensors create their own node.Config, then we can reuse all of the validation used in the node implementation

JohnN193 · 2025-02-13T23:08:44Z

draginolht65n/sensor.go

+	resource.Named
+	logger logging.Logger
+
+	node        node.Node


the dragino LHT65N wraps a node implementation, so we can easily reuse all of the node functionality

JohnN193 · 2025-02-13T23:10:32Z

draginolht65n/sensor_test.go

@@ -0,0 +1,36 @@
+package draginolht65n


pretty much everything is already covered by node_test.go. Once we add more dragino specific fields we will probably add more to here.

JohnN193 · 2025-02-13T23:16:56Z

node/node.go

@@ -18,26 +16,28 @@ var Model = resource.NewModel("viam", "lorawan", "node")

 // Error variables for validation.
 var (
-	errDecoderPathRequired = errors.New("decoder path is required")


exported these so they could be used in other sensors

randhid · 2025-02-14T00:31:31Z

meta.json

+        "short_description": "A sensor compoenent for a dragino LHT65N LoRaWAN node."
+     }


Suggested change

"short_description": "A sensor compoenent for a dragino LHT65N LoRaWAN node."

}

"short_description": "A sensor component for a dragino LHT65N LoRaWAN node."

}

And the short_description above too.

oliviamiller · 2025-02-14T15:00:20Z

draginolht65n/LHT65NChirpstack4decoder.js

@@ -0,0 +1,332 @@
+function decodeUplink(input) {


Might be better to get it from the github URL in case they make an update? but this is prob fine

added a decoder from url option! leaving the embed implementation in case someone needs to use it for some reason(no network? idk)

oliviamiller · 2025-02-14T15:05:16Z

node/node_utils.go

+
+// WriteDecoderFile writes an embeded decoderFile into the data folder of the module.
+func WriteDecoderFile(decoderFilename string, decoderFile embed.FS) (string, error) {
+	// Create or open the file used to save device data across restarts.


delete or edit comment

oliviamiller · 2025-02-14T15:15:19Z

draginolht65n/sensor.go

+	if err != nil {
+		return nil, err
+	}
+	n := &LHT65N{


Instead of wrapping the node object I think you could just create a node.Node here, then you could reuse the node's decoderPath field and the Readings/close functions. Just something to consider not 100% sure it would work.

I tried that initially but ran into some issues with reconfigure. I can't reuse node.Node because the reconfigure function is still using a resource.Config that looks for a node.Config with a decoderPath set. Wrapping the object + adding the helpers lets me get around the issue.

oliviamiller · 2025-02-14T15:15:34Z

draginolht65n/sensor.go

+	n := &LHT65N{
+		Named:  conf.ResourceName().AsNamed(),
+		logger: logger,
+		// This returns the name given to the resource by user


delete or edit comment

oliviamiller · 2025-02-14T15:16:26Z

draginolht65n/sensor.go

+
+	nodeCfg := cfg.getNodeConfig(n.decoderPath)
+	if len(deps) == 0 {
+		n.logger.Info("yo no deps")


remember to change log before merge

Ah actually meant to delete this one, was using it to debug something

randhid · 2025-02-14T18:25:57Z

draginolht65n/sensor.go

+const decoderFilename = "LHT65NChirpstack4decoder.js"
+
+// Model represents a dragino-LHT65N lorawan node model.
+var Model = resource.NewModel("viam", "lorawan", "dragino-LHT65N")


Let's make a model Family since we're going to be using the "viam", "lorawan" module ID a lot of tims

oliviamiller

few nits/questions but lgtm!

oliviamiller · 2025-02-14T20:23:52Z

draginolht65n/sensor.go

+	conf resource.Config,
+	logger logging.Logger,
+) (sensor.Sensor, error) {
+	httpClient := &http.Client{


if this is the only time we use the httpClient could we just create it in the WriteDecoderFileFromURL instead of here?

I have to create the httpClient outside of the function for the mock in testing to work :(

oliviamiller · 2025-02-14T20:27:33Z

node/node_utils.go

+
+// CheckCaptureFrequency check the resource's capture frequency
+// and reports to the user whether a safe value has been configured.
+func CheckCaptureFrequency(c resource.Config, interval float64, logger logging.Logger) (bool, error) {


I don't think the bool return value is ever used, could we get rid of it?

I can't remember the reason why I added it and I didn't write it down, so yeah lets delete it lol

oliviamiller · 2025-02-14T20:28:46Z

gateway/join.go

 	payload = append(payload, netIDLE[:]...)
+	//nolint:all


tysm for fixing

add dragino sensor

3099b04

JohnN193 commented Feb 13, 2025

View reviewed changes

JohnN193 added 2 commits February 13, 2025 18:12

unlint i guess

832b4fa

another lint

1001379

JohnN193 commented Feb 13, 2025

View reviewed changes

JohnN193 requested review from oliviamiller and randhid February 13, 2025 23:17

randhid reviewed Feb 14, 2025

View reviewed changes

oliviamiller reviewed Feb 14, 2025

View reviewed changes

pr comments

02d438e

randhid reviewed Feb 14, 2025

View reviewed changes

JohnN193 added 6 commits February 14, 2025 13:49

add url curl logic

33529e6

try fixing linter

072fbd2

use http and add tests for http

d3e09c5

lint

1e54eca

remove decoder to prefer url

2168082

use model family

a3dc7a4

JohnN193 requested review from oliviamiller and randhid February 14, 2025 20:14

oliviamiller approved these changes Feb 14, 2025

View reviewed changes

remove unused bool

a06baea

JohnN193 merged commit 68a6816 into main Feb 14, 2025
2 checks passed

JohnN193 deleted the addDragino branch February 14, 2025 21:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add dragino sensor #25

add dragino sensor #25

JohnN193 commented Feb 13, 2025 •

edited

Loading

JohnN193 Feb 13, 2025

JohnN193 Feb 13, 2025

JohnN193 Feb 13, 2025

JohnN193 Feb 13, 2025

randhid Feb 14, 2025

oliviamiller Feb 14, 2025

JohnN193 Feb 14, 2025

oliviamiller Feb 14, 2025

oliviamiller Feb 14, 2025

JohnN193 Feb 14, 2025

oliviamiller Feb 14, 2025

oliviamiller Feb 14, 2025

JohnN193 Feb 14, 2025

randhid Feb 14, 2025

oliviamiller left a comment

oliviamiller Feb 14, 2025

JohnN193 Feb 14, 2025

oliviamiller Feb 14, 2025

JohnN193 Feb 14, 2025

oliviamiller Feb 14, 2025

		"short_description": "A sensor compoenent for a dragino LHT65N LoRaWAN node."
		}

add dragino sensor #25

add dragino sensor #25

Conversation

JohnN193 commented Feb 13, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oliviamiller left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JohnN193 commented Feb 13, 2025 •

edited

Loading