diff --git a/Controller/main_mode.c b/Controller/main_mode.c index 528b861..5b8f430 100644 --- a/Controller/main_mode.c +++ b/Controller/main_mode.c @@ -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" @@ -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(); + } @@ -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 diff --git a/LHe-Level-Meter.cproj b/LHe-Level-Meter.cproj index f5028d3..12b1a1e 100644 --- a/LHe-Level-Meter.cproj +++ b/LHe-Level-Meter.cproj @@ -28,15 +28,15 @@ 0 - - - - - - - - - + + + + + + + + + com.atmel.avrdbg.tool.powerdebugger J50200002200 @@ -54,7 +54,7 @@ STK500 ISP - 944399 + 976237 @@ -69,7 +69,7 @@ - 944399 + 976237 220000 true false diff --git a/avr-util-library b/avr-util-library index fd90032..515e9be 160000 --- a/avr-util-library +++ b/avr-util-library @@ -1 +1 @@ -Subproject commit fd900322de9a159eb6b8558e6ffa5de09f58a11c +Subproject commit 515e9be645ed7de67d6717ec734a381218e0cd97