diff --git a/software/dumber3/.cproject b/software/dumber3/.cproject
index 1ad41af..5803ce2 100644
--- a/software/dumber3/.cproject
+++ b/software/dumber3/.cproject
@@ -164,9 +164,10 @@
-
+
@@ -201,9 +202,10 @@
+
-
+
diff --git a/software/dumber3/.settings/language.settings.xml b/software/dumber3/.settings/language.settings.xml
index d309561..92b220b 100644
--- a/software/dumber3/.settings/language.settings.xml
+++ b/software/dumber3/.settings/language.settings.xml
@@ -16,7 +16,6 @@
-
diff --git a/software/dumber3/Application/application.c b/software/dumber3/Application/application.c
index 515a919..b281a06 100644
--- a/software/dumber3/Application/application.c
+++ b/software/dumber3/Application/application.c
@@ -370,6 +370,7 @@ void APPLICATION_TransitionToNewState(APPLICATION_State new_state) {
LEDS_Set(ledState);
MOTEURS_Stop();
+ systemTimeout.inactivityCnt=0;
systemTimeout.watchdogEnabled=0;
break;
case stateRun:
@@ -443,20 +444,22 @@ void vTimerTimeoutCallback( TimerHandle_t xTimer ) {
APPLICATION_TransitionToNewState(stateIdle);
}
- systemTimeout.inactivityCnt++;
- if (systemTimeout.inactivityCnt>=(APPLICATION_INACTIVITY_TIMEOUT/100))
- /* send a message Button_Pressed to enable power off */
- MESSAGE_SendMailbox(APPLICATION_Mailbox, MSG_ID_BUTTON_PRESSED, APPLICATION_Mailbox, (void*)NULL);
+ if (systemInfos.state != stateInCharge) {
+ systemTimeout.inactivityCnt++;
+ if (systemTimeout.inactivityCnt>=(APPLICATION_INACTIVITY_TIMEOUT/100))
+ /* send a message Button_Pressed to enable power off */
+ MESSAGE_SendMailbox(APPLICATION_Mailbox, MSG_ID_BUTTON_PRESSED, APPLICATION_Mailbox, (void*)NULL);
- if (systemTimeout.watchdogEnabled) {
- systemTimeout.watchdogCnt++;
+ if (systemTimeout.watchdogEnabled) {
+ systemTimeout.watchdogCnt++;
- if (systemTimeout.watchdogCnt>(APPLICATION_WATCHDOG_MAX/100)) {
- systemTimeout.watchdogCnt=0;
- systemTimeout.watchdogMissedCnt++;
+ if (systemTimeout.watchdogCnt>(APPLICATION_WATCHDOG_MAX/100)) {
+ systemTimeout.watchdogCnt=0;
+ systemTimeout.watchdogMissedCnt++;
+ }
+
+ if (systemTimeout.watchdogMissedCnt>=APPLICATION_WATCHDOG_MISSED_MAX)
+ APPLICATION_TransitionToNewState(stateWatchdogDisable); /* TODO: Reprendre pour en faire un envoi de message */
}
-
- if (systemTimeout.watchdogMissedCnt>=APPLICATION_WATCHDOG_MISSED_MAX)
- APPLICATION_TransitionToNewState(stateWatchdogDisable); /* TODO: Reprendre pour en faire un envoi de message */
}
}
diff --git a/software/dumber3/Application/config.h b/software/dumber3/Application/config.h
index 430cd39..8bc327d 100644
--- a/software/dumber3/Application/config.h
+++ b/software/dumber3/Application/config.h
@@ -7,9 +7,9 @@
#include "stm32l0xx_hal.h"
#include "cmsis_os.h"
-// current version is 2.0
-#define SYSTEM_VERSION_STR "2.0"
-#define SYSTEM_VERSION 0x0200 // Upper byte: major version, lower byte: minor version
+// current version is 2.1
+#define SYSTEM_VERSION_STR "2.1"
+#define SYSTEM_VERSION 0x0201 // Upper byte: major version, lower byte: minor version
#define STACK_SIZE 0x100
diff --git a/software/dumber3/Dumber3 Release.launch b/software/dumber3/Dumber3 Release.launch
new file mode 100644
index 0000000..f8ea235
--- /dev/null
+++ b/software/dumber3/Dumber3 Release.launch
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+