From 2c8b3002d818b33f06cc22d0689468f05a71343d Mon Sep 17 00:00:00 2001 From: GUVWAF Date: Sat, 26 Nov 2022 20:45:20 +0100 Subject: [PATCH 1/5] Add option to override duty cycle --- config.proto | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config.proto b/config.proto index 71b697c..3468605 100644 --- a/config.proto +++ b/config.proto @@ -664,6 +664,13 @@ message Config { */ uint32 channel_num = 11; + /* + * If true, duty cycle limits will be exceeded and thus you're possibly not following + * the local regulations if you're not a HAM. + * Has no effect if the duty cycle of the used region is 100%. + */ + bool override_duty_cycle = 12; + /* * For testing it is useful sometimes to force a node to never listen to * particular other nodes (simulating radio out of range). All nodenums listed From 5b960cc420faa8beec8aefbd7fb77244e4370a0f Mon Sep 17 00:00:00 2001 From: GUVWAF Date: Sat, 26 Nov 2022 20:45:30 +0100 Subject: [PATCH 2/5] Add duty cycle limit error --- mesh.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mesh.proto b/mesh.proto index 76d4e3f..68f95ab 100644 --- a/mesh.proto +++ b/mesh.proto @@ -504,6 +504,11 @@ message Routing { */ NO_RESPONSE = 8; + /* + * Cannot send currently because duty cycle regulations will be violated. + */ + DUTY_CYCLE_LIMIT = 9; + /* * The application layer service on the remote node received your request, but considered your request somehow invalid */ From 2bb457de42cd6d5c2a6e7d8a4992fc6c90e37de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Tue, 29 Nov 2022 17:42:49 +0100 Subject: [PATCH 3/5] add I2S Pins --- module_config.options | 8 ++++++++ module_config.proto | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/module_config.options b/module_config.options index d2dd110..3ca66c8 100644 --- a/module_config.options +++ b/module_config.options @@ -4,3 +4,11 @@ *MQTTConfig.address max_size:32 *MQTTConfig.username max_size:64 *MQTTConfig.password max_size:64 + +*AudioConfig.mic_chan int_size:8 +*AudioConfig.amp_pin int_size:8 +*AudioConfig.ptt_pin int_size:8 +*AudioConfig.i2s_ws int_size:8 +*AudioConfig.i2s_sd int_size:8 +*AudioConfig.i2s_din int_size:8 +*AudioConfig.i2s_sck int_size:8 diff --git a/module_config.proto b/module_config.proto index 1f4334c..013b2f9 100644 --- a/module_config.proto +++ b/module_config.proto @@ -99,6 +99,26 @@ message ModuleConfig { * The audio sample rate to use for codec2 */ Audio_Baud bitrate = 5; + + /* + * I2S Word Select + */ + uint32 i2s_ws = 6; + + /* + * I2S Data IN + */ + uint32 i2s_sd = 7; + + /* + * I2S Data OUT + */ + uint32 i2s_din = 8; + + /* + * I2S Clock + */ + uint32 i2s_sck = 9; } /* From 0a59599589bc77763e76302e533a4c4bfa5ec80e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Fri, 2 Dec 2022 12:53:55 +0100 Subject: [PATCH 4/5] rip analogue audio stuff. Proto was not published yet. --- module_config.options | 2 -- module_config.proto | 22 ++++++---------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/module_config.options b/module_config.options index 3ca66c8..87bd307 100644 --- a/module_config.options +++ b/module_config.options @@ -5,8 +5,6 @@ *MQTTConfig.username max_size:64 *MQTTConfig.password max_size:64 -*AudioConfig.mic_chan int_size:8 -*AudioConfig.amp_pin int_size:8 *AudioConfig.ptt_pin int_size:8 *AudioConfig.i2s_ws int_size:8 *AudioConfig.i2s_sd int_size:8 diff --git a/module_config.proto b/module_config.proto index 013b2f9..93c7ae1 100644 --- a/module_config.proto +++ b/module_config.proto @@ -80,45 +80,35 @@ message ModuleConfig { */ bool codec2_enabled = 1; - /* - * ADC where Microphone is connected - */ - uint32 mic_chan = 2; - - /* - * DAC where Speaker is connected - */ - uint32 amp_pin = 3; - /* * PTT Pin */ - uint32 ptt_pin = 4; + uint32 ptt_pin = 2; /* * The audio sample rate to use for codec2 */ - Audio_Baud bitrate = 5; + Audio_Baud bitrate = 3; /* * I2S Word Select */ - uint32 i2s_ws = 6; + uint32 i2s_ws = 4; /* * I2S Data IN */ - uint32 i2s_sd = 7; + uint32 i2s_sd = 5; /* * I2S Data OUT */ - uint32 i2s_din = 8; + uint32 i2s_din = 6; /* * I2S Clock */ - uint32 i2s_sck = 9; + uint32 i2s_sck = 7; } /* From 2f6085722dc26e92627506e513e7e3033cacc3e3 Mon Sep 17 00:00:00 2001 From: GUVWAF Date: Mon, 5 Dec 2022 20:30:35 +0100 Subject: [PATCH 5/5] Add TRACEROUTE_APP portnum --- portnums.proto | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/portnums.proto b/portnums.proto index dd8a7c6..ab806ad 100644 --- a/portnums.proto +++ b/portnums.proto @@ -133,6 +133,12 @@ enum PortNum { */ SIMULATOR_APP = 69; + /* + * Provides a traceroute functionality to show the route a packet towards + * a certain destination would take on the mesh. + */ + TRACEROUTE_APP = 70; + /* * Private applications should use portnums >= 256. * To simplify initial development and testing you can use "PRIVATE_APP"