Programme de contrôle de l'octopode 4DOF, Theraphosa-Salconi.

Dependencies:   debug mbed

CtrlBridge

  • fonction quelquonque pour communiquer avec les module
  • fonction quelquonque pour faire des recherche dans les module dispo
  • autre fonction pour jouer avec MemRegistre

Version 1.2.0

  • Ajout d'un mode de simulation pour tester le code avec seulement un contrôleur stm32
Committer:
salco
Date:
Thu Apr 23 19:28:42 2015 +0000
Revision:
18:3f113f8441b2
Parent:
17:095f670f9c14
Child:
27:ea60d12dccdf
communication fonctionelle je suis rendu a faire des teste avec les task, la communication est plutot basic pour le moment.

Who changed what in which revision?

UserRevisionLine numberNew contents of line
salco 7:dcfd81d7f93f 1
salco 7:dcfd81d7f93f 2 #include "ComSpi.h"
salco 7:dcfd81d7f93f 3
salco 7:dcfd81d7f93f 4 ComSpi::ComSpi(PinName mosi, PinName miso, PinName sclk, PinName _unused) : SPI(mosi,miso,sclk,_unused)
salco 7:dcfd81d7f93f 5 {
salco 7:dcfd81d7f93f 6 // m_com = new SPI(mosi,miso,sclk,_unused);
salco 7:dcfd81d7f93f 7 //m_regPortUse=0;
salco 7:dcfd81d7f93f 8 //m_regPortLost=0;
salco 7:dcfd81d7f93f 9 m_demuxPos=0;
salco 7:dcfd81d7f93f 10 demuxIsUse=false;
salco 15:91b3c572d9df 11 chainedListFirst = 0;
salco 15:91b3c572d9df 12 chainedListLast = 0;
salco 15:91b3c572d9df 13 flagSPI.getBytes = 0;
salco 15:91b3c572d9df 14 //result = 0;
salco 15:91b3c572d9df 15 counterData = 0;
salco 15:91b3c572d9df 16 counterTotale = 0;
salco 15:91b3c572d9df 17 /*for(int i=0;i<MAXTABLE;i++)
salco 15:91b3c572d9df 18 {
salco 15:91b3c572d9df 19 bufferSend[i] = 0;
salco 15:91b3c572d9df 20 bufferReceive[i] = 0;
salco 15:91b3c572d9df 21 }
salco 15:91b3c572d9df 22 bufferSend[0] = SYNC;*/
salco 15:91b3c572d9df 23 }
salco 15:91b3c572d9df 24
salco 15:91b3c572d9df 25 struct module_t* ComSpi::createModule(void) {
salco 15:91b3c572d9df 26 if(chainedListFirst == 0) {
salco 15:91b3c572d9df 27 chainedListFirst = new module_t ;
salco 15:91b3c572d9df 28 chainedListLast = chainedListFirst;
salco 15:91b3c572d9df 29 } else {
salco 15:91b3c572d9df 30 chainedListLast->next = new module_t;
salco 15:91b3c572d9df 31 chainedListLast = chainedListLast->next;
salco 15:91b3c572d9df 32 }
salco 15:91b3c572d9df 33 chainedListLast->next = 0;
salco 15:91b3c572d9df 34 return chainedListLast;
salco 7:dcfd81d7f93f 35 }
salco 7:dcfd81d7f93f 36
salco 7:dcfd81d7f93f 37 ComSpi::ComSpi(PinName mosi, PinName miso, PinName sclk, PinName demuxA, PinName demuxB, PinName demuxC, PinName demuxD, PinName demuxEnable)
salco 11:496453b45e25 38 : SPI(mosi,miso,sclk), m_demuxA(demuxA), m_demuxB(demuxB), m_demuxC(demuxC), m_demuxD(demuxD), m_demuxEnable(demuxEnable)
salco 7:dcfd81d7f93f 39 {
salco 7:dcfd81d7f93f 40 m_demuxPos=0;
salco 7:dcfd81d7f93f 41 demuxIsUse=true;
salco 15:91b3c572d9df 42 format(8,0);//16,0); //recente modification
salco 7:dcfd81d7f93f 43 }
salco 7:dcfd81d7f93f 44
salco 7:dcfd81d7f93f 45 ComSpi::~ComSpi()
salco 7:dcfd81d7f93f 46 {
salco 15:91b3c572d9df 47 //pt deleter les pointeur mais sa ser pas vrm a grand chause
salco 7:dcfd81d7f93f 48 //if(m_com)
salco 7:dcfd81d7f93f 49 // delete(m_com);
salco 7:dcfd81d7f93f 50 }
salco 7:dcfd81d7f93f 51 void ComSpi::change_demux(void)
salco 7:dcfd81d7f93f 52 {
salco 9:7295385f02b2 53 if(demuxIsUse) {
salco 10:7e6aeaebe1a2 54 DigitalOut pinDemuxA(m_demuxA);
salco 10:7e6aeaebe1a2 55 DigitalOut pinDemuxB(m_demuxB);
salco 10:7e6aeaebe1a2 56 DigitalOut pinDemuxC(m_demuxC);
salco 10:7e6aeaebe1a2 57 DigitalOut pinDemuxD(m_demuxD);
salco 15:91b3c572d9df 58 DigitalOut pinDemuxEnable(m_demuxEnable);//,1);
salco 15:91b3c572d9df 59 //wait(1);
salco 10:7e6aeaebe1a2 60 pinDemuxEnable=0;
salco 15:91b3c572d9df 61 //wait(1);
salco 10:7e6aeaebe1a2 62 if(m_demuxPos & 1) pinDemuxA=1; //0b0001
salco 10:7e6aeaebe1a2 63 else pinDemuxA=0;
salco 10:7e6aeaebe1a2 64 if(m_demuxPos & 2) pinDemuxB=1; //0b0010
salco 10:7e6aeaebe1a2 65 else pinDemuxB=0;
salco 10:7e6aeaebe1a2 66 if(m_demuxPos & 4) pinDemuxC=1; //0b0100
salco 10:7e6aeaebe1a2 67 else pinDemuxC=0;
salco 10:7e6aeaebe1a2 68 if(m_demuxPos & 8) pinDemuxD=1; //0b1000
salco 10:7e6aeaebe1a2 69 else pinDemuxD=0;
salco 15:91b3c572d9df 70 //wait(1);
salco 17:095f670f9c14 71 // pinDemuxEnable=1;
salco 15:91b3c572d9df 72 //wait(1);
salco 9:7295385f02b2 73 }
salco 7:dcfd81d7f93f 74 }
salco 9:7295385f02b2 75 char ComSpi::next_demux(void)
salco 7:dcfd81d7f93f 76 {
salco 9:7295385f02b2 77 char result = (char)-1;
salco 7:dcfd81d7f93f 78
salco 7:dcfd81d7f93f 79 if(demuxIsUse) {
salco 7:dcfd81d7f93f 80 (m_demuxPos == 15)? m_demuxPos=0:m_demuxPos++;
salco 7:dcfd81d7f93f 81 change_demux();
salco 9:7295385f02b2 82 result = m_demuxPos;
salco 7:dcfd81d7f93f 83 }
salco 7:dcfd81d7f93f 84 return result;
salco 7:dcfd81d7f93f 85 }
salco 9:7295385f02b2 86 char ComSpi::back_demux(void)
salco 7:dcfd81d7f93f 87 {
salco 9:7295385f02b2 88 char result = (char)-1;
salco 10:7e6aeaebe1a2 89
salco 7:dcfd81d7f93f 90 if(demuxIsUse) {
salco 7:dcfd81d7f93f 91 (m_demuxPos == 0)? m_demuxPos=15:m_demuxPos--;
salco 7:dcfd81d7f93f 92 change_demux();
salco 10:7e6aeaebe1a2 93
salco 10:7e6aeaebe1a2 94 result = m_demuxPos;
salco 7:dcfd81d7f93f 95 }
salco 7:dcfd81d7f93f 96 return result;
salco 7:dcfd81d7f93f 97 }
salco 10:7e6aeaebe1a2 98 char ComSpi::get_demux(void)
salco 10:7e6aeaebe1a2 99 {
salco 10:7e6aeaebe1a2 100 char result = (char)-1;
salco 10:7e6aeaebe1a2 101 if(demuxIsUse)
salco 10:7e6aeaebe1a2 102 result=m_demuxPos;
salco 10:7e6aeaebe1a2 103 return result ;
salco 10:7e6aeaebe1a2 104 }
salco 15:91b3c572d9df 105 unsigned char spiCurrentState;
salco 15:91b3c572d9df 106 int ComSpi::write(int value)
salco 15:91b3c572d9df 107 {
salco 17:095f670f9c14 108 DigitalOut pinDemuxEnable(m_demuxEnable);
salco 15:91b3c572d9df 109 //DigitalOut pinDemuxEnable(m_demuxEnable,0);
salco 15:91b3c572d9df 110 int a;
salco 17:095f670f9c14 111 pinDemuxEnable=1;
salco 17:095f670f9c14 112 /* switch(spiCurrentState)
salco 15:91b3c572d9df 113 {
salco 17:095f670f9c14 114 case 0:
salco 17:095f670f9c14 115 a= SPI::write(0x12);
salco 17:095f670f9c14 116 spiCurrentState++;
salco 17:095f670f9c14 117 break;
salco 17:095f670f9c14 118 default:
salco 17:095f670f9c14 119 a= SPI::write(0xF5);
salco 17:095f670f9c14 120 spiCurrentState =0;
salco 17:095f670f9c14 121 break;
salco 15:91b3c572d9df 122 }*/
salco 17:095f670f9c14 123 wait_us(5);
salco 15:91b3c572d9df 124 a= SPI::write(value);
salco 15:91b3c572d9df 125 wait_us(5);
salco 17:095f670f9c14 126 pinDemuxEnable=0;
salco 17:095f670f9c14 127 sneekpeek.append(1,value);
salco 17:095f670f9c14 128 wait_us(1000);
salco 15:91b3c572d9df 129 return a;
salco 15:91b3c572d9df 130 }
salco 15:91b3c572d9df 131
salco 10:7e6aeaebe1a2 132
salco 14:ca1a9230ba7f 133 bool ComSpi::send(char portID,unsigned char adresseModule,string *flag,string *data)
salco 7:dcfd81d7f93f 134 {
salco 7:dcfd81d7f93f 135 bool result=false;
salco 10:7e6aeaebe1a2 136 string formatedDataSend;
salco 15:91b3c572d9df 137 string formatedDataReceive;//DEBUG_COMPACT
salco 15:91b3c572d9df 138 char settingMaster = 0;
salco 15:91b3c572d9df 139 char settingSlave = 0;
salco 12:bf44013497c8 140
salco 15:91b3c572d9df 141 debug(DEBUG_SEND| DEBUG_COMPACT, "\n\r -Debut du send. ");
salco 12:bf44013497c8 142
salco 11:496453b45e25 143 debug(DEBUG_SEND, "\n\r -Debut set demux. ");
salco 15:91b3c572d9df 144
salco 15:91b3c572d9df 145 if(portID < 1) portID = 0;
salco 15:91b3c572d9df 146 else if(portID > 16) portID = 16;
salco 15:91b3c572d9df 147 debug(DEBUG_SEND, "\n\r -Change PORT. ");
salco 15:91b3c572d9df 148 m_demuxPos = portID;
salco 15:91b3c572d9df 149 change_demux();
salco 15:91b3c572d9df 150
salco 11:496453b45e25 151 debug(DEBUG_SEND, "\n\r -Fin set demux. ");
salco 12:bf44013497c8 152
salco 10:7e6aeaebe1a2 153 // Sync //
salco 11:496453b45e25 154 debug(DEBUG_SEND, "\n\r -Debut Sync. ");
salco 10:7e6aeaebe1a2 155 formatedDataSend.append(1,SYNC);
salco 15:91b3c572d9df 156 debug(DEBUG_COMPACT, "\n\r -SYNC ADDED: %02X ",formatedDataSend[0]);
salco 11:496453b45e25 157 debug(DEBUG_SEND, "\n\r -Fin Sync. ");
salco 12:bf44013497c8 158
salco 10:7e6aeaebe1a2 159 // Address //
salco 11:496453b45e25 160 debug(DEBUG_SEND, "\n\r -Debut Address. ");
salco 10:7e6aeaebe1a2 161 formatedDataSend.append(1,adresseModule);
salco 15:91b3c572d9df 162 debug(DEBUG_COMPACT, "\n\r -ADDR ADDED: %02X, %02X ",formatedDataSend[0],formatedDataSend[1]);
salco 11:496453b45e25 163 debug(DEBUG_SEND, "\n\r -Fin Address. ");
salco 12:bf44013497c8 164
salco 10:7e6aeaebe1a2 165 // PFB //
salco 11:496453b45e25 166 debug(DEBUG_SEND, "\n\r -Debut PFB. ");
salco 17:095f670f9c14 167 // if(flag != 0)
salco 17:095f670f9c14 168 // {
salco 10:7e6aeaebe1a2 169 switch(flag->size()) {
salco 10:7e6aeaebe1a2 170 case 1:
salco 16:5ea4337d785f 171 if(flag->at(0) == 0) formatedDataSend.append(1,0<<6); //0 byte
salco 16:5ea4337d785f 172 else formatedDataSend.append(1,1<<6); //1 byte
salco 10:7e6aeaebe1a2 173 break;
salco 10:7e6aeaebe1a2 174
salco 10:7e6aeaebe1a2 175 case 2:
salco 15:91b3c572d9df 176 formatedDataSend.append(1,2<<6); //2 byte
salco 10:7e6aeaebe1a2 177 break;
salco 10:7e6aeaebe1a2 178
salco 10:7e6aeaebe1a2 179 case 3:
salco 15:91b3c572d9df 180 formatedDataSend.append(1,3<<6); //3 byte
salco 10:7e6aeaebe1a2 181 break;
salco 10:7e6aeaebe1a2 182
salco 10:7e6aeaebe1a2 183 default:
salco 16:5ea4337d785f 184 formatedDataSend.append(1,0<<6); //cas impossible //0 byte
salco 10:7e6aeaebe1a2 185 break;
salco 10:7e6aeaebe1a2 186 }
salco 16:5ea4337d785f 187 //}
salco 15:91b3c572d9df 188 debug(DEBUG_COMPACT, "\n\r -PFB ADDED: %02X, %02X, %02X ",formatedDataSend[0],formatedDataSend[1],formatedDataSend[2]);
salco 11:496453b45e25 189 debug(DEBUG_SEND, "\n\r -Fin PFB. ");
salco 12:bf44013497c8 190
salco 10:7e6aeaebe1a2 191 // gestion ACK/NAK
salco 11:496453b45e25 192 debug(DEBUG_SEND, "\n\r -Debut ACK/NAK. ");
salco 12:bf44013497c8 193 formatedDataSend.at(formatedDataSend.length()-1) |= (NOACK << 4);
salco 15:91b3c572d9df 194 debug(DEBUG_COMPACT, "\n\r -ACK ADDED: %02X, %02X, %02X ",formatedDataSend[0],formatedDataSend[1],formatedDataSend[2]);
salco 11:496453b45e25 195 debug(DEBUG_SEND, "\n\r -Fin ACK/NAK. ");
salco 12:bf44013497c8 196
salco 10:7e6aeaebe1a2 197 // NDB //
salco 11:496453b45e25 198 debug(DEBUG_SEND, "\n\r -Debut NDB. ");
salco 10:7e6aeaebe1a2 199 switch(data->size()) {
salco 10:7e6aeaebe1a2 200 case 1:
salco 12:bf44013497c8 201 formatedDataSend.at(formatedDataSend.length()-1) |= 1;
salco 10:7e6aeaebe1a2 202 break;
salco 10:7e6aeaebe1a2 203
salco 10:7e6aeaebe1a2 204 case 2:
salco 12:bf44013497c8 205 formatedDataSend.at(formatedDataSend.length()-1) |= 2;
salco 10:7e6aeaebe1a2 206 break;
salco 10:7e6aeaebe1a2 207
salco 10:7e6aeaebe1a2 208 case 3:
salco 12:bf44013497c8 209 formatedDataSend.at(formatedDataSend.length()-1) |= 3;
salco 10:7e6aeaebe1a2 210 break;
salco 10:7e6aeaebe1a2 211
salco 10:7e6aeaebe1a2 212 default:
salco 12:bf44013497c8 213 formatedDataSend.at(formatedDataSend.length()-1) |= 0;
salco 10:7e6aeaebe1a2 214 break;
salco 10:7e6aeaebe1a2 215 }
salco 15:91b3c572d9df 216 //debug(DEBUG_COMPACT, "\n\r -NDB ADDED: %02X, %02X, %02X ",formatedDataSend[0],formatedDataSend[1],formatedDataSend[2]);
salco 11:496453b45e25 217 debug(DEBUG_SEND, "\n\r -Fin NDB. ");
salco 12:bf44013497c8 218
salco 15:91b3c572d9df 219 settingMaster = formatedDataSend[formatedDataSend.length()-1];
salco 17:095f670f9c14 220
salco 10:7e6aeaebe1a2 221 // flag //
salco 11:496453b45e25 222 debug(DEBUG_SEND, "\n\r -Debut flag. ");
salco 12:bf44013497c8 223 if(flag->size() != 0) {
salco 10:7e6aeaebe1a2 224 formatedDataSend.append(*flag);
salco 15:91b3c572d9df 225 //debug(DEBUG_COMPACT, "\n\r -FLAG ADDED: %02X, %02X, %02X, %02X ",formatedDataSend[0],formatedDataSend[1],formatedDataSend[2],formatedDataSend[3]);
salco 12:bf44013497c8 226 }
salco 11:496453b45e25 227 debug(DEBUG_SEND, "\n\r -Fin flag. ");
salco 12:bf44013497c8 228
salco 15:91b3c572d9df 229 //ici tu envoi deja ton premier stuf
salco 15:91b3c572d9df 230
salco 15:91b3c572d9df 231
salco 17:095f670f9c14 232 //debug(DEBUG_SLIM, "\n\r -settingMaster : %X , %i, %X ",settingMaster, (2+(settingMaster>>6)),formatedDataSend[(2+(settingMaster>>6))] );
salco 15:91b3c572d9df 233
salco 15:91b3c572d9df 234
salco 15:91b3c572d9df 235
salco 15:91b3c572d9df 236 for(int retryLoop=0; (retryLoop<3) && (!result); retryLoop++) {
salco 12:bf44013497c8 237
salco 15:91b3c572d9df 238 debug(DEBUG_SEND|DEBUG_COMPACT, "\n\r -Tentative: %d \n\r",retryLoop);
salco 15:91b3c572d9df 239 formatedDataReceive.clear();
salco 15:91b3c572d9df 240 settingSlave =0;
salco 15:91b3c572d9df 241 counterTotale =0;
salco 15:91b3c572d9df 242 sneekpeek.clear();
salco 15:91b3c572d9df 243 //Send Data
salco 15:91b3c572d9df 244 // debug(DEBUG_SEND, "\n\r -Debut Send Data. ");
salco 15:91b3c572d9df 245 // debug(DEBUG_SEND|DEBUG_COMPACT, "\n\r -Send: ");
salco 15:91b3c572d9df 246 // for (unsigned i=0; i<formatedDataSend.length(); ++i) debug(DEBUG_SEND |DEBUG_COMPACT, "%02X,",formatedDataSend.at(i));
salco 10:7e6aeaebe1a2 247
salco 15:91b3c572d9df 248 //int twoBytesArray;
salco 15:91b3c572d9df 249 //twoBytesArray = (formatedDataSend[0]<<8)|(formatedDataSend[1]);
salco 15:91b3c572d9df 250 //twoBytesArray=write(twoBytesArray);
salco 13:51bbdc349f20 251
salco 15:91b3c572d9df 252 for(int i = 0; (i < formatedDataSend.length()) && (i<=(2+(settingMaster>>6))); ++i) {
salco 15:91b3c572d9df 253 formatedDataReceive.append(1,write(formatedDataSend[i]));//debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -A:%i ",i);
salco 15:91b3c572d9df 254 debug(DEBUG_SEND |DEBUG_COMPACT, " %02X,",formatedDataSend.at(i));
salco 15:91b3c572d9df 255 }
salco 13:51bbdc349f20 256
salco 15:91b3c572d9df 257 if(formatedDataReceive[0] == SYNC) {
salco 15:91b3c572d9df 258 debug(DEBUG_COMPACT, "\n\r -Receve transmission. ");
salco 15:91b3c572d9df 259 //!!!!!!!! Problem ici write dans un mais pas lautre
salco 17:095f670f9c14 260 wait_us(3000);
salco 15:91b3c572d9df 261 if(retryLoop == 0) {
salco 15:91b3c572d9df 262 formatedDataSend.append(1,0);//2,0); cest une patch tempo parce que je trouve pas ou il manque la donner
salco 17:095f670f9c14 263 }
salco 15:91b3c572d9df 264 formatedDataReceive.append(1,write(0));
salco 17:095f670f9c14 265 // debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -B: ");
salco 17:095f670f9c14 266
salco 15:91b3c572d9df 267 settingSlave = formatedDataReceive[formatedDataReceive.length()-1];
salco 15:91b3c572d9df 268 debug(DEBUG_COMPACT, "\n\r -settingSlave %02X",settingSlave);
salco 15:91b3c572d9df 269 if(retryLoop == 0) {
salco 15:91b3c572d9df 270 /*switch(formatedDataReceive[formatedDataSend.length()-1] >> 6) {
salco 15:91b3c572d9df 271 case 1:
salco 15:91b3c572d9df 272 formatedDataSend.append(1,0); //1 byte
salco 15:91b3c572d9df 273 break;
salco 13:51bbdc349f20 274
salco 15:91b3c572d9df 275 case 2:
salco 15:91b3c572d9df 276 formatedDataSend.append(2,0); //2 byte
salco 15:91b3c572d9df 277 break;
salco 13:51bbdc349f20 278
salco 15:91b3c572d9df 279 case 3:
salco 15:91b3c572d9df 280 formatedDataSend.append(3,0); //3 byte
salco 15:91b3c572d9df 281 break;
salco 12:bf44013497c8 282
salco 15:91b3c572d9df 283 //default:
salco 15:91b3c572d9df 284 // formatedDataSend.append(1,0<<6); //0 byte
salco 15:91b3c572d9df 285 // break;
salco 15:91b3c572d9df 286 }*/
salco 15:91b3c572d9df 287 formatedDataSend.append(settingSlave>>6,0);
salco 18:3f113f8441b2 288 debug(DEBUG_COMPACT, "\n\r -append %02X time(s)",settingSlave>>6);
salco 15:91b3c572d9df 289 }
salco 13:51bbdc349f20 290
salco 15:91b3c572d9df 291 int bufferFlag = 0;
salco 15:91b3c572d9df 292
salco 15:91b3c572d9df 293 for(int i = (settingMaster>>6); i != 0; i--) { //ici on remplie le buffer des data du flag
salco 15:91b3c572d9df 294 // je considere avec erreur que il nexiste pas de flag plus grand que 2 bytes (facilite le code de depart)
salco 15:91b3c572d9df 295 //!!! Pt metre fonct stein qui tronc de debut a fin pour remplacer les linge dessous.
salco 15:91b3c572d9df 296 bufferFlag = bufferFlag<<8;
salco 15:91b3c572d9df 297 bufferFlag += formatedDataSend[2+i];
salco 13:51bbdc349f20 298 }
salco 12:bf44013497c8 299
salco 15:91b3c572d9df 300 counterTotale = ((2+(settingMaster>>6))+1);
salco 15:91b3c572d9df 301 counterTotale = counterTotale+(settingSlave>>6)+abs((settingMaster & 0x0F) - (settingSlave & 0x0F));
salco 17:095f670f9c14 302 //debug( "\n\r -size : %02X",counterTotale);
salco 17:095f670f9c14 303
salco 18:3f113f8441b2 304 if(retryLoop == 0) {
salco 18:3f113f8441b2 305 debug( "\n\r -size : %02X , %02X",formatedDataSend.size(),counterTotale);
salco 18:3f113f8441b2 306 if(formatedDataSend.size()<counterTotale) {
salco 18:3f113f8441b2 307 formatedDataSend.append(counterTotale+1-formatedDataSend.size(),0);
salco 18:3f113f8441b2 308 }
salco 18:3f113f8441b2 309 }
salco 18:3f113f8441b2 310
salco 18:3f113f8441b2 311
salco 15:91b3c572d9df 312 switch(bufferFlag) { //plus facile pour savoir ce que tu doit tatenre a recevoire
salco 15:91b3c572d9df 313 case 1://Request Init Info
salco 15:91b3c572d9df 314 if(retryLoop == 0) {
salco 17:095f670f9c14 315 //formatedDataSend.append(1,1<<6); //1 byte flag
salco 17:095f670f9c14 316 //formatedDataSend.append(settingSlave & 0x0F,0);
salco 15:91b3c572d9df 317 //chek pour comment avoir un address
salco 18:3f113f8441b2 318 /*if(formatedDataSend.size()<counterTotale) {
salco 17:095f670f9c14 319 formatedDataSend.append(counterTotale+1-formatedDataSend.size(),0);
salco 18:3f113f8441b2 320 }*/
salco 15:91b3c572d9df 321 }
salco 15:91b3c572d9df 322 //verifier si la fonction fait ce quil edt suposer
salco 17:095f670f9c14 323
salco 18:3f113f8441b2 324 /*for(int i = ((2+(settingMaster>>6))+1); i < formatedDataSend.length()-1; ++i) { //on envoi le reste des data
salco 15:91b3c572d9df 325 formatedDataReceive.append(1,write(formatedDataSend[i]));
salco 15:91b3c572d9df 326 //debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -C:%i ",i);
salco 18:3f113f8441b2 327 }*/
salco 17:095f670f9c14 328
salco 15:91b3c572d9df 329 //templatePtr =searchAddr(0);
salco 15:91b3c572d9df 330 // 1 byte flag + 3 byte de data
salco 15:91b3c572d9df 331 //bufferSend[4] = (1<<6) + 3;//[2+(bufferReceive[2]>>6)+1] = (1<<6);
salco 15:91b3c572d9df 332
salco 15:91b3c572d9df 333
salco 15:91b3c572d9df 334 //if((templatePtr->next)==0)
salco 15:91b3c572d9df 335 // bufferSend[5] = 0b101;//bufferReceive[2+(bufferReceive[2]>>6)+1+bufferReceive[2+(bufferReceive[2]>>6)+1]] = 0b101;
salco 15:91b3c572d9df 336 //else
salco 15:91b3c572d9df 337 // bufferSend[5] = 0b10;
salco 15:91b3c572d9df 338
salco 15:91b3c572d9df 339 //bufferSend[6] = templatePtr->basicInfo.osnapRegisterB.getByte;
salco 15:91b3c572d9df 340 //bufferSend[7] = templatePtr->basicInfo.osnapRegisterC.getByte;
salco 15:91b3c572d9df 341 //bufferSend[8] = templatePtr->basicInfo.osnapRegisterD.getByte;
salco 15:91b3c572d9df 342 break;
salco 15:91b3c572d9df 343
salco 15:91b3c572d9df 344 case 2: //Slave contient un/des autre(s) module(s) sans adresses
salco 15:91b3c572d9df 345 break;
salco 15:91b3c572d9df 346
salco 15:91b3c572d9df 347 case 3: //Flag Critique
salco 15:91b3c572d9df 348 break;
salco 15:91b3c572d9df 349
salco 15:91b3c572d9df 350 case 4: //Flag Alerte
salco 15:91b3c572d9df 351 break;
salco 15:91b3c572d9df 352
salco 15:91b3c572d9df 353 case 5: //Slave ne contient plus de module sans adresse
salco 15:91b3c572d9df 354 break;
salco 15:91b3c572d9df 355
salco 15:91b3c572d9df 356 case 6: //Master request address update
salco 15:91b3c572d9df 357 break;
salco 15:91b3c572d9df 358
salco 15:91b3c572d9df 359 default: //Get update (normale)
salco 16:5ea4337d785f 360 //if(retryLoop == 0) {
salco 16:5ea4337d785f 361 // formatedDataSend.append(abs((settingMaster & 0x0F) - (settingSlave & 0x0F)),0);//je considere que cest fait apres avoire ajouter les data a nous
salco 16:5ea4337d785f 362 // }
salco 15:91b3c572d9df 363 break;
salco 15:91b3c572d9df 364 }
salco 18:3f113f8441b2 365 // pas sur si cest une bonne ider mais sa peut peut etre regrouper tout les flags
salco 18:3f113f8441b2 366 for(int i = ((2+(settingMaster>>6))+1); i < formatedDataSend.length()-1; ++i) { //on envoi le reste des data
salco 18:3f113f8441b2 367 formatedDataReceive.append(1,write(formatedDataSend[i]));
salco 18:3f113f8441b2 368 //debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -C:%i ",i);
salco 18:3f113f8441b2 369 }
salco 15:91b3c572d9df 370 //counterTotale = 2+(bufferReceive[2]>>6)+1;
salco 15:91b3c572d9df 371 //counterTotale = counterTotale+(bufferSend[counterTotale]>>6)+abs((bufferReceive[2] & 0x5F) - (bufferSend[counterTotale] & 0x5F));
salco 15:91b3c572d9df 372
salco 15:91b3c572d9df 373
salco 15:91b3c572d9df 374
salco 15:91b3c572d9df 375 // Envoie le reste si liker //
salco 15:91b3c572d9df 376 // DATA //
salco 15:91b3c572d9df 377 unsigned short templateValue=0;
salco 15:91b3c572d9df 378 if(retryLoop == 0) {
salco 17:095f670f9c14 379 // CRC //
salco 17:095f670f9c14 380 debug(DEBUG_SEND, "\n\r -Debut CRC16. ");
salco 17:095f670f9c14 381 //CRC16* templateCRC;
salco 17:095f670f9c14 382 //templateCRC = new CRC16();
salco 17:095f670f9c14 383 //!!!utiliser string cest plus simple
salco 17:095f670f9c14 384
salco 15:91b3c572d9df 385
salco 17:095f670f9c14 386 //char templateTable[formatedDataSend.length()+1];
salco 17:095f670f9c14 387 //for (unsigned i=0; i<formatedDataSend.length()+1; ++i) templateTable[i]=0;
salco 17:095f670f9c14 388 //for (unsigned i=0; i<formatedDataSend.length(); ++i) templateTable[i]=formatedDataSend[i];
salco 17:095f670f9c14 389 //debug(DEBUG_SEND, "\n\r - envoi au crc: %02X,%02X,%02X,%02X,%02X,%02X ",templateTable[0],templateTable[1],templateTable[2],templateTable[3],templateTable[4],templateTable[5],templateTable[6]);
salco 17:095f670f9c14 390
salco 17:095f670f9c14 391 // templateValue = /*templateCRC->*/calculateCRC16(templateTable,formatedDataSend.size()-1); //atention pt un probleme de sortie du range
salco 17:095f670f9c14 392 //templateValue = /*templateCRC->calculateCRC16*/CRC16_BUYPASS(formatedDataSend.c_str(),formatedDataSend.size()); //atention pt un probleme de sortie du range
salco 17:095f670f9c14 393 templateValue =CRC16_BUYPASS(sneekpeek.c_str(),sneekpeek.size()); //patch
salco 17:095f670f9c14 394
salco 17:095f670f9c14 395 formatedDataSend.append(1,templateValue>>8);
salco 17:095f670f9c14 396 formatedDataSend.append(1,templateValue & 0xFF);
salco 15:91b3c572d9df 397 }
salco 15:91b3c572d9df 398 formatedDataReceive.append(1,write(formatedDataSend[formatedDataSend.size()-2]));//templateValue>>8));
salco 15:91b3c572d9df 399 //debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -D: ");
salco 15:91b3c572d9df 400 formatedDataReceive.append(1,write(formatedDataSend[formatedDataSend.size()-1]));//(templateValue & 0xFF));
salco 15:91b3c572d9df 401 //debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -E: ");
salco 17:095f670f9c14 402
salco 17:095f670f9c14 403
salco 17:095f670f9c14 404
salco 15:91b3c572d9df 405 ///////////////////////
salco 15:91b3c572d9df 406
salco 15:91b3c572d9df 407 //avant faut calculer les dernier byte grace a la version 2.0
salco 15:91b3c572d9df 408 /*for(int i = 0; i < formatedDataSend.length(); ++i) {
salco 15:91b3c572d9df 409 formatedDataReceive.append(1,write(formatedDataSend[i]));
salco 15:91b3c572d9df 410 }*/
salco 13:51bbdc349f20 411
salco 15:91b3c572d9df 412 // verification du CRC slave
salco 15:91b3c572d9df 413 // CRC //
salco 15:91b3c572d9df 414 templateValue = CRC16_BUYPASS(formatedDataReceive.c_str(),formatedDataReceive.size()-2);// utiliser les data de setting slave
salco 17:095f670f9c14 415
salco 15:91b3c572d9df 416 if(((templateValue>>8)==(formatedDataReceive.at( formatedDataReceive.length()-2))) &&
salco 17:095f670f9c14 417 ((templateValue&0xFF)==(formatedDataReceive.at( formatedDataReceive.length()-1)))) {
salco 15:91b3c572d9df 418 result=true;
salco 17:095f670f9c14 419 } else {
salco 17:095f670f9c14 420 result=false;
salco 17:095f670f9c14 421 }
salco 15:91b3c572d9df 422 //templateValue=((formatedDataReceive.at( formatedDataReceive.length()-2)) << 8);
salco 15:91b3c572d9df 423 //templateValue|=formatedDataReceive.at(formatedDataReceive.length()-1);
salco 15:91b3c572d9df 424
salco 17:095f670f9c14 425 // for (unsigned i=0; i<formatedDataReceive.length()-2; ++i) {
salco 17:095f670f9c14 426 // templateValue-=formatedDataReceive[i];
salco 17:095f670f9c14 427 // }
salco 17:095f670f9c14 428 // debug(DEBUG_SEND, "\n\r -CRC==0? value: %i. ", templateValue);
salco 17:095f670f9c14 429 // (templateValue==0)? result=true:result=false;
salco 13:51bbdc349f20 430 }
salco 17:095f670f9c14 431 debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -Send : ");
salco 18:3f113f8441b2 432 for (unsigned i=0; i<formatedDataSend.length(); i++) debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "%02X,",formatedDataSend.at(i));
salco 18:3f113f8441b2 433 debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -real : ");
salco 17:095f670f9c14 434 for (unsigned i=0; i<sneekpeek.length(); i++) debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "%02X,",sneekpeek.at(i));
salco 15:91b3c572d9df 435 debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -Reveive: ");
salco 15:91b3c572d9df 436 for (unsigned i=0; i<formatedDataReceive.length(); i++) debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "%02X,",formatedDataReceive.at(i));
salco 15:91b3c572d9df 437 debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r -Sneekpe: ");
salco 17:095f670f9c14 438 /*for (unsigned i=0; i<sneekpeek.length(); i++)*/
salco 17:095f670f9c14 439 debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "%04X,",CRC16_BUYPASS(formatedDataReceive.c_str(),formatedDataReceive.size()-2));//sneekpeek.at(i));
salco 17:095f670f9c14 440 debug(DEBUG_SEND|DEBUG_COMPACT|DEBUG_SLIM, "\n\r-Sneekpe: %04X,",CRC16_BUYPASS(formatedDataSend.c_str(),formatedDataSend.size()-2));//sneekpeek.at(i));
salco 18:3f113f8441b2 441
salco 17:095f670f9c14 442
salco 15:91b3c572d9df 443 }//templateValue = /*templateCRC->*/calculateCRC16(formatedDataSend.c_str(),formatedDataSend.size()-1);sneekpeek
salco 15:91b3c572d9df 444 ///////////////////////
salco 15:91b3c572d9df 445 // // old //
salco 15:91b3c572d9df 446 //
salco 15:91b3c572d9df 447 // // data //
salco 15:91b3c572d9df 448 // debug(DEBUG_SEND, "\n\r -Debut data. ");
salco 15:91b3c572d9df 449 // if(data->size() != 0) {
salco 15:91b3c572d9df 450 // formatedDataSend.append(*data);
salco 15:91b3c572d9df 451 // debug(DEBUG_COMPACT, "\n\r -DATA ADDED: %02X, %02X, %02X, %02X, %02X ",formatedDataSend[0],formatedDataSend[1],formatedDataSend[2],formatedDataSend[3],formatedDataSend[4]);
salco 15:91b3c572d9df 452 // }
salco 15:91b3c572d9df 453 // debug(DEBUG_SEND, "\n\r -Fin data. ");
salco 15:91b3c572d9df 454 //
salco 15:91b3c572d9df 455 // // CRC //
salco 15:91b3c572d9df 456 // debug(DEBUG_SEND, "\n\r -Debut CRC16. ");
salco 15:91b3c572d9df 457 // //CRC16* templateCRC;
salco 15:91b3c572d9df 458 // //templateCRC = new CRC16();
salco 15:91b3c572d9df 459 // unsigned short templateValue;
salco 15:91b3c572d9df 460 // char templateTable[34];
salco 15:91b3c572d9df 461 // for (unsigned i=0; i<34; ++i) templateTable[i]=0;
salco 15:91b3c572d9df 462 // for (unsigned i=0; i<formatedDataSend.length(); ++i) templateTable[i]=formatedDataSend[i];
salco 15:91b3c572d9df 463 // debug(DEBUG_SEND, "\n\r - envoi au crc: %02X,%02X,%02X,%02X,%02X,%02X ",templateTable[0],templateTable[1],templateTable[2],templateTable[3],templateTable[4],templateTable[5],templateTable[6]);
salco 15:91b3c572d9df 464 //
salco 15:91b3c572d9df 465 // templateValue = /*templateCRC->*/calculateCRC16(templateTable,formatedDataSend.size()-1); //atention pt un probleme de sortie du range
salco 15:91b3c572d9df 466 //
salco 15:91b3c572d9df 467 // formatedDataSend.append(1,templateValue>>8);
salco 15:91b3c572d9df 468 // formatedDataSend.append(1,templateValue & 0xFF);
salco 15:91b3c572d9df 469 //
salco 15:91b3c572d9df 470 // // if(templateCRC)
salco 15:91b3c572d9df 471 // // delete templateCRC;
salco 15:91b3c572d9df 472 // debug(DEBUG_COMPACT, "\n\r -DATA ADDED: %02X, %02X, %02X, %02X, %02X, %02X, %02X ",formatedDataSend[0],formatedDataSend[1],formatedDataSend[2],formatedDataSend[3],formatedDataSend[4],formatedDataSend[5],formatedDataSend[6]);
salco 15:91b3c572d9df 473 // debug(DEBUG_SEND, "\n\r -Fin CRC16. ");
salco 15:91b3c572d9df 474 //
salco 15:91b3c572d9df 475 // //Send Data
salco 15:91b3c572d9df 476 // debug(DEBUG_SEND, "\n\r -Debut Send Data. ");
salco 15:91b3c572d9df 477 // debug(DEBUG_SEND|DEBUG_COMPACT, "\n\r -Send: ");
salco 15:91b3c572d9df 478 // for (unsigned i=0; i<formatedDataSend.length(); ++i) debug(DEBUG_SEND |DEBUG_COMPACT, "%02X,",formatedDataSend.at(i));
salco 15:91b3c572d9df 479 //
salco 15:91b3c572d9df 480 // int twoBytesArray;
salco 15:91b3c572d9df 481 // twoBytesArray = (formatedDataSend[0]<<8)|(formatedDataSend[1]);
salco 15:91b3c572d9df 482 //
salco 15:91b3c572d9df 483 // for(int i=0; (i<3) && (!result); i++) {
salco 15:91b3c572d9df 484 // debug(DEBUG_SEND|DEBUG_COMPACT, "\n\r -Tentative: %d",i);
salco 15:91b3c572d9df 485 //
salco 15:91b3c572d9df 486 // twoBytesArray=write(twoBytesArray);
salco 15:91b3c572d9df 487 //
salco 15:91b3c572d9df 488 // if(twoBytesArray>>8 == SYNC) {// twoBytesArray ==(Sync)//+(PFB+ACK+NDB))
salco 15:91b3c572d9df 489 // // Envoie le reste si liker si liker //
salco 15:91b3c572d9df 490 // debug(DEBUG_SEND|DEBUG_COMPACT, "\n\r -Debut Traitement de l'information. ");
salco 15:91b3c572d9df 491 // debug(DEBUG_SEND|DEBUG_COMPACT, "\n\r -Receive: %02X",twoBytesArray);
salco 15:91b3c572d9df 492 //
salco 15:91b3c572d9df 493 // formatedDataReceive.clear();
salco 15:91b3c572d9df 494 // formatedDataReceive.append(1,twoBytesArray>>8);
salco 15:91b3c572d9df 495 // formatedDataReceive.append(1,twoBytesArray & 0xFF);
salco 15:91b3c572d9df 496 //
salco 15:91b3c572d9df 497 // for (unsigned i=2; i<formatedDataSend.length(); ++i) {
salco 15:91b3c572d9df 498 // twoBytesArray = formatedDataSend[i];
salco 15:91b3c572d9df 499 // i++;
salco 15:91b3c572d9df 500 // if(i<formatedDataSend.length())
salco 15:91b3c572d9df 501 // twoBytesArray = (twoBytesArray<<8) + formatedDataSend[i];
salco 15:91b3c572d9df 502 //
salco 15:91b3c572d9df 503 // twoBytesArray=write(twoBytesArray);
salco 15:91b3c572d9df 504 // formatedDataReceive.append(1,twoBytesArray>>8);
salco 15:91b3c572d9df 505 // formatedDataReceive.append(1,twoBytesArray&0xFF);
salco 15:91b3c572d9df 506 // }
salco 15:91b3c572d9df 507 //
salco 15:91b3c572d9df 508 // // CRC //
salco 15:91b3c572d9df 509 // unsigned short templateValue=1;
salco 15:91b3c572d9df 510 // templateValue=formatedDataReceive.at(formatedDataReceive.length()-2) << 8;
salco 15:91b3c572d9df 511 // templateValue|=formatedDataReceive.at(formatedDataReceive.length()-1);
salco 15:91b3c572d9df 512 //
salco 15:91b3c572d9df 513 // for (unsigned i=0; i<formatedDataReceive.length()-2; ++i) {
salco 15:91b3c572d9df 514 // templateValue-=formatedDataReceive[i];
salco 15:91b3c572d9df 515 // }
salco 15:91b3c572d9df 516 // debug(DEBUG_SEND, "\n\r -CRC==0? value: %i. ", templateValue);
salco 15:91b3c572d9df 517 // (templateValue==0)? result=true:result=false;
salco 15:91b3c572d9df 518 //}
salco 15:91b3c572d9df 519 //}
salco 15:91b3c572d9df 520 //debug(DEBUG_SEND, "\n\r -Fin Send Data. ");
salco 15:91b3c572d9df 521 //
salco 15:91b3c572d9df 522
salco 15:91b3c572d9df 523
salco 17:095f670f9c14 524
salco 12:bf44013497c8 525
salco 13:51bbdc349f20 526 if(result) {
salco 13:51bbdc349f20 527 // Traitement de l'information //
salco 12:bf44013497c8 528 debug(DEBUG_SEND, "\n\r -Debut Traitement de l'information. ");
salco 12:bf44013497c8 529 debug(DEBUG_SEND, "\n\r -Receive: ");
salco 15:91b3c572d9df 530 for (unsigned i=0; i<formatedDataReceive.length(); ++i)debug(DEBUG_SEND|DEBUG_COMPACT, "%02X,",formatedDataReceive.at(i));
salco 12:bf44013497c8 531
salco 10:7e6aeaebe1a2 532 // flag //
salco 10:7e6aeaebe1a2 533 flag->clear();
salco 17:095f670f9c14 534 if((settingSlave>>6) != 0) {
salco 17:095f670f9c14 535 //string str = formatedDataReceive.substr( ((2+(settingMaster>>6))+1+1),(settingSlave>>6));
salco 17:095f670f9c14 536 flag->append(formatedDataReceive.substr( ((2+(settingMaster>>6))+1+1),(settingSlave>>6)));// = &str;
salco 17:095f670f9c14 537
salco 17:095f670f9c14 538 //debug(DEBUG_SLIM, "\n\r -flag get: ");
salco 17:095f670f9c14 539 //for (unsigned i=0; i<str.length(); i++) debug(DEBUG_SLIM, "%02X,",str.at(i));
salco 16:5ea4337d785f 540 }
salco 15:91b3c572d9df 541 //twoBytesArray=formatedDataReceive[2];
salco 15:91b3c572d9df 542 //!!!!! wtf is that cest claire que sa pete la com
salco 16:5ea4337d785f 543 /*string::iterator it=formatedDataReceive.begin()+3;
salco 13:51bbdc349f20 544
salco 15:91b3c572d9df 545 switch(settingSlave>>6) {
salco 10:7e6aeaebe1a2 546 case 1:
salco 10:7e6aeaebe1a2 547 flag->append(1,*it);
salco 10:7e6aeaebe1a2 548 it++;
salco 10:7e6aeaebe1a2 549 break;
salco 7:dcfd81d7f93f 550
salco 10:7e6aeaebe1a2 551 case 2:
salco 10:7e6aeaebe1a2 552 flag->append(1,*it);
salco 10:7e6aeaebe1a2 553 it++;
salco 10:7e6aeaebe1a2 554 flag->append(1,*it);
salco 10:7e6aeaebe1a2 555 it++;
salco 10:7e6aeaebe1a2 556 break;
salco 7:dcfd81d7f93f 557
salco 10:7e6aeaebe1a2 558 case 3:
salco 10:7e6aeaebe1a2 559 flag->append(1,*it);
salco 10:7e6aeaebe1a2 560 it++;
salco 10:7e6aeaebe1a2 561 flag->append(1,*it);
salco 10:7e6aeaebe1a2 562 it++;
salco 10:7e6aeaebe1a2 563 flag->append(1,*it);
salco 10:7e6aeaebe1a2 564 it++;
salco 16:5ea4337d785f 565 break;*/
salco 7:dcfd81d7f93f 566
salco 17:095f670f9c14 567 /*default:
salco 17:095f670f9c14 568 formatedDataSend.append(1,0<<6);
salco 17:095f670f9c14 569 break;*/
salco 17:095f670f9c14 570 // }
salco 12:bf44013497c8 571
salco 10:7e6aeaebe1a2 572 // ACK/NAK
salco 10:7e6aeaebe1a2 573 //
salco 7:dcfd81d7f93f 574
salco 10:7e6aeaebe1a2 575 // NDB //
salco 10:7e6aeaebe1a2 576 data->clear();
salco 17:095f670f9c14 577 if((settingSlave&0x0F) != 0) {
salco 17:095f670f9c14 578 //string str = formatedDataReceive.substr( ((2+(settingMaster>>6))+1+(settingSlave>>6)+1),(settingSlave&0x0F));
salco 17:095f670f9c14 579 data->append(formatedDataReceive.substr( ((2+(settingMaster>>6))+1+(settingSlave>>6)+1),(settingSlave&0x0F)));
salco 17:095f670f9c14 580
salco 17:095f670f9c14 581 //debug(DEBUG_SLIM, "\n\r -data get: ");
salco 17:095f670f9c14 582 //for (unsigned i=0; i<str.length(); i++) debug(DEBUG_SLIM, "%02X,",str.at(i));
salco 16:5ea4337d785f 583 }
salco 15:91b3c572d9df 584 //!!!!! same shit faut rebild la chose en bas
salco 17:095f670f9c14 585 /* switch(settingSlave&0xFF) {
salco 17:095f670f9c14 586 case 1:
salco 17:095f670f9c14 587 data->append(1,*it);
salco 17:095f670f9c14 588 it++;
salco 17:095f670f9c14 589 break;
salco 7:dcfd81d7f93f 590
salco 17:095f670f9c14 591 case 2:
salco 17:095f670f9c14 592 data->append(1,*it);
salco 17:095f670f9c14 593 it++;
salco 17:095f670f9c14 594 data->append(1,*it);
salco 17:095f670f9c14 595 it++;
salco 17:095f670f9c14 596 break;
salco 10:7e6aeaebe1a2 597
salco 17:095f670f9c14 598 case 3:
salco 17:095f670f9c14 599 data->append(1,*it);
salco 17:095f670f9c14 600 it++;
salco 17:095f670f9c14 601 data->append(1,*it);
salco 17:095f670f9c14 602 it++;
salco 17:095f670f9c14 603 data->append(1,*it);
salco 17:095f670f9c14 604 it++;
salco 17:095f670f9c14 605 break;*/
salco 10:7e6aeaebe1a2 606
salco 17:095f670f9c14 607 /*default:
salco 10:7e6aeaebe1a2 608
salco 17:095f670f9c14 609 break;*/
salco 16:5ea4337d785f 610 //}
salco 13:51bbdc349f20 611 }
salco 12:bf44013497c8 612
salco 12:bf44013497c8 613 debug(DEBUG_SEND, "\n\r -Fin Traitement de l'information. ");
salco 15:91b3c572d9df 614 debug(DEBUG_SEND|DEBUG_COMPACT, "\n\r -Fin du send. ");
salco 7:dcfd81d7f93f 615 return result;
salco 7:dcfd81d7f93f 616 }