From 792625bab121139f4ea7107a5bb938fb132d4b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Heredero?= Date: Mon, 28 Aug 2023 18:23:11 +0200 Subject: [PATCH] move eeprom --- .../app/factory/factory.h | 2 +- .../{eeprom_interface.c => eeprom.c} | 18 +++++++++--------- .../{eeprom_interface.h => eeprom.h} | 0 .../nbproject/configurations.xml | 7 ++++--- 4 files changed, 14 insertions(+), 13 deletions(-) rename 306-controller_interface.X/middleware/{eeprom_interface.c => eeprom.c} (92%) rename 306-controller_interface.X/middleware/{eeprom_interface.h => eeprom.h} (100%) diff --git a/306-controller_interface.X/app/factory/factory.h b/306-controller_interface.X/app/factory/factory.h index 7b21e07..b847d38 100644 --- a/306-controller_interface.X/app/factory/factory.h +++ b/306-controller_interface.X/app/factory/factory.h @@ -19,7 +19,7 @@ #include "../../middleware/alive_checker.h" #include "../../middleware/can_interface.h" #include "../../middleware/watchdog.h" -#include "../../middleware/eeprom_interface.h" +#include "../../middleware/eeprom.h" typedef struct { diff --git a/306-controller_interface.X/middleware/eeprom_interface.c b/306-controller_interface.X/middleware/eeprom.c similarity index 92% rename from 306-controller_interface.X/middleware/eeprom_interface.c rename to 306-controller_interface.X/middleware/eeprom.c index 657329c..48c8a58 100644 --- a/306-controller_interface.X/middleware/eeprom_interface.c +++ b/306-controller_interface.X/middleware/eeprom.c @@ -5,7 +5,7 @@ * @file eeprom_interface.h */ -#include "eeprom_interface.h" +#include "eeprom.h" #include "../app/car.h" typedef union { @@ -33,20 +33,20 @@ void MEM_init(){ CAR_CST.JOYSTICK_MODE = 0; CAR_CST.JOYSTICK_PARAM1 = 100; CAR_CST.JOYSTICK_PARAM2 = 1; - CAR_CST.JOYSTICK_ALIVE_TIME = 50; + CAR_CST.JOYSTICK_ALIVE_TIME = 10; - CAR_CST.DISPLAY_ALIVE_TIME = 0; + CAR_CST.DISPLAY_ALIVE_TIME = 50; CAR_CST.DRIVE_SPEED_TIME = 0; CAR_CST.DRIVE_STOP_TIME = 0; - CAR_CST.DRIVE_ALIVE_TIME = 0; + CAR_CST.DRIVE_ALIVE_TIME = 10; - CAR_CST.STEERING_ALIVE_TIME = 0; + CAR_CST.STEERING_ALIVE_TIME = 100; - CAR_CST.BATTERY_VOLT_TIME = 0; - CAR_CST.BATTERY_CURRENT_TIME = 0; - CAR_CST.BATTERY_ENERGY_TIME = 0; - CAR_CST.BATTERY_ALIVE_TIME = 0; + CAR_CST.BATTERY_VOLT_TIME = 50; + CAR_CST.BATTERY_CURRENT_TIME = 50; + CAR_CST.BATTERY_ENERGY_TIME = 50; + CAR_CST.BATTERY_ALIVE_TIME = 50; MEM_write_1_byte(MEMADD_CONTROL_STEERING_MODE, CAR_CST.CONTROL_STEERING_MODE); MEM_write_1_byte(MEMADD_CONTROL_ALIVE_TIME, CAR_CST.CONTROL_ALIVE_TIME); diff --git a/306-controller_interface.X/middleware/eeprom_interface.h b/306-controller_interface.X/middleware/eeprom.h similarity index 100% rename from 306-controller_interface.X/middleware/eeprom_interface.h rename to 306-controller_interface.X/middleware/eeprom.h diff --git a/306-controller_interface.X/nbproject/configurations.xml b/306-controller_interface.X/nbproject/configurations.xml index fcd71c2..8a70ed6 100644 --- a/306-controller_interface.X/nbproject/configurations.xml +++ b/306-controller_interface.X/nbproject/configurations.xml @@ -27,7 +27,7 @@ middleware/can_interface.h middleware/alive_checker.h middleware/watchdog.h - middleware/eeprom_interface.h + middleware/eeprom.h xf/event.h @@ -64,7 +64,7 @@ middleware/can_interface.c middleware/alive_checker.c middleware/watchdog.c - middleware/eeprom_interface.c + middleware/eeprom.c xf/event.c @@ -94,7 +94,7 @@ PICkit3PlatformTool XC8 2.41 - 3 + 2 @@ -216,6 +216,7 @@ +