Skip to content

Xbee association fix #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bilchreis wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Xbee association fix #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ed1be5
connect changes
Dec 18, 2025
4805e02
updated avr-lib
Dec 18, 2025
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
17 changes: 11 additions & 6 deletions Controller/main_mode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include "xbee.h"
#include "xbee_AT_comm.h"
#include "printInfo_strings.h"
#include "xbee_utilities.h"
#include "I2C_utilities.h"
#include "status.h"
Expand Down Expand Up @@ -265,8 +266,16 @@ void main_pressedDOWN(Controller_Model *Model){

if (Model->mode->netstat == online)
{

xbee_wake_up_plus();

InitScreen_AddLine(STR_NETWORK_CONN,1);
InitScreen_AddLine(STR_IN_PROGRESS,0);

if (xbee.netstat == NO_NETWORK)
{
xbee_reset_SC();
}



Expand All @@ -278,14 +287,10 @@ void main_pressedDOWN(Controller_Model *Model){
if (HoneywellSSC_status.status < 4) LVM.vars->pressure_level = HoneywellSSC_Pressure;
}

xbee_wake_up_plus();



if (xbee.netstat == NO_NETWORK)
{
xbee_Set_Scan_Channels(LVM.options->SC_mask);
xbee_WR();
}


// Define frame

Expand Down
22 changes: 11 additions & 11 deletions LHe-Level-Meter.cproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
<eraseonlaunchrule>0</eraseonlaunchrule>
<AsfFrameworkConfig>
<framework-data>
<options />
<configurations />
<files />
<documentation help="" />
<offline-documentation help="" />
<dependencies>
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.44.1" />
</dependencies>
</framework-data>
<options />
<configurations />
<files />
<documentation help="" />
<offline-documentation help="" />
<dependencies>
<content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.44.1" />
</dependencies>
</framework-data>
</AsfFrameworkConfig>
<avrtool>com.atmel.avrdbg.tool.powerdebugger</avrtool>
<avrtoolserialnumber>J50200002200</avrtoolserialnumber>
Expand All @@ -54,7 +54,7 @@
<ToolName>STK500</ToolName>
</com_atmel_avrdbg_tool_stk500>
<avrtoolinterface>ISP</avrtoolinterface>
<avrtoolinterfaceclock>944399</avrtoolinterfaceclock>
<avrtoolinterfaceclock>976237</avrtoolinterfaceclock>
<com_atmel_avrdbg_tool_simulator>
<ToolOptions>
<InterfaceProperties>
Expand All @@ -69,7 +69,7 @@
<com_atmel_avrdbg_tool_powerdebugger>
<ToolOptions>
<InterfaceProperties>
<IspClock>944399</IspClock>
<IspClock>976237</IspClock>
<JtagDbgClock>220000</JtagDbgClock>
<JtagEnableExtResetOnStartSession>true</JtagEnableExtResetOnStartSession>
<JtagInChain>false</JtagInChain>
Expand Down
2 changes: 1 addition & 1 deletion avr-util-library
Open in desktop
Submodule avr-util-library updated 2 files
+11 −14 xbee.c
+36 −1 xbee.h