aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-02-06 15:26:06 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-02-06 15:26:06 +0200
commit5fee5aaa6f9e9f4e5b72a8fd4b7709bc3d6e8a1a (patch)
treea4acea5bf17fff0a1d4dd356cc880ff2bd5bc6f4 /Software/Embedded_SW/Embedded
parent33c0ce2e46a6fca8b48396f8aab1150197af20f3 (diff)
downloadTango-5fee5aaa6f9e9f4e5b72a8fd4b7709bc3d6e8a1a.tar.gz
Tango-5fee5aaa6f9e9f4e5b72a8fd4b7709bc3d6e8a1a.zip
fix addresses, minimal idle time 1 hour
Diffstat (limited to 'Software/Embedded_SW/Embedded')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h4
-rw-r--r--Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h
index 39c892e0a..48ea546ac 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.h
@@ -37,8 +37,8 @@ typedef enum {
EEPROM_STORAGE_EMBEDDED_VERSION,
MAX_EEPROM_STORAGE
}EEPROM_STORAGE_USAGE_ENUM;
-#define MAX_SERIAL_NUM_LEN 20
-#define MAX_MAC_ADDR_LEN 8
+#define MAX_SERIAL_NUM_LEN 5 //5*4 bytes
+#define MAX_MAC_ADDR_LEN 2 //2*4 bytes
#define SERIAL_NUM_ADDR EEPROM_STORAGE_SERIAL_NUM*4
#define MAC_ADDR_ADDR (SERIAL_NUM_ADDR + MAX_SERIAL_NUM_LEN)
#define DRYER_BACKLASH_ADDR (MAC_ADDR_ADDR + MAX_MAC_ADDR_LEN)
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
index 2a39a83bc..cbb2928b4 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
@@ -116,7 +116,8 @@ void PowerIdleInit(void)
}
void PowerIdleSetParameters(uint32_t switchtoidletimeinseconds,uint32_t idledriertemperature,uint32_t idleheadtemperature,uint32_t idlemixertemperature)
{
- powerIdleSecondsLimit = switchtoidletimeinseconds;
+ if (switchtoidletimeinseconds >= DEFAULT_IDLE_TIME_LIMIT)
+ powerIdleSecondsLimit = switchtoidletimeinseconds;
IdleDrierTemperature = idledriertemperature;
IdleHeadTemperature = idleheadtemperature;
IdleMixerTemperature = idlemixertemperature;