Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions app/models/device.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@

const result = await drizzleClient.transaction(async (tx) => {
if (args.location) {
const { lat, lng, height } = args.location

Check warning on line 229 in app/models/device.server.ts

View workflow job for this annotation

GitHub Actions / ⬣ Lint

'height' is assigned a value but never used. Allowed unused vars must match /^ignored/u

const pointWKT = `POINT(${lng} ${lat})`

Expand Down Expand Up @@ -690,13 +690,28 @@
// If model is specified but sensors are not, get sensors from model layout
if (deviceData.model && !deviceData.sensors) {
const modelSensors = getSensorsForModel(deviceData.model as any)
if (modelSensors) {

if (!Array.isArray(modelSensors) && deviceData.model?.toLowerCase() !== 'custom') {
throw new Error(`Unknown model: ${deviceData.model}`)
}

if (
Array.isArray(deviceData.sensorTemplates) &&
deviceData.sensorTemplates.length > 0
) {
sensorsToAdd = modelSensors.filter(sensor =>
deviceData.sensorTemplates.includes(
sensor.sensorType.toLowerCase()
)
)
} else {
sensorsToAdd = modelSensors
}
}
}


if (deviceData.model?.toLowerCase() === 'custom' && deviceData.sensors) {
sensorsToAdd = deviceData.sensors
sensorsToAdd = deviceData.sensors ?? []
}

// Create the device
Expand Down
34 changes: 20 additions & 14 deletions app/routes/device.new.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,37 @@ export async function action({ request }: ActionFunctionArgs) {

const data = JSON.parse(rawData);

const selectedSensors = data["sensor-selection"].selectedSensors

const devicePayload = {
name: data["general-info"].name,
exposure: data["general-info"].exposure,
expiresAt: data["general-info"].temporaryExpirationDate,
tags: data["general-info"].tags?.map((tag: { value: string }) => tag.value) || [],
latitude: data.location.latitude,
longitude: data.location.longitude,
// Only include model if NOT custom
...(data["device-selection"].model !== 'custom' && {
model: data["device-selection"].model

...(data["device-selection"].model !== "custom" && {
model: data["device-selection"].model,

sensorTemplates: selectedSensors.map(
(sensor: any) => sensor.sensorType.toLowerCase()
),
}),
// Only include sensors if custom
...(data["device-selection"].model === 'custom' && {
sensors: data["sensor-selection"].selectedSensors.map(
(sensor: any) => ({
title: sensor.title,
sensorType: sensor.sensorType,
unit: sensor.unit,
icon: sensor.icon,
})
)

...(data["device-selection"].model === "custom" && {
sensors: selectedSensors.map((sensor: any) => ({
title: sensor.title,
sensorType: sensor.sensorType,
unit: sensor.unit,
icon: sensor.icon,
})),
}),

mqttEnabled: data.advanced.mqttEnabled ?? false,
ttnEnabled: data.advanced.ttnEnabled ?? false,
};
}


// Call server function
const newDevice = await createDevice(devicePayload, userId);
Expand Down
53 changes: 30 additions & 23 deletions app/utils/model-definitions.ts
Original file line number Diff line number Diff line change
@@ -1,30 +1,37 @@
import { sensorDefinitions } from './sensor-definitions'

const senseBoxHomeV2 = [
sensorDefinitions.hdc1080_temperature,
sensorDefinitions.hdc1080_humidity,
sensorDefinitions.bmp280_pressure,
sensorDefinitions.tsl45315_lightintensity,
sensorDefinitions.veml6070_uvintensity,
sensorDefinitions.sds011_pm10,
sensorDefinitions.sds011_pm25,
sensorDefinitions.bme680_humidity,
sensorDefinitions.bme680_temperature,
sensorDefinitions.bme680_pressure,
sensorDefinitions.bme680_voc,
sensorDefinitions.smt50_soilmoisture,
sensorDefinitions.smt50_soiltemperature,
sensorDefinitions.soundlevelmeter,
sensorDefinitions.windspeed,
sensorDefinitions.scd30_co2,
sensorDefinitions.dps310_pressure,
sensorDefinitions.sps30_pm1,
sensorDefinitions.sps30_pm4,
sensorDefinitions.sps30_pm10,
sensorDefinitions.sps30_pm25,
]

// Models Definition
export const modelDefinitions = {
senseBoxHomeV2: [
sensorDefinitions.hdc1080_temperature,
sensorDefinitions.hdc1080_humidity,
sensorDefinitions.bmp280_pressure,
sensorDefinitions.tsl45315_lightintensity,
sensorDefinitions.veml6070_uvintensity,
sensorDefinitions.sds011_pm10,
sensorDefinitions.sds011_pm25,
sensorDefinitions.bme680_humidity,
sensorDefinitions.bme680_temperature,
sensorDefinitions.bme680_pressure,
sensorDefinitions.bme680_voc,
sensorDefinitions.smt50_soilmoisture,
sensorDefinitions.smt50_soiltemperature,
sensorDefinitions.soundlevelmeter,
sensorDefinitions.windspeed,
sensorDefinitions.scd30_co2,
sensorDefinitions.dps310_pressure,
sensorDefinitions.sps30_pm1,
sensorDefinitions.sps30_pm4,
sensorDefinitions.sps30_pm10,
sensorDefinitions.sps30_pm25,
],
senseBoxHomeV2,
homeV2Lora: senseBoxHomeV2,
homeV2Ethernet: senseBoxHomeV2,
homeV2EthernetFeinstaub: senseBoxHomeV2,
homeV2Wifi: senseBoxHomeV2,
homeV2WifiFeinstaub: senseBoxHomeV2,
'senseBox:Edu': [
sensorDefinitions.hdc1080_temperature,
sensorDefinitions.hdc1080_humidity,
Expand Down
Loading