Browse Source

reset password

balbekova 7 years ago
parent
commit
7184e79a45
3 changed files with 9 additions and 6 deletions
  1. 2 4
      modules/jumper/jumper.c
  2. 1 1
      modules/jumper/jumper.h
  3. 6 1
      user/init_task.c

+ 2 - 4
modules/jumper/jumper.c

@@ -8,11 +8,9 @@
 #include <stdbool.h>
 #include "gpio.h"
 
-bool value_jumper;
-
-void set_mode_jumper(void)
+bool set_mode_jumper(void)
 {
-	value_jumper = gpio_get(MODE_JUMPER);
+	return gpio_get(MODE_JUMPER);
 }
 
 

+ 1 - 1
modules/jumper/jumper.h

@@ -9,6 +9,6 @@
 #define JUMPER_H_
 
 
-void set_mode_jumper(void);
+bool set_mode_jumper(void);
 
 #endif /* JUMPER_H_ */

+ 6 - 1
user/init_task.c

@@ -20,6 +20,7 @@
 #include "buttons.h"
 #include "jumper.h"
 #include "rtc.h"
+#include "log.h"
 #include "stm32f4x7_eth_bsp.h"
 #include "netconf.h"
 #include "udp_netsetting.h"
@@ -83,7 +84,11 @@ void InitTask(void *params)
   SETTINGS_Save();*/
   SETTINGS_Load();
 
-  set_mode_jumper();
+	if(set_mode_jumper()){
+		SETTINGS_SetServiceDef();
+		SETTINGS_Save();
+		log_event_data(LOG_PSW_CHANGE, "Сброс к заводскому");
+	}
 // -----------------------------------------------------------------------------    
   
 // -----------------------------------------------------------------------------