Skip to content

Commit

Permalink
Updating Ardunio test suite to work with chipkit
Browse files Browse the repository at this point in the history 
Former-commit-id: bc0328d
  • Loading branch information
@msproul
msproul committed Dec 30, 2011
1 parent ec6a7d7 commit 4e58a2f
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 14 deletions.
35 changes: 26 additions & 9 deletions libraries/ArduinoTestSuite/ArduinoTestSuite.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@
//************************************************************************ //************************************************************************
//* Aug 31, 2010 <MLS> Started on TestArduino //* Aug 31, 2010 <MLS> Started on TestArduino
//* Oct 18, 2010 <MLS> Added memory testing //* Oct 18, 2010 <MLS> Added memory testing
//* Sep 20, 2011 <MLS> Adding support for non-avr cpus
//* Sep 21, 2011 <MLS> fixed buffer overflow for PIC32 in ATS_PrintProperty
//************************************************************************ //************************************************************************
2
#include <avr/pgmspace.h> #if defined(__AVR__)
#include <avr/io.h> #include <avr/pgmspace.h>
#include <avr/eeprom.h> #include <avr/io.h>
#include <avr/eeprom.h>
#else
#define strcpy_P strcpy
#define strcat_P strcat
#endif






Expand All @@ -31,7 +38,7 @@
#include "pins_arduino.h" #include "pins_arduino.h"




#include "avr_cpunames.h" #include "cpudefs.h"


#if defined(USART3_RX_vect) #if defined(USART3_RX_vect)
#define SERIAL_PORT_COUNT 4 #define SERIAL_PORT_COUNT 4
Expand Down Expand Up @@ -111,7 +118,7 @@ static void ATS_PrintProperty( int propertyTagNum,
char *propertyName, char *propertyName,
char *propertyValue) char *propertyValue)
{ {
char lineBuffer[64]; char lineBuffer[256];


strcpy_P(lineBuffer, gTextMsg_info); strcpy_P(lineBuffer, gTextMsg_info);
switch(propertyTagNum) switch(propertyTagNum)
Expand Down Expand Up @@ -185,9 +192,11 @@ char memoryMsg[48];
Serial.println(); Serial.println();


ATS_PrintProperty(ATS_Manufacturer, 0, manufName); ATS_PrintProperty(ATS_Manufacturer, 0, manufName);
ATS_PrintProperty(ATS_CPU, 0, _AVR_CPU_NAME_); ATS_PrintProperty(ATS_CPU, 0, _CPU_NAME_);
ATS_PrintProperty(ATS_GCC_version, 0, __VERSION__); ATS_PrintProperty(ATS_GCC_version, 0, __VERSION__);
#ifdef __AVR_LIBC_VERSION_STRING__
ATS_PrintProperty(ATS_LIBC_version, 0, __AVR_LIBC_VERSION_STRING__); ATS_PrintProperty(ATS_LIBC_version, 0, __AVR_LIBC_VERSION_STRING__);
#endif
ATS_PrintProperty(ATS_CompiledDate, 0, __DATE__); ATS_PrintProperty(ATS_CompiledDate, 0, __DATE__);
ATS_PrintProperty(ATS_TestSuiteName, 0, testSuiteName); ATS_PrintProperty(ATS_TestSuiteName, 0, testSuiteName);


Expand Down Expand Up @@ -472,7 +481,7 @@ uint8_t helperpin;
} }




#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(_BOARD_MEGA_) || defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define kAnalogPinOffset 54 #define kAnalogPinOffset 54
#else #else
#define kAnalogPinOffset 14 #define kAnalogPinOffset 14
Expand Down Expand Up @@ -613,6 +622,7 @@ short timeOutLoopCtr;
#endif #endif




#if defined(__AVR__)
//************************************************************************ //************************************************************************
boolean ATS_Test_EEPROM(void) boolean ATS_Test_EEPROM(void)
{ {
Expand Down Expand Up @@ -683,16 +693,18 @@ char reportString[48];


return(passedOK); return(passedOK);
} }
#endif //* defined(__AVR__)





#if defined(__AVR__)
//************************************************************************ //************************************************************************
extern unsigned int __data_start; extern unsigned int __data_start;
extern unsigned int __data_end; extern unsigned int __data_end;
extern unsigned int __bss_start; extern unsigned int __bss_start;
extern unsigned int __bss_end; extern unsigned int __bss_end;
extern unsigned int __heap_start; extern unsigned int __heap_start;
extern void *__brkval; extern void *__brkval;
#endif //* defined(__AVR__)






Expand All @@ -701,6 +713,7 @@ int ATS_GetFreeMemory()
{ {
int free_memory; int free_memory;


#if defined(__AVR__)
if((int)__brkval == 0) if((int)__brkval == 0)
{ {
free_memory = ((int)&free_memory) - ((int)&__bss_end); free_memory = ((int)&free_memory) - ((int)&__bss_end);
Expand All @@ -709,6 +722,10 @@ int free_memory;
{ {
free_memory = ((int)&free_memory) - ((int)__brkval); free_memory = ((int)&free_memory) - ((int)__brkval);
} }
#else
free_memory = 0;
#endif

return free_memory; return free_memory;
} }


Expand Down
14 changes: 9 additions & 5 deletions libraries/ArduinoTestSuite/ArduinoTestSuite.h
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//* Aug 31, 2010 <MLS> Started on TestArduino //* Aug 31, 2010 <MLS> Started on TestArduino
//************************************************************************ //************************************************************************


#ifndef _AVR_IO_H_ #if defined(__AVR__) && !defined(_AVR_IO_H_)
#include <avr/io.h> #include <avr/io.h>
#endif #endif


Expand All @@ -15,10 +15,14 @@
#endif #endif




#if defined(USART3_RX_vect) #if defined(__AVR__)
#define SERIAL_PORT_COUNT 4 #if defined(USART3_RX_vect)
#elif defined(USART1_RX_vect) #define SERIAL_PORT_COUNT 4
#define SERIAL_PORT_COUNT 2 #elif defined(USART1_RX_vect)
#define SERIAL_PORT_COUNT 2
#else
#define SERIAL_PORT_COUNT 1
#endif
#else #else
#define SERIAL_PORT_COUNT 1 #define SERIAL_PORT_COUNT 1
#endif #endif
Expand Down

0 comments on commit 4e58a2f

Please sign in to comment.