Frederico Prado
EZR
Dependencies: CRC16 FreescaleIAP FreescaleWatchdog GGSProtocol LM75B PIMA Parameters PersistentCircularQueue SerialNumberV2COM mbed-dev-watchdog_2016_03_04
Fork of
smartRamalKW
by 
Equipe Firmware V2COM
Revision 34:5ed86c867c08, committed 2016-03-04
- Comitter:
- fprado
- Date:
- Fri Mar 04 20:47:19 2016 +0000
- Parent:
- 28:af7e6b1b6f48
- Child:
- 35:78614a27b9e6
- Commit message:
- - Announce agora ? incializado corretamente no modo ramal
Changed in this revision
--- a/FreescaleIAP.lib Tue Dec 08 13:23:49 2015 +0000 +++ b/FreescaleIAP.lib Fri Mar 04 20:47:19 2016 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/Sissors/code/FreescaleIAP/#474d231b2f35 +http://mbed.org/users/Sissors/code/FreescaleIAP/#6749f7702fa5
--- a/GGSProtocol.lib Tue Dec 08 13:23:49 2015 +0000 +++ b/GGSProtocol.lib Fri Mar 04 20:47:19 2016 +0000 @@ -1,1 +1,1 @@ -http://developer.mbed.org/teams/Equipe-Firmware-V2COM/code/GGSProtocol/#b61cfea70092 +http://developer.mbed.org/teams/Equipe-Firmware-V2COM/code/GGSProtocol/#788d0fdc328a
--- a/announce.cpp Tue Dec 08 13:23:49 2015 +0000
+++ b/announce.cpp Fri Mar 04 20:47:19 2016 +0000
@@ -59,7 +59,8 @@
return;
}
- announceBuffer[19] = (++announceBuffer[19])%256;
+ announceBuffer[19]++;
+ announceBuffer[19] %= 256;
#ifdef RAMAL
memcpy(announceBuffer+21, MEDIDOR_DEFAULT_SN, MEDIDOR_LENGTH);
#else
--- a/main.cpp Tue Dec 08 13:23:49 2015 +0000
+++ b/main.cpp Fri Mar 04 20:47:19 2016 +0000
@@ -47,6 +47,10 @@
announce.setDelayCoefs(APP_PARAMETERS.DISCOVERY_DELAY_ANG_COEF_MS, APP_PARAMETERS.DISCOVERY_DELAY_LIN_COEF_MS);
announce.setIntervals(APP_PARAMETERS.ANNOUNCE_INTERVAL_S, APP_PARAMETERS.INTERVALO_SILENCIO_S);
+#ifdef RAMAL
+ announce.startAnnounceTimer();
+#endif
+
while(1){
exec.trataPacoteGGS();
#ifndef RAMAL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mbed-dev.lib Fri Mar 04 20:47:19 2016 +0000 @@ -0,0 +1,1 @@ +https://developer.mbed.org/teams/Equipe-Firmware-V2COM/code/mbed-dev-watchdog_2016_03_04/#453835d1fcca
--- a/mbed-src-watchdog.lib Tue Dec 08 13:23:49 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -http://developer.mbed.org/teams/Equipe-Firmware-V2COM/code/mbed-src-watchdog/#f54096b70ee9
--- a/settings.h Tue Dec 08 13:23:49 2015 +0000 +++ b/settings.h Fri Mar 04 20:47:19 2016 +0000 @@ -3,7 +3,7 @@ //#define TEST_MODE 1 // Usado para testar na placa de desenvolvimento //#define DEBUG_ENABLED 1 // Habilita log na USB UART -//#define RAMAL 1 // configura a aplicação para modo ramal (o normal é smart breaker) +#define RAMAL 1 // configura a aplicação para modo ramal (o normal é smart breaker) //#define RELES_INVERTIDOS 1 #define MEDIDOR_DEFAULT_SN "\0\0\0\0\0\0\0" // para uso com equipamentos sem medidor