Made minor changes to makefile & re-tested

Author: abusous2000

cfg/stm32f769i_discovery/chconf.h

@@ -31,9 +31,9 @@
 #define _CHIBIOS_RT_CONF_
 #define _CHIBIOS_RT_CONF_VER_6_1_
 #define bool_t						bool
-#define DEBUG_TRACE_PRINT     		TRUE
-#define CHPRINTF_USE_FLOAT    		TRUE
-#define PORT_ENABLE_GUARD_PAGES     TRUE
+//#define DEBUG_TRACE_PRINT     		TRUE
+//#define CHPRINTF_USE_FLOAT    		TRUE
+//#define PORT_ENABLE_GUARD_PAGES     TRUE
 /*===========================================================================*/
 /**
  * @name System timers settings

libmad/decoder.c

@@ -94,7 +94,7 @@ void mad_decoder_init(struct mad_decoder *decoder, void *data,
 }
 
 int mad_decoder_finish(struct mad_decoder *decoder)
-{
+{(void)decoder;
 # if defined(USE_ASYNC)
   if (decoder->mode == MAD_DECODER_MODE_ASYNC && decoder->async.pid) {
     pid_t pid;
@@ -569,6 +569,7 @@ int mad_decoder_run(struct mad_decoder *decoder, enum mad_decoder_mode mode)
 int mad_decoder_message(struct mad_decoder *decoder,
 			void *message, unsigned int *len)
 {
+	(void)len;(void)message;(void)decoder;
 # if defined(USE_ASYNC)
   if (decoder->mode != MAD_DECODER_MODE_ASYNC ||
       send(decoder->async.out, message, *len) != MAD_FLOW_CONTINUE ||

libmad/frame.c

@@ -315,7 +315,7 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
     if (!stream->sync)
       ptr = stream->this_frame;
 
-    if (end - ptr < stream->skiplen) {
+    if (end - ptr < (signed int)stream->skiplen) {
       stream->skiplen   -= end - ptr;
       stream->next_frame = end;
 

libmad/layer3.c

@@ -1053,7 +1053,7 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 	  break;
 
 	case 15:
-	  if (cachesz < linbits + 2) {
+	  if (cachesz < (signed int)linbits + 2) {
 	    bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
 	    cachesz   += 16;
 	    bits_left -= 16;
@@ -1088,7 +1088,7 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 	  break;
 
 	case 15:
-	  if (cachesz < linbits + 1) {
+	  if (cachesz < (signed int)linbits + 1) {
 	    bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
 	    cachesz   += 16;
 	    bits_left -= 16;

libmad/timer.c

@@ -26,7 +26,7 @@
 # include "global.h"
 
 # include <stdio.h>
-
+# include <stdlib.h>
 # ifdef HAVE_ASSERT_H
 #  include <assert.h>
 # endif

main.c

@@ -25,16 +25,6 @@ AudioPlayerDriverITF_Typedef	*pAudioPlayerDriverITF;
 thread_t 			  		    *mainThd;
 
 static void initDrivers(void);
-#if S4E_USE_WIFI_MODULE_THD != 0
-/* WiFi Serial configuration. */
-static const SerialConfig wifiSerialvfg = {
-  WIFI_SERIALBAUD_RATE,
-  0,
-  USART_CR2_STOP1_BITS,
-  0
-};
-#endif
-
 #if HAL_USE_SERIAL != 0
 
 /* VCP Serial configuration. */
@@ -79,7 +69,6 @@ int main(void) {
   initActonEventThd();
   initButtonsLEDs();
 #if S4E_USE_WIFI_MODULE_THD != 0
-  sdStart(&WIFI_SD, &wifiSerialvfg);
   initWifiCommunicationThd();
 #endif
 #if defined(LINE_LED_RED)
@@ -125,6 +114,9 @@ static void initDrivers(void){
   ssd130InitAndConfig("MP3Player w/ STM32F7");
 #endif
 
+#if HAL_USE_RTC != 0
+    RTCInit();
+#endif
   return;
 }
 static bool pauseMsgSent = false;

make/stm32f769i_discovery.make

@@ -95,8 +95,12 @@ STMHAL = STM32F7xx_HAL_Driver
 BOARD_NAME  := stm32f769i_discovery
 STRUTS4EMBEDDED :=$(CHIBIOS)/demos/STM32/Struts4Embedded/source/Struts4Embedded
 include $(STRUTS4EMBEDDED)/CommonS4EVars.mk
-
-
+INCLUDE_SEGGER_JLINK := "no"
+INCLUDE_SEGGER_JLINK_VALUE :=0
+USE_MAC := "yes"
+USE_AE_SHELL := "yes"
+USE_AE_SHELL_VALUE := 0
+USE_FATFS := "yes"
 
 # Licensing files.
 include $(CHIBIOS)/os/license/license.mk
@@ -113,16 +117,30 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Auto-build files in ./source recursively.
 include $(CHIBIOS)/tools/mk/autobuild.mk
 # Other files (optional).
-#include $(CHIBIOS)/test/lib/test.mk
-#include $(CHIBIOS)/test/rt/rt_test.mk
-#include $(CHIBIOS)/test/oslib/oslib_test.mk
+ifeq ($(USE_AE_SHELL),"yes")
+include $(CHIBIOS)/test/lib/test.mk
+include $(CHIBIOS)/test/rt/rt_test.mk
+include $(CHIBIOS)/test/oslib/oslib_test.mk
+include $(CHIBIOS)/os/various/shell/shell.mk
+USE_AE_SHELL_VALUE := 1
+endif
 include $(CHIBIOS)/os/hal/lib/streams/streams.mk
 include $(CHIBIOS_CONTRIB)/os/common/ports/ARMCMx/compilers/GCC/utils/fault_handlers_v7m.mk
+
+include $(STRUTS4EMBEDDED)/Struts4Embedded.mk
+ifeq ($(USE_FATFS),"yes")
 include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
+endif
+#STARTUPLD = /os/common/startup/ARMCMx/compilers/GCC/ld
+ifeq ($(USE_MAC),"yes")
 include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
-include $(STRUTS4EMBEDDED)/Struts4Embedded.mk
-include $(MQTTCLIENT)/MQTTClient.mk
-include $(CONTROLS)/Controls.mk
+endif
+ifeq ($(INCLUDE_SEGGER_JLINK),"yes")
+include $(CHIBIOS_CONTRIB)/os/various/segger_bindings/segger_rtt.mk
+include $(CHIBIOS_CONTRIB)/os/various/segger_bindings/segger_systemview.mk
+INCLUDE_SEGGER_JLINK_VALUE := 1
+endif
+
 # Define linker script file here
 include ./libmad/mp3.mk
 include $(GFXLIB)/gfx.mk
@@ -164,8 +182,11 @@ CPPWARN = -Wall -Wextra -Wundef
 #
 
 # List all user C define here, like -D_DEBUG=1
-UDEFS = -DWOLFSSL_USER_SETTINGS -DLWIP_DEBUG 
-
+#UDEFS = -DWOLFSSL_USER_SETTINGS -DLWIP_DEBUG 
+UDEFS = -DSHELL_CMD_TEST_ENABLED=0  -DWOLFSSL_USER_SETTINGS  -DLWIP_DEBUG \
+        -DDEBUG_TRACE_PRINT=1 -DCHPRINTF_USE_FLOAT=1 -DPORT_ENABLE_GUARD_PAGES=1 \
+        -DINCLUDE_SEGGER_JLINK=$(INCLUDE_SEGGER_JLINK_VALUE) -Dboot_t=bool -DSERIAL_BUFFERS_SIZE=512 \
+        -DUSE_AE_SHELL=$(USE_AE_SHELL_VALUE) -DSIZEOF_INT=4
 # Define ASM defines here
 UADEFS =
 

source/AudioDriver/audio.c

@@ -131,7 +131,7 @@ void AUDIO_IO_Init(void){
 	   palSetLineMode(AUDIO_I2S_MCK_LINE, AUDIO_I2S_PIN_MODE);
 
 	#else
-//	  /* I2CD_CODEC-->CODEC SCL and SDA pins configuration -------------------------------------*/
+//	  /* I2CD_CODEC-->CODEC SCL and SDA pins configuration. NOte that no need for pull-up reisters. see schematic for details-------------------------------------*/
 	  palSetLineMode(AUDIO_I2C_SCL_LINE, PAL_MODE_ALTERNATE(SAI_I2C_SCL_AF) | AUDIO_I2C_LINE_MODE);
 	  palSetLineMode(AUDIO_I2C_SDA_LINE, PAL_MODE_ALTERNATE(SAI_I2C_SDA_AF) | AUDIO_I2C_LINE_MODE);
 	  /* CODE SAI pins configuration: WS, SCK and SD pins ... See Schematic Page 41 & 42 STM32F769i User Manual.-----------------------------*/