Skip to content

Fix conflicting definition of SdkLog from config files#1

Open
aggarw13 wants to merge 14 commits intomasterfrom
fix/conflicting-defining-of-sdk-log
Open

Fix conflicting definition of SdkLog from config files#1
aggarw13 wants to merge 14 commits intomasterfrom
fix/conflicting-defining-of-sdk-log

Conversation

@aggarw13
Copy link
Owner

Problem \n When there are different definitions of SdkLog in different config files (like demo_config.h and core_mqtt_config.h files) and the config files are included in the same translation unit, there is compiler warning of conflicting definitions. \n #### Fix \n Add #ifndef guards around the SdkLog definitions in config files to avoid multiple definitions in a translation unit. \n #### Note For most cases, the user may need to define the SdkLog macro ONLY once for the entire project build. An alternative way to define the macro for the whole project is by setting its default value in the FreeRTOS-Plus/Source/Utilities/Logging/logging_stack.h file

Archit Aggarwal and others added 14 commits November 9, 2020 15:07
* Update logging_stack.h file to avoid use of __FUNCTION__ macro

* Revert to use __FUNCTION__ instead of __FILE__

* Fix comment about metadata format

* Fix incorrect mapping of SdkLog function

* Fix typo causing LOG_METADATA_ARGS to be undefined

* Fix another bug with SdkLog macro definition

* Fix formatting

* Move mapping of SdkLog to vLoggingPrintf from logging_stack to config files

* Remove dependency of LIBRARY_LOG_NAME on LIBRARY_METADATA_* macros

* Minor improvements

Co-authored-by: Gary Wicker <14828980+gkwicker@users.noreply.github.com>
Co-authored-by: RichardBarry <3073890+RichardBarry@users.noreply.github.com>
* Fix logging stack to print message in the first SdkLog

* Do not log metadata if on the same line

* Fix wrong var name

* Change task names to DemoTask

* Change for shadow too

* Move declaration to a separate line

Co-authored-by: Gary Wicker <14828980+gkwicker@users.noreply.github.com>
* URLs have changed on the FreeRTOS.org site - this commit matches the URLs in the code with the new URLs on the website.

* Add link to device shadow directory to the shadow docs.

* Update main.c

* Update main.c

* Update readme.txt

* Update main.c

* Update main.c

* Update readme.txt

Co-authored-by: yngki <47755894+yngki@users.noreply.github.com>
* Add submodule pointer to the aws/jobs-for-aws-iot-embedded-sdk repository for the Jobs library
* Commonize the MQTT helper functions used by the Device Shadow demo by re-locating them to FreeRTOS-Plus/Demo/AWS/MQTT_Demo_Helpers and updating the Device Shadow demo to use the new files
* Add Makefile project for RISC-V QEMU virtpc

This patch adds simple demo directory for QEMU virtpc machine.
A demo just prints Tx/Rx message of queue to serial port, use no
other hardware and use only primary core (currently hart0).
Other cores are simply going to wfi state and execute nothing else.

Example command is:
  qemu-system-riscv32 -nographic -machine virt -net none \
    -chardev stdio,id=con,mux=on -serial chardev:con \
    -mon chardev=con,mode=readline -bios none \
    -kernel demo.elf -smp cpus=2 -s

* Fix copyright and URLS of FreeRTOS

* Fix Makefile

* Add Readme.md

* Separate blinky demo from main code

Co-authored-by: alfred gedeon <alfred2g@hotmail.com>
Co-authored-by: Cobus van Eeden <35851496+cobusve@users.noreply.github.com>
Co-authored-by: Carl Lundin <53273776+lundinc2@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants