Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: BLE_API mbed mbedtls nRF51822
Revision 14:c62c3a92aba7, committed 2018-10-23
- Comitter:
- electronichamsters
- Date:
- Tue Oct 23 02:37:10 2018 +0000
- Parent:
- 13:e136665cf993
- Commit message:
- Super lazy linker fix to mbed issue 8344. Not tested, but "it should work"
Changed in this revision
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
mbed.bld | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Sun Aug 27 05:48:02 2017 +0000 +++ b/main.cpp Tue Oct 23 02:37:10 2018 +0000 @@ -1,4 +1,10 @@ -/* +/* 2018-10-22: Note, this is a temporary gateway project to fix an issue with mbed linker + * Original Program: https://os.mbed.com/users/electronichamsters/code/BLE_Gateway/ + * mbed had some linker problems raised in issue 8344 + * https://github.com/ARMmbed/mbed-os/issues/8344 + * My temporary fix is to revert to a earlier revision of mbed. Devloper notes indicates + * this will be cleaned up on mbed's side. + * * Copyright (c) Eric Tsai 2017 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,7 +49,7 @@ mbedtls_aes_context aes; unsigned char iv[16] = {0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x1, 0x2}; //16-byte aes key - +//Serial device(p9, p11); //nRF51822 uart: TX=p9. RX=p11 Serial device(p9, p11); //nRF51822 uart: TX=p9. RX=p11 DigitalIn pinHandShake(p0); //handshake uart to prevent output before bridge MCU is ready. Flow control. @@ -415,7 +421,7 @@ // 4. Xmit Counter 0-255, incremented by Beacon with each new unique ADV event. // "tmr":xxxx, //--------------------------------------- - device.printf("\"xmit_cnt\":%d,", Received_Xmit_Cnt); + device.printf("\"xcnt\":%d,", Received_Xmit_Cnt); //--------------------------------------- // 5. rest of sensor payload as json @@ -430,7 +436,7 @@ device.printf("}"); device.printf("\r\n"); //gateway looking for cariage return to indicate end - wait_ms(60); //needed to give gateway time to assert flow control handshake pin + wait_ms(140); //needed to give gateway time to assert flow control handshake pin while (pinHandShake.read() == 1) //normally pulled down, so loop when gateway processing; { //uart flow control
--- a/mbed.bld Sun Aug 27 05:48:02 2017 +0000 +++ b/mbed.bld Tue Oct 23 02:37:10 2018 +0000 @@ -1,1 +1,1 @@ -https://mbed.org/users/mbed_official/code/mbed/builds/e2bfab296f20 \ No newline at end of file +https://os.mbed.com/users/mbed_official/code/mbed/builds/abea610beb85 \ No newline at end of file