rusefi
/
speeduino
mirror of https://github.com/rusefi/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extremely early stm32 work 

I was bored
This commit is contained in:
Josh Stewart 2017-02-08 15:40:44 +11:00
parent 279893f580
commit 8b4008ce27
3 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
platformio.ini
View File

@ -22,6 +22,24 @@ board=teensy35
framework=arduino framework=arduino
lib_deps = EEPROM, FlexCAN lib_deps = EEPROM, FlexCAN
[env:LaunchPad_tm4c1294ncpdt]
platform = titiva
framework = energia
board = lptm4c1294ncpdt
lib_deps = EEPROM
[env:genericSTM32F103RB]
platform = ststm32
framework = arduino
; framework-arduinoststm32
board = genericSTM32F103RB
lib_deps = EEPROM
build_flags = -fpermissive
[platformio] [platformio]
src_dir=speeduino src_dir=speeduino
env_default = megaatmega2560, teensy35 env_default = megaatmega2560, teensy35
;The following lines are for testing / experimentation only. Comment the line above to try them out
;env_default = LaunchPad_tm4c1294ncpdt
;env_default = genericSTM32F103RB

23
speeduino/cancomms.ino
View File

@ -15,6 +15,8 @@ sendcancommand is called when a comman d is to be sent via serial3 to the Can in
//#include "globals.h" //#include "globals.h"
//#include "storage.h" //#include "storage.h"
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__)
void canCommand() void canCommand()
{ {
switch (Serial3.read()) switch (Serial3.read())
@ -47,16 +49,16 @@ void canCommand()
while (Serial3.available() == 0) { } while (Serial3.available() == 0) { }
Llength= Serial3.read(); // next the number of bytes expected value Llength= Serial3.read(); // next the number of bytes expected value
for (uint8_t Lcount = 0; Lcount <Llength ;Lcount++) for (uint8_t Lcount = 0; Lcount <Llength ;Lcount++)
{ {
while (Serial3.available() == 0){} while (Serial3.available() == 0){}
// receive all x bytes into "Lbuffer" // receive all x bytes into "Lbuffer"
Lbuffer[Lcount] = Serial3.read(); Lbuffer[Lcount] = Serial3.read();
} }
break; break;
case 'S': // send code version case 'S': // send code version
for (unsigned int sig = 0; sig < sizeof(displaySignature) - 1; sig++){ for (unsigned int sig = 0; sig < sizeof(displaySignature) - 1; sig++){
Serial3.write(displaySignature[sig]); Serial3.write(displaySignature[sig]);
} }
//Serial3.print("speeduino 201609-dev"); //Serial3.print("speeduino 201609-dev");
break; break;
@ -84,11 +86,16 @@ void sendCancommand(uint8_t cmdtype, uint16_t canaddress, uint8_t candata1, uint
Serial3.write(candata1); // table id Serial3.write(candata1); // table id
Serial3.write(candata2); //table memory offset Serial3.write(candata2); //table memory offset
break; break;
case 1: //send request to listen for a can message case 1: //send request to listen for a can message
Serial3.print("L"); Serial3.print("L");
Serial3.write(canaddress); //11 bit canaddress of device to listen for Serial3.write(canaddress); //11 bit canaddress of device to listen for
break; break;
} }
} }
#else
void canCommand() { return; }
void sendCancommand(uint8_t cmdtype, uint16_t canaddress, uint8_t candata1, uint8_t candata2) { return; }
#endif

38
speeduino/scheduler.h
View File

@ -1,5 +1,5 @@
/* /*
This scheduler is designed to maintain 2 schedules for use by the fuel and ignition systems. This scheduler is designed to maintain 2 schedules for use by the fuel and ignition systems.
It functions by waiting for the overflow vectors from each of the timers in use to overflow, which triggers an interrupt It functions by waiting for the overflow vectors from each of the timers in use to overflow, which triggers an interrupt
//Technical //Technical
@ -25,20 +25,17 @@ See page 136 of the processors datasheet: http://www.atmel.com/Images/doc2549.pd
#ifndef SCHEDULER_H #ifndef SCHEDULER_H
#define SCHEDULER_H #define SCHEDULER_H
#ifdef __SAM3X8E__
//Do stuff for ARM based CPUs
#else
#include <avr/interrupt.h>
#include <avr/io.h>
#endif
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__)
#include <avr/interrupt.h>
#include <avr/io.h>
//Refer to http://svn.savannah.nongnu.org/viewvc/trunk/avr-libc/include/avr/iomxx0_1.h?root=avr-libc&view=markup //Refer to http://svn.savannah.nongnu.org/viewvc/trunk/avr-libc/include/avr/iomxx0_1.h?root=avr-libc&view=markup
#define FUEL1_COUNTER TCNT3 #define FUEL1_COUNTER TCNT3
#define FUEL2_COUNTER TCNT3 #define FUEL2_COUNTER TCNT3
#define FUEL3_COUNTER TCNT3 #define FUEL3_COUNTER TCNT3
#define FUEL4_COUNTER TCNT4 #define FUEL4_COUNTER TCNT4
#define IGN1_COUNTER TCNT5 #define IGN1_COUNTER TCNT5
#define IGN2_COUNTER TCNT5 #define IGN2_COUNTER TCNT5
#define IGN3_COUNTER TCNT5 #define IGN3_COUNTER TCNT5
@ -49,7 +46,7 @@ See page 136 of the processors datasheet: http://www.atmel.com/Images/doc2549.pd
#define FUEL2_COMPARE OCR3B #define FUEL2_COMPARE OCR3B
#define FUEL3_COMPARE OCR3C #define FUEL3_COMPARE OCR3C
#define FUEL4_COMPARE OCR4B #define FUEL4_COMPARE OCR4B
#define IGN1_COMPARE OCR5A #define IGN1_COMPARE OCR5A
#define IGN2_COMPARE OCR5B #define IGN2_COMPARE OCR5B
#define IGN3_COMPARE OCR5C #define IGN3_COMPARE OCR5C
@ -72,7 +69,7 @@ See page 136 of the processors datasheet: http://www.atmel.com/Images/doc2549.pd
#define IGN4_TIMER_ENABLE() TIMSK4 |= (1 << OCIE4A) //Turn on the A compare unit (ie turn on the interrupt) #define IGN4_TIMER_ENABLE() TIMSK4 |= (1 << OCIE4A) //Turn on the A compare unit (ie turn on the interrupt)
#define IGN5_TIMER_ENABLE() TIMSK1 |= (1 << OCIE1C) //Turn on the A compare unit (ie turn on the interrupt) #define IGN5_TIMER_ENABLE() TIMSK1 |= (1 << OCIE1C) //Turn on the A compare unit (ie turn on the interrupt)
#define IGN1_TIMER_DISABLE() TIMSK5 &= ~(1 << OCIE5A) //Turn off this output compare unit #define IGN1_TIMER_DISABLE() TIMSK5 &= ~(1 << OCIE5A) //Turn off this output compare unit
#define IGN2_TIMER_DISABLE() TIMSK5 &= ~(1 << OCIE5B) //Turn off this output compare unit #define IGN2_TIMER_DISABLE() TIMSK5 &= ~(1 << OCIE5B) //Turn off this output compare unit
#define IGN3_TIMER_DISABLE() TIMSK5 &= ~(1 << OCIE5C) //Turn off this output compare unit #define IGN3_TIMER_DISABLE() TIMSK5 &= ~(1 << OCIE5C) //Turn off this output compare unit
#define IGN4_TIMER_DISABLE() TIMSK4 &= ~(1 << OCIE4A) //Turn off this output compare unit #define IGN4_TIMER_DISABLE() TIMSK4 &= ~(1 << OCIE4A) //Turn off this output compare unit
@ -81,7 +78,7 @@ See page 136 of the processors datasheet: http://www.atmel.com/Images/doc2549.pd
#define MAX_TIMER_PERIOD 262140 //The longest period of time (in uS) that the timer can permit (IN this case it is 65535 * 4, as each timer tick is 4uS) #define MAX_TIMER_PERIOD 262140 //The longest period of time (in uS) that the timer can permit (IN this case it is 65535 * 4, as each timer tick is 4uS)
#define uS_TO_TIMER_COMPARE(uS1) (uS1 >> 2) //Converts a given number of uS into the required number of timer ticks until that time has passed #define uS_TO_TIMER_COMPARE(uS1) (uS1 >> 2) //Converts a given number of uS into the required number of timer ticks until that time has passed
#elif defined(CORE_TEENSY) #elif defined(CORE_TEENSY)
//http://shawnhymel.com/661/learning-the-teensy-lc-interrupt-service-routines/ //http://shawnhymel.com/661/learning-the-teensy-lc-interrupt-service-routines/
#define FUEL1_COUNTER FTM0_CNT #define FUEL1_COUNTER FTM0_CNT
#define FUEL2_COUNTER FTM0_CNT #define FUEL2_COUNTER FTM0_CNT
@ -128,7 +125,12 @@ See page 136 of the processors datasheet: http://www.atmel.com/Images/doc2549.pd
#define IGN5_TIMER_DISABLE() FTM1_C0SC &= ~FTM_CSC_CHIE #define IGN5_TIMER_DISABLE() FTM1_C0SC &= ~FTM_CSC_CHIE
#define MAX_TIMER_PERIOD 139808 // 2.13333333uS * 65535 #define MAX_TIMER_PERIOD 139808 // 2.13333333uS * 65535
#define uS_TO_TIMER_COMPARE(uS) ((uS * 15) >> 5) //Converts a given number of uS into the required number of timer ticks until that time has passed. #define uS_TO_TIMER_COMPARE(uS) ((uS * 15) >> 5) //Converts a given number of uS into the required number of timer ticks until that time has passed.
#elif defined(STM32_MCU_SERIES)
//Placeholders ONLY!
#define MAX_TIMER_PERIOD 139808 // 2.13333333uS * 65535
#define uS_TO_TIMER_COMPARE(uS) ((uS * 15) >> 5) //Converts a given number of uS into the required number of timer ticks until that time has passed.
#endif #endif
void initialiseSchedulers(); void initialiseSchedulers();
@ -211,18 +213,18 @@ static inline unsigned int setQueue(volatile Schedule *queue[], Schedule *schedu
queue[2] = schedule1; queue[2] = schedule1;
queue[3] = schedule1; queue[3] = schedule1;
tmpQueue[2] = schedule1->startCompare - CNT; tmpQueue[2] = schedule1->startCompare - CNT;
tmpQueue[3] = schedule1->endCompare - CNT; tmpQueue[3] = schedule1->endCompare - CNT;
} }
else else
{ {
queue[2] = schedule2; queue[2] = schedule2;
queue[3] = schedule2; queue[3] = schedule2;
tmpQueue[2] = schedule2->startCompare - CNT; tmpQueue[2] = schedule2->startCompare - CNT;
tmpQueue[3] = schedule2->endCompare - CNT; tmpQueue[3] = schedule2->endCompare - CNT;
} }
//Sort the queues. Both queues are kept in sync. //Sort the queues. Both queues are kept in sync.
//This implementes a sorting networking based on the Bose-Nelson sorting network //This implementes a sorting networking based on the Bose-Nelson sorting network
//See: http://pages.ripco.net/~jgamble/nw.html //See: http://pages.ripco.net/~jgamble/nw.html
#define SWAP(x,y) if(tmpQueue[y] < tmpQueue[x]) { unsigned int tmp = tmpQueue[x]; tmpQueue[x] = tmpQueue[y]; tmpQueue[y] = tmp; volatile Schedule *tmpS = queue[x]; queue[x] = queue[y]; queue[y] = tmpS; } #define SWAP(x,y) if(tmpQueue[y] < tmpQueue[x]) { unsigned int tmp = tmpQueue[x]; tmpQueue[x] = tmpQueue[y]; tmpQueue[y] = tmp; volatile Schedule *tmpS = queue[x]; queue[x] = queue[y]; queue[y] = tmpS; }
@ -233,11 +235,11 @@ static inline unsigned int setQueue(volatile Schedule *queue[], Schedule *schedu
SWAP(1, 2); SWAP(1, 2);
//Return the next compare time in the queue //Return the next compare time in the queue
return tmpQueue[0] + CNT; //Return the return tmpQueue[0] + CNT; //Return the
} }
/* /*
* Moves all the Schedules in a queue forward one position. * Moves all the Schedules in a queue forward one position.
* The current item (0) is discarded * The current item (0) is discarded
* The final queue slot is set to nullSchedule to indicate that no action should be taken * The final queue slot is set to nullSchedule to indicate that no action should be taken
*/ */