diff --git a/Dockerfile b/Dockerfile index 76f5490..cfe7d1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,9 @@ WORKDIR /app # Copy the requirements file COPY requirements.txt . +# Update pip +RUN pip install --upgrade pip + # Install Python dependencies RUN pip install --no-cache-dir -r requirements.txt diff --git a/meshtastic_support.py b/meshtastic_support.py index 387abd9..b03b675 100644 --- a/meshtastic_support.py +++ b/meshtastic_support.py @@ -87,6 +87,8 @@ class HardwareModel(Enum): HardwareModel.LILYGO_TBEAM_S3_CORE: "LILYGO_TBEAM_S3_CORE.png", HardwareModel.NANO_G1_EXPLORER: "NANO_G1_EXPLORER.png", HardwareModel.NANO_G2_ULTRA: "NANO_G2_ULTRA.png", + HardwareModel.NRF52_PROMICRO_DIY: "NRF52_PROMICRO_DIY.png", + HardwareModel.RAK11310: "RAK11310.png", HardwareModel.RAK4631: "RAK4631.png", HardwareModel.RP2040_LORA: "RP2040_LORA.png", HardwareModel.RPI_PICO: "RPI_PICO.png", @@ -96,4 +98,5 @@ class HardwareModel(Enum): HardwareModel.T_DECK: "T_DECK.png", HardwareModel.T_ECHO: "T_ECHO.png", HardwareModel.T_WATCH_S3: "T_WATCH_S3.png", + HardwareModel.PRIVATE_HW: "PRIVATE_HW.png", } diff --git a/public/images/hardware/NRF52_PROMICRO_DIY.png b/public/images/hardware/NRF52_PROMICRO_DIY.png new file mode 100644 index 0000000..092bd9d Binary files /dev/null and b/public/images/hardware/NRF52_PROMICRO_DIY.png differ diff --git a/public/images/hardware/PRIVATE_HW.png b/public/images/hardware/PRIVATE_HW.png new file mode 100644 index 0000000..4e4aeef Binary files /dev/null and b/public/images/hardware/PRIVATE_HW.png differ diff --git a/public/images/hardware/RAK11310.png b/public/images/hardware/RAK11310.png new file mode 100644 index 0000000..cdcc697 Binary files /dev/null and b/public/images/hardware/RAK11310.png differ diff --git a/public/images/hardware/XIAO_BLE.png b/public/images/hardware/XIAO_BLE.png new file mode 100644 index 0000000..4e4aeef Binary files /dev/null and b/public/images/hardware/XIAO_BLE.png differ diff --git a/templates/static/map.html.j2 b/templates/static/map.html.j2 index 94c507b..fb0c661 100644 --- a/templates/static/map.html.j2 +++ b/templates/static/map.html.j2 @@ -49,10 +49,10 @@ longitude: -121.4944, }; var server_position = null; - {% if 'position' in server_node and server_node.position and 'latitude_i' in server_node.position and 'longitude_i' in server_node.position %} + {% if 'latitude' in config['mesh'] and 'longitude'in config['mesh'] %} server_position = { - latitude: {{ server_node.position.latitude_i / 10000000 }}, - longitude: {{ server_node.position.longitude_i / 10000000 }}, + latitude: {{ config['mesh']['latitude'] }}, + longitude: {{ config['mesh']['longitude'] }} }; {% else %} server_position = default_position;