mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-24 17:32:18 +00:00
fix simradio init to work more like real radios
This commit is contained in:
parent
5fdcb72d46
commit
b68397a911
@ -16,15 +16,16 @@
|
|||||||
<list default="true" id="58922733-b05b-4b90-9655-b9b18914977a" name="Default Changelist" comment="">
|
<list default="true" id="58922733-b05b-4b90-9655-b9b18914977a" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/docs/software/TODO.md" beforeDir="false" afterPath="$PROJECT_DIR$/docs/software/TODO.md" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/docs/software/TODO.md" beforeDir="false" afterPath="$PROJECT_DIR$/docs/software/TODO.md" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/proto" beforeDir="false" afterPath="$PROJECT_DIR$/proto" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/platformio.ini" beforeDir="false" afterPath="$PROJECT_DIR$/platformio.ini" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/mesh/generated/mesh.pb.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/mesh/generated/mesh.pb.h" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/mesh/RF95Interface.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/mesh/RF95Interface.cpp" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/mesh/RadioInterface.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/mesh/RadioInterface.cpp" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/mesh/SX1262Interface.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/mesh/SX1262Interface.cpp" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:native" />
|
|
||||||
<component name="Git.Settings">
|
<component name="Git.Settings">
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
</component>
|
</component>
|
||||||
@ -49,7 +50,7 @@
|
|||||||
<property name="node.js.selected.package.tslint" value="(autodetect)" />
|
<property name="node.js.selected.package.tslint" value="(autodetect)" />
|
||||||
<property name="settings.editor.selected.configurable" value="CMakeSettings" />
|
<property name="settings.editor.selected.configurable" value="CMakeSettings" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected="PlatformIO.PlatformIO Upload">
|
<component name="RunManager" selected="GDB Remote Debug.gdbremote-localhost-2345">
|
||||||
<configuration default="true" type="CLion_Remote" version="1" remoteCommand="tcp:localhost:2345" symbolFile="" sysroot="">
|
<configuration default="true" type="CLion_Remote" version="1" remoteCommand="tcp:localhost:2345" symbolFile="" sysroot="">
|
||||||
<debugger kind="GDB" isBundled="true" />
|
<debugger kind="GDB" isBundled="true" />
|
||||||
<method v="2" />
|
<method v="2" />
|
||||||
@ -96,6 +97,9 @@
|
|||||||
<workItem from="1615788663210" duration="6661000" />
|
<workItem from="1615788663210" duration="6661000" />
|
||||||
<workItem from="1615938346019" duration="1208000" />
|
<workItem from="1615938346019" duration="1208000" />
|
||||||
<workItem from="1615971126983" duration="5945000" />
|
<workItem from="1615971126983" duration="5945000" />
|
||||||
|
<workItem from="1617115374907" duration="357000" />
|
||||||
|
<workItem from="1617115747078" duration="1391000" />
|
||||||
|
<workItem from="1617117632667" duration="307000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
@ -117,18 +121,23 @@
|
|||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager>
|
<breakpoint-manager>
|
||||||
<breakpoints>
|
<breakpoints>
|
||||||
<line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
|
|
||||||
<url>file://$PROJECT_DIR$/src/mesh/StreamAPI.cpp</url>
|
|
||||||
<line>20</line>
|
|
||||||
<option name="timeStamp" value="4" />
|
|
||||||
</line-breakpoint>
|
|
||||||
<line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
|
<line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
|
||||||
<url>file://$PROJECT_DIR$/src/mesh/wifi/WiFiServerAPI.cpp</url>
|
<url>file://$PROJECT_DIR$/src/mesh/wifi/WiFiServerAPI.cpp</url>
|
||||||
<line>53</line>
|
<line>53</line>
|
||||||
<option name="timeStamp" value="6" />
|
<option name="timeStamp" value="6" />
|
||||||
</line-breakpoint>
|
</line-breakpoint>
|
||||||
|
<line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
|
||||||
|
<url>file://$PROJECT_DIR$/src/mesh/wifi/WiFiServerAPI.cpp</url>
|
||||||
|
<line>37</line>
|
||||||
|
<option name="timeStamp" value="7" />
|
||||||
|
</line-breakpoint>
|
||||||
</breakpoints>
|
</breakpoints>
|
||||||
</breakpoint-manager>
|
</breakpoint-manager>
|
||||||
|
<watches-manager>
|
||||||
|
<configuration name="CLion_Remote">
|
||||||
|
<watch expression="radioConfig" language="ObjectiveC" />
|
||||||
|
</configuration>
|
||||||
|
</watches-manager>
|
||||||
</component>
|
</component>
|
||||||
<component name="XSLT-Support.FileAssociations.UIState">
|
<component name="XSLT-Support.FileAssociations.UIState">
|
||||||
<expand />
|
<expand />
|
||||||
|
@ -4,6 +4,7 @@ You probably don't care about this section - skip to the next one.
|
|||||||
|
|
||||||
## before next release
|
## before next release
|
||||||
|
|
||||||
|
* sendtext busted in portduino, due to bytetime calculations
|
||||||
* don't store User admin or position broadcasts in the ToPhone queue
|
* don't store User admin or position broadcasts in the ToPhone queue
|
||||||
* DONE tcp stream problem in python+pordtuino, server thinks client dropped when client DID NOT DROP
|
* DONE tcp stream problem in python+pordtuino, server thinks client dropped when client DID NOT DROP
|
||||||
* TCP mode for android, localhost is at 10.0.2.2
|
* TCP mode for android, localhost is at 10.0.2.2
|
||||||
|
@ -112,6 +112,8 @@ uint32_t RadioInterface::getPacketTime(MeshPacket *p)
|
|||||||
/** The delay to use for retransmitting dropped packets */
|
/** The delay to use for retransmitting dropped packets */
|
||||||
uint32_t RadioInterface::getRetransmissionMsec(const MeshPacket *p)
|
uint32_t RadioInterface::getRetransmissionMsec(const MeshPacket *p)
|
||||||
{
|
{
|
||||||
|
assert(shortPacketMsec); // Better be non zero
|
||||||
|
|
||||||
// was 20 and 22 secs respectively, but now with shortPacketMsec as 2269, this should give the same range
|
// was 20 and 22 secs respectively, but now with shortPacketMsec as 2269, this should give the same range
|
||||||
return random(9 * shortPacketMsec, 10 * shortPacketMsec);
|
return random(9 * shortPacketMsec, 10 * shortPacketMsec);
|
||||||
}
|
}
|
||||||
|
@ -212,13 +212,6 @@ class SimRadio : public RadioInterface
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual ErrorCode send(MeshPacket *p);
|
virtual ErrorCode send(MeshPacket *p);
|
||||||
|
|
||||||
// methods from radiohead
|
|
||||||
|
|
||||||
/// Initialise the Driver transport hardware and software.
|
|
||||||
/// Make sure the Driver is properly configured before calling init().
|
|
||||||
/// \return true if initialisation succeeded.
|
|
||||||
virtual bool init() { return true; }
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Debug printing for packets
|
/// Debug printing for packets
|
||||||
|
Loading…
Reference in New Issue
Block a user