diff --git a/meshview/templates/packet_index.html b/meshview/templates/packet_index.html index 5fc2eaf..c267b00 100644 --- a/meshview/templates/packet_index.html +++ b/meshview/templates/packet_index.html @@ -2,6 +2,12 @@ {% block body %}
- {% include 'packet.html' %} +
+
+ {% include 'packet.html' %} +
+
+
+
{% endblock %} diff --git a/proto_def/meshtastic/admin.options b/proto_def/meshtastic/admin.options index 4804d89..1d582e2 100644 --- a/proto_def/meshtastic/admin.options +++ b/proto_def/meshtastic/admin.options @@ -8,5 +8,5 @@ *AdminMessage.get_ringtone_response max_size:231 *HamParameters.call_sign max_size:8 -*HamParameters.short_name max_size:5 -*NodeRemoteHardwarePinsResponse.node_remote_hardware_pins max_count:16 +*HamParameters.short_name max_size:6 +*NodeRemoteHardwarePinsResponse.node_remote_hardware_pins max_count:16 \ No newline at end of file diff --git a/proto_def/meshtastic/channel.proto b/proto_def/meshtastic/channel.proto index 16c8c19..d2ec81a 100644 --- a/proto_def/meshtastic/channel.proto +++ b/proto_def/meshtastic/channel.proto @@ -96,12 +96,6 @@ message ModuleSettings { * Bits of precision for the location sent in position packets. */ uint32 position_precision = 1; - - /* - * Controls whether or not the phone / clients should mute the current channel - * Useful for noisy public channels you don't necessarily want to disable - */ - bool is_client_muted = 2; } /* diff --git a/proto_def/meshtastic/config.options b/proto_def/meshtastic/config.options index 22dcc88..4490f08 100644 --- a/proto_def/meshtastic/config.options +++ b/proto_def/meshtastic/config.options @@ -1,6 +1,3 @@ -# longest current is 45 chars, plan with a bit of buffer -*DeviceConfig.tzdef max_size:65 - *NetworkConfig.wifi_ssid max_size:33 *NetworkConfig.wifi_psk max_size:65 *NetworkConfig.ntp_server max_size:33 diff --git a/proto_def/meshtastic/config.proto b/proto_def/meshtastic/config.proto index 43e8c6e..5b93649 100644 --- a/proto_def/meshtastic/config.proto +++ b/proto_def/meshtastic/config.proto @@ -180,16 +180,6 @@ message Config { * Disables the triple-press of user button to enable or disable GPS */ bool disable_triple_click = 10; - - /* - * POSIX Timezone definition string from https://github.com/nayarsystems/posix_tz_db/blob/master/zones.csv. - */ - string tzdef = 11; - - /* - * If true, disable the default blinking LED (LED_PIN) behavior on the device - */ - bool led_heartbeat_disabled = 12; } /* @@ -360,28 +350,30 @@ message Config { */ message PowerConfig { /* - * Description: Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio. - * Don't use this setting if you want to use your device with the phone apps or are using a device without a user button. - * Technical Details: Works for ESP32 devices and NRF52 devices in the Sensor or Tracker roles + * If set, we are powered from a low-current source (i.e. solar), so even if it looks like we have power flowing in + * we should try to minimize power consumption as much as possible. + * YOU DO NOT NEED TO SET THIS IF YOU'VE set is_router (it is implied in that case). + * Advanced Option */ bool is_power_saving = 1; /* - * Description: If non-zero, the device will fully power off this many seconds after external power is removed. + * If non-zero, the device will fully power off this many seconds after external power is removed. */ uint32 on_battery_shutdown_after_secs = 2; /* * Ratio of voltage divider for battery pin eg. 3.20 (R1=100k, R2=220k) * Overrides the ADC_MULTIPLIER defined in variant for battery voltage calculation. - * https://meshtastic.org/docs/configuration/radio/power/#adc-multiplier-override - * Should be set to floating point value between 2 and 6 + * Should be set to floating point value between 2 and 4 + * Fixes issues on Heltec v2 */ float adc_multiplier_override = 3; /* - * Description: The number of seconds for to wait before turning off BLE in No Bluetooth states - * Technical Details: ESP32 Only 0 for default of 1 minute + * Wait Bluetooth Seconds + * The number of seconds for to wait before turning off BLE in No Bluetooth states + * 0 for default of 1 minute */ uint32 wait_bluetooth_secs = 4; @@ -394,14 +386,17 @@ message Config { uint32 sds_secs = 6; /* - * Description: In light sleep the CPU is suspended, LoRa radio is on, BLE is off an GPS is on - * Technical Details: ESP32 Only 0 for default of 300 + * Light Sleep Seconds + * In light sleep the CPU is suspended, LoRa radio is on, BLE is off an GPS is on + * ESP32 Only + * 0 for default of 300 */ uint32 ls_secs = 7; /* - * Description: While in light sleep when we receive packets on the LoRa radio we will wake and handle them and stay awake in no BLE mode for this value - * Technical Details: ESP32 Only 0 for default of 10 seconds + * Minimum Wake Seconds + * While in light sleep when we receive packets on the LoRa radio we will wake and handle them and stay awake in no BLE mode for this value + * 0 for default of 10 seconds */ uint32 min_wake_secs = 8; diff --git a/proto_def/meshtastic/deviceonly.proto b/proto_def/meshtastic/deviceonly.proto index eef59a7..2929559 100644 --- a/proto_def/meshtastic/deviceonly.proto +++ b/proto_def/meshtastic/deviceonly.proto @@ -16,117 +16,6 @@ option java_package = "com.geeksville.mesh"; option swift_prefix = ""; option (nanopb_fileopt).include = ""; - -/* - * Position with static location information only for NodeDBLite - */ -message PositionLite { - /* - * The new preferred location encoding, multiply by 1e-7 to get degrees - * in floating point - */ - sfixed32 latitude_i = 1; - - /* - * TODO: REPLACE - */ - sfixed32 longitude_i = 2; - - /* - * In meters above MSL (but see issue #359) - */ - int32 altitude = 3; - - /* - * This is usually not sent over the mesh (to save space), but it is sent - * from the phone so that the local device can set its RTC If it is sent over - * the mesh (because there are devices on the mesh without GPS), it will only - * be sent by devices which has a hardware GPS clock. - * seconds since 1970 - */ - fixed32 time = 4; - - /* - * TODO: REPLACE - */ - Position.LocSource location_source = 5; -} - -message NodeInfoLite { - /* - * The node number - */ - uint32 num = 1; - - /* - * The user info for this node - */ - User user = 2; - - /* - * This position data. Note: before 1.2.14 we would also store the last time we've heard from this node in position.time, that is no longer true. - * Position.time now indicates the last time we received a POSITION from that node. - */ - PositionLite position = 3; - - /* - * Returns the Signal-to-noise ratio (SNR) of the last received message, - * as measured by the receiver. Return SNR of the last received message in dB - */ - float snr = 4; - - /* - * Set to indicate the last time we received a packet from this node - */ - fixed32 last_heard = 5; - /* - * The latest device metrics for the node. - */ - DeviceMetrics device_metrics = 6; - - /* - * local channel index we heard that node on. Only populated if its not the default channel. - */ - uint32 channel = 7; - - /* - * True if we witnessed the node over MQTT instead of LoRA transport - */ - bool via_mqtt = 8; - - /* - * Number of hops away from us this node is (0 if adjacent) - */ - uint32 hops_away = 9; - - /* - * True if node is in our favorites list - * Persists between NodeDB internal clean ups - */ - bool is_favorite = 10; -} - -/* - * Font sizes for the device screen - */ -enum ScreenFonts { - /* - * TODO: REPLACE - */ - FONT_SMALL = 0; - - /* - * TODO: REPLACE - */ - FONT_MEDIUM = 1; - - /* - * TODO: REPLACE - */ - FONT_LARGE = 2; -} - - /* * This message is never sent over the wire, but it is used for serializing DB * state to flash in the device code @@ -194,6 +83,95 @@ message DeviceState { repeated NodeInfoLite node_db_lite = 14 [(nanopb).callback_datatype = "std::vector"]; } +message NodeInfoLite { + /* + * The node number + */ + uint32 num = 1; + + /* + * The user info for this node + */ + User user = 2; + + /* + * This position data. Note: before 1.2.14 we would also store the last time we've heard from this node in position.time, that is no longer true. + * Position.time now indicates the last time we received a POSITION from that node. + */ + PositionLite position = 3; + + /* + * Returns the Signal-to-noise ratio (SNR) of the last received message, + * as measured by the receiver. Return SNR of the last received message in dB + */ + float snr = 4; + + /* + * Set to indicate the last time we received a packet from this node + */ + fixed32 last_heard = 5; + /* + * The latest device metrics for the node. + */ + DeviceMetrics device_metrics = 6; + + /* + * local channel index we heard that node on. Only populated if its not the default channel. + */ + uint32 channel = 7; + + /* + * True if we witnessed the node over MQTT instead of LoRA transport + */ + bool via_mqtt = 8; + + /* + * Number of hops away from us this node is (0 if adjacent) + */ + uint32 hops_away = 9; + + /* + * True if node is in our favorites list + * Persists between NodeDB internal clean ups + */ + bool is_favorite = 10; +} + +/* + * Position with static location information only for NodeDBLite + */ +message PositionLite { + /* + * The new preferred location encoding, multiply by 1e-7 to get degrees + * in floating point + */ + sfixed32 latitude_i = 1; + + /* + * TODO: REPLACE + */ + sfixed32 longitude_i = 2; + + /* + * In meters above MSL (but see issue #359) + */ + int32 altitude = 3; + + /* + * This is usually not sent over the mesh (to save space), but it is sent + * from the phone so that the local device can set its RTC If it is sent over + * the mesh (because there are devices on the mesh without GPS), it will only + * be sent by devices which has a hardware GPS clock. + * seconds since 1970 + */ + fixed32 time = 4; + + /* + * TODO: REPLACE + */ + Position.LocSource location_source = 5; +} + /* * The on-disk saved channels */ @@ -211,6 +189,26 @@ message ChannelFile { uint32 version = 2; } +/* + * TODO: REPLACE + */ +enum ScreenFonts { + /* + * TODO: REPLACE + */ + FONT_SMALL = 0; + + /* + * TODO: REPLACE + */ + FONT_MEDIUM = 1; + + /* + * TODO: REPLACE + */ + FONT_LARGE = 2; +} + /* * This can be used for customizing the firmware distribution. If populated, * show a secondary bootup screen with custom logo and text for 2.5 seconds. diff --git a/proto_def/meshtastic/mesh.proto b/proto_def/meshtastic/mesh.proto index 279f222..d59c8b2 100644 --- a/proto_def/meshtastic/mesh.proto +++ b/proto_def/meshtastic/mesh.proto @@ -319,11 +319,6 @@ enum HardwareModel { */ LORA_TYPE = 19; - /* - * wiphone https://www.wiphone.io/ - */ - WIPHONE = 20; - /* * B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */ @@ -509,28 +504,6 @@ enum HardwareModel { */ UNPHONE = 59; - /* - * Teledatics TD-LORAC NRF52840 based M.2 LoRA module - * Compatible with the TD-WRLS development board - */ - TD_LORAC = 60; - - /* - * CDEBYTE EoRa-S3 board using their own MM modules, clone of LILYGO T3S3 - */ - CDEBYTE_EORA_S3 = 61; - -/* - * TWC_MESH_V4 - * Adafruit NRF52840 feather express with SX1262, SSD1306 OLED and NEO6M GPS - */ - TWC_MESH_V4 = 62; - - /* - * NRF52_PROMICRO_DIY - * Promicro NRF52840 with SX1262/LLCC68, SSD1306 OLED and NEO6M GPS - */ - NRF52_PROMICRO_DIY = 63; /* * ------------------------------------------------------------------------------------------------------------------------------------------ * Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. diff --git a/proto_def/meshtastic/module_config.proto b/proto_def/meshtastic/module_config.proto index 8215e01..36a2b4b 100644 --- a/proto_def/meshtastic/module_config.proto +++ b/proto_def/meshtastic/module_config.proto @@ -254,17 +254,6 @@ message ModuleConfig { */ uint32 paxcounter_update_interval = 2; - - /* - * WiFi RSSI threshold. Defaults to -80 - */ - int32 wifi_threshold = 3; - - /* - * BLE RSSI threshold. Defaults to -80 - */ - int32 ble_threshold = 4; - } /* diff --git a/proto_def/meshtastic/telemetry.options b/proto_def/meshtastic/telemetry.options index 2fe657c..6c80df9 100644 --- a/proto_def/meshtastic/telemetry.options +++ b/proto_def/meshtastic/telemetry.options @@ -1,4 +1,4 @@ # options for nanopb # https://jpa.kapsi.fi/nanopb/docs/reference.html#proto-file-options -*EnvironmentMetrics.iaq int_size:16 \ No newline at end of file + diff --git a/proto_def/meshtastic/telemetry.proto b/proto_def/meshtastic/telemetry.proto index 052a5a9..a822c5d 100644 --- a/proto_def/meshtastic/telemetry.proto +++ b/proto_def/meshtastic/telemetry.proto @@ -31,11 +31,6 @@ message DeviceMetrics { * Percent of airtime for transmission used within the last hour. */ float air_util_tx = 4; - - /* - * How long the device has been running since the last reboot (in seconds) - */ - uint32 uptime_seconds = 5; } /* @@ -71,27 +66,6 @@ message EnvironmentMetrics { * Current measured (To be depreciated in favor of PowerMetrics in Meshtastic 3.x) */ float current = 6; - - /* - * relative scale IAQ value as measured by Bosch BME680 . value 0-500. - * Belongs to Air Quality but is not particle but VOC measurement. Other VOC values can also be put in here. - */ - uint32 iaq = 7; - - /* - * RCWL9620 Doppler Radar Distance Sensor, used for water level detection. Float value in mm. - */ - float distance = 8; - - /* - * VEML7700 high accuracy ambient light(Lux) digital 16-bit resolution sensor. - */ - float lux = 9; - - /* - * VEML7700 high accuracy white light(irradiance) not calibrated digital 16-bit resolution sensor. - */ - float white_lux = 10; } /* @@ -309,39 +283,4 @@ enum TelemetrySensorType { * BMP085/BMP180 High accuracy temperature and pressure (older Version of BMP280) */ BMP085 = 15; - - /* - * RCWL-9620 Doppler Radar Distance Sensor, used for water level detection - */ - RCWL9620 = 16; - - /* - * Sensirion High accuracy temperature and humidity - */ - SHT4X = 17; - - /* - * VEML7700 high accuracy ambient light(Lux) digital 16-bit resolution sensor. - */ - VEML7700 = 18; - - /* - * MLX90632 non-contact IR temperature sensor. - */ - MLX90632 = 19; - - /* - * TI OPT3001 Ambient Light Sensor - */ - OPT3001 = 20; - - /* - * Lite On LTR-390UV-01 UV Light Sensor - */ - LTR390UV = 21; - - /* - * AMS TSL25911FN RGB Light Sensor - */ - TSL25911FN = 22; -} \ No newline at end of file +}