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

auto-sync

This commit is contained in:
rusEfi 2015-02-17 20:06:10 -06:00
parent 4ee39f8e0a
commit 7f7bd9b0c0
6 changed files with 100 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
firmware/console/tunerstudio/tunerstudio.cpp
View File

@ -80,6 +80,13 @@ extern persistent_config_container_s persistentState;
static efitimems_t previousWriteReportMs = 0;
/**
* we use 'blockingFactor = 256' in rusefi.ini
* todo: should we just do (256 + CRC_WRAPPING_SIZE) ?
*/
static uint8_t crcIoBuffer[300];
static int ts_serial_ready(void) {
#if EFI_PROD_CODE
if (isSerialOverUart()) {
@ -104,7 +111,19 @@ static int tsCounter = 0;
extern TunerStudioOutputChannels tsOutputChannels;
extern TunerStudioState tsState;
extern tunerstudio_counters_s tsState;
static void resetTs(void) {
}
/**
* For some reason I could not get the 'pages' feature of Tuner Studio working - as
* a workaround the whole configuration is just one page
*
* this field is in the end to simply aligning situation
*/
static short currentPageId;
void printTsStats(void) {
#if EFI_PROD_CODE
@ -117,7 +136,7 @@ void printTsStats(void) {
sizeof(tsOutputChannels), tsCounter, tsState.errorCounter, tsState.queryCommandCounter,
tsState.outputChannelsCommandCounter, tsState.readPageCommandsCounter, tsState.burnCommandCounter);
scheduleMsg(tsLogger, "TunerStudio W=%d / C=%d / P=%d / page=%d", tsState.writeValueCommandCounter,
tsState.writeChunkCommandCounter, tsState.pageCommandCounter, tsState.currentPageId);
tsState.writeChunkCommandCounter, tsState.pageCommandCounter, currentPageId);
scheduleMsg(tsLogger, "page size=%d", sizeof(engine_configuration_s));
// scheduleMsg(logger, "analogChartFrequency %d",
@ -187,8 +206,8 @@ int getTunerStudioPageSize(int pageIndex) {
void handlePageSelectCommand(ts_response_format_e mode, uint16_t pageId) {
tsState.pageCommandCounter++;
tsState.currentPageId = pageId;
scheduleMsg(tsLogger, "page %d selected", tsState.currentPageId);
currentPageId = pageId;
scheduleMsg(tsLogger, "page %d selected", currentPageId);
tsSendResponse(mode, NULL, 0);
}
@ -199,21 +218,21 @@ void handlePageSelectCommand(ts_response_format_e mode, uint16_t pageId) {
void handleWriteChunkCommand(ts_response_format_e mode, short offset, short count, void *content) {
tsState.writeChunkCommandCounter++;
scheduleMsg(tsLogger, "%d receiving page %d chunk offset %d size %d", mode, tsState.currentPageId, offset, count);
scheduleMsg(tsLogger, "%d receiving page %d chunk offset %d size %d", mode, currentPageId, offset, count);
if (offset > getTunerStudioPageSize(tsState.currentPageId)) {
if (offset > getTunerStudioPageSize(currentPageId)) {
scheduleMsg(tsLogger, "ERROR offset %d", offset);
tunerStudioError("ERROR: out of range");
offset = 0;
}
if (count > getTunerStudioPageSize(tsState.currentPageId)) {
if (count > getTunerStudioPageSize(currentPageId)) {
tunerStudioError("ERROR: unexpected count");
scheduleMsg(tsLogger, "ERROR count %d", count);
count = 0;
}
uint8_t * addr = (uint8_t *) (getWorkingPageAddr(tsState.currentPageId) + offset);
uint8_t * addr = (uint8_t *) (getWorkingPageAddr(currentPageId) + offset);
memcpy(addr, content, count);
tsSendResponse(mode, NULL, 0);
@ -227,7 +246,7 @@ void handleWriteChunkCommand(ts_response_format_e mode, short offset, short coun
void handleWriteValueCommand(ts_response_format_e mode, uint16_t page, uint16_t offset, uint8_t value) {
tsState.writeValueCommandCounter++;
tsState.currentPageId = page;
currentPageId = page;
//tunerStudioDebug("got W (Write)"); // we can get a lot of these
@ -238,7 +257,7 @@ void handleWriteValueCommand(ts_response_format_e mode, uint16_t page, uint16_t
// int size = sizeof(TunerStudioWriteValueRequest);
// scheduleMsg(logger, "Reading %d\r\n", size);
if (offset > getTunerStudioPageSize(tsState.currentPageId)) {
if (offset > getTunerStudioPageSize(currentPageId)) {
tunerStudioError("ERROR: out of range2");
scheduleMsg(tsLogger, "ERROR offset %d", offset);
offset = 0;
@ -248,10 +267,10 @@ void handleWriteValueCommand(ts_response_format_e mode, uint16_t page, uint16_t
efitimems_t nowMs = currentTimeMillis();
if (nowMs - previousWriteReportMs > 5) {
previousWriteReportMs = nowMs;
scheduleMsg(tsLogger, "page %d offset %d: value=%d", tsState.currentPageId, offset, value);
scheduleMsg(tsLogger, "page %d offset %d: value=%d", currentPageId, offset, value);
}
getWorkingPageAddr(tsState.currentPageId)[offset] = value;
getWorkingPageAddr(currentPageId)[offset] = value;
// scheduleMsg(logger, "va=%d", configWorkingCopy.boardConfiguration.idleValvePin);
}
@ -263,23 +282,23 @@ static void sendErrorCode(void) {
void handlePageReadCommand(ts_response_format_e mode, uint16_t pageId, uint16_t offset, uint16_t count) {
tsState.readPageCommandsCounter++;
tunerStudioDebug("got R (Read page)");
tsState.currentPageId = pageId;
currentPageId = pageId;
#if EFI_TUNER_STUDIO_VERBOSE
scheduleMsg(tsLogger, "%d: Page requested: page %d offset=%d count=%d", mode, (int) tsState.currentPageId, offset,
scheduleMsg(tsLogger, "%d: Page requested: page %d offset=%d count=%d", mode, (int) currentPageId, offset,
count);
#endif
if (tsState.currentPageId > MAX_PAGE_ID) {
scheduleMsg(tsLogger, "invalid Page number %x", tsState.currentPageId);
if (currentPageId > MAX_PAGE_ID) {
scheduleMsg(tsLogger, "invalid Page number %x", currentPageId);
// something is not right here
tsState.currentPageId = 0;
currentPageId = 0;
tunerStudioError("ERROR: invalid page");
return;
}
int size = getTunerStudioPageSize(tsState.currentPageId);
int size = getTunerStudioPageSize(currentPageId);
if (size < offset + count) {
scheduleMsg(tsLogger, "invalid offset/count %d/%d", offset, count);
@ -287,7 +306,7 @@ void handlePageReadCommand(ts_response_format_e mode, uint16_t pageId, uint16_t
return;
}
const uint8_t *addr = (const uint8_t *) (getWorkingPageAddr(tsState.currentPageId) + offset);
const uint8_t *addr = (const uint8_t *) (getWorkingPageAddr(currentPageId) + offset);
tsSendResponse(mode, addr, count);
#if EFI_TUNER_STUDIO_VERBOSE
scheduleMsg(tsLogger, "Sending %d done", count);
@ -303,11 +322,11 @@ void handleBurnCommand(ts_response_format_e mode, uint16_t page) {
tunerStudioDebug("got B (Burn)");
tsState.currentPageId = page;
currentPageId = page;
#if EFI_TUNER_STUDIO_VERBOSE
// pointless since we only have one page now
// scheduleMsg(logger, "Page number %d", tsState.currentPageId);
// scheduleMsg(logger, "Page number %d", currentPageId);
#endif
// todo: how about some multi-threading?
@ -322,6 +341,7 @@ void handleBurnCommand(ts_response_format_e mode, uint16_t page) {
}
static TunerStudioReadRequest readRequest;
static TunerStudioWriteChunkRequest writeChunkRequest;
static short int pageIn;
/**
@ -340,11 +360,40 @@ static bool handlePlainCommand(uint8_t command) {
// todo: validate 'recieved' value
handlePageSelectCommand(TS_PLAIN, pageIn);
return true;
} else if (command == TS_BURN_COMMAND) {
scheduleMsg(tsLogger, "Got naked BURN");
uint16_t page;
int recieved = chSequentialStreamRead(getTsSerialDevice(), (uint8_t * )&page,
sizeof(page));
if (recieved != sizeof(page)) {
tunerStudioError("ERROR: Not enough for plain burn");
return true;
}
handleBurnCommand(TS_PLAIN, page);
return true;
} else if (command == TS_CHUNK_WRITE_COMMAND) {
scheduleMsg(tsLogger, "Got naked CHUNK_WRITE");
int recieved = chSequentialStreamRead(getTsSerialDevice(), (uint8_t * )&writeChunkRequest,
sizeof(writeChunkRequest));
if (recieved != sizeof(writeChunkRequest)) {
scheduleMsg(tsLogger, "ERROR: Not enough for plain chunk write header: %d", recieved);
tsState.errorCounter++;
return true;
}
recieved = chSequentialStreamRead(getTsSerialDevice(), (uint8_t * )&crcIoBuffer, writeChunkRequest.count);
if (recieved != writeChunkRequest.count) {
scheduleMsg(tsLogger, "ERROR: Not enough for plain chunk write content: %d while expecting %d", recieved, writeChunkRequest.count);
tsState.errorCounter++;
return true;
}
handleWriteChunkCommand(TS_PLAIN, writeChunkRequest.offset, writeChunkRequest.count, (uint8_t * )&crcIoBuffer);
return true;
} else if (command == TS_READ_COMMAND) {
//scheduleMsg(logger, "Got naked READ PAGE???");
int recieved = chSequentialStreamRead(getTsSerialDevice(), (uint8_t * )&readRequest, sizeof(readRequest));
if (recieved != sizeof(readRequest)) {
// todo: handler error
tunerStudioError("Not enough for plain read header");
return true;
}
handlePageReadCommand(TS_PLAIN, readRequest.page, readRequest.offset, readRequest.count);
@ -378,13 +427,6 @@ static uint8_t secondByte;
// todo: double-check this
#define CRC_WRAPPING_SIZE 7
/**
* we use 'blockingFactor = 256' in rusefi.ini
* todo: should we just do (256 + CRC_WRAPPING_SIZE) ?
*/
static uint8_t crcIoBuffer[300];
static msg_t tsThreadEntryPoint(void *arg) {
(void) arg;
chRegSetThreadName("tunerstudio thread");
@ -444,7 +486,7 @@ static msg_t tsThreadEntryPoint(void *arg) {
if (incomingPacketSize == 0 || incomingPacketSize > (sizeof(crcIoBuffer) - CRC_WRAPPING_SIZE)) {
scheduleMsg(tsLogger, "TunerStudio: invalid size: %d", incomingPacketSize);
tunerStudioError("ERROR: size");
tunerStudioError("ERROR: CRC header size");
sendErrorCode();
continue;
}
@ -538,6 +580,7 @@ void startTunerStudioConnectivity(Logging *sharedLogger) {
syncTunerStudioCopy();
addConsoleAction("tsinfo", printTsStats);
addConsoleAction("reset_ts", resetTs);
addConsoleActionI("set_ts_speed", setTsSpeed);
chThdCreateStatic(tsThreadStack, sizeof(tsThreadStack), NORMALPRIO, tsThreadEntryPoint, NULL);

2
firmware/console/tunerstudio/tunerstudio_algo.cpp
View File

@ -65,7 +65,7 @@ extern Logging *tsLogger;
#include "tunerstudio.h"
#endif
TunerStudioState tsState;
tunerstudio_counters_s tsState;
TunerStudioOutputChannels tsOutputChannels;
/**
* this is a local copy of the configuration. Any changes to this copy

9
firmware/console/tunerstudio/tunerstudio_algo.h
View File

@ -32,14 +32,7 @@ typedef struct {
int writeValueCommandCounter;
int writeChunkCommandCounter;
int errorCounter;
/**
* For some reason I could not get the 'pages' feature of Tuner Studio working - as
* a workaround the whole configuration is just one page
*
* this field is in the end to simply aligning situation
*/
short currentPageId;
} TunerStudioState;
} tunerstudio_counters_s;
int tunerStudioHandleCrcCommand(uint8_t *data, int incomingPacketSize);

13
firmware/controllers/math/engine_math.cpp
View File

@ -160,8 +160,8 @@ void FuelSchedule::addFuelEvents(OutputSignalList *sourceList, injection_mode_e
* injection phase is scheduled by injection end, so we need to step the angle back
* for the duration of the injection
*/
float baseAngle = getInjectionAngle(engine->rpmCalculator.rpmValue PASS_ENGINE_PARAMETER) +
engineConfiguration->injectionAngle - MS2US(engine->fuelMs) / engine->rpmCalculator.oneDegreeUs;
float baseAngle = getInjectionAngle(engine->rpmCalculator.rpmValue PASS_ENGINE_PARAMETER)
+ engineConfiguration->injectionAngle - MS2US(engine->fuelMs) / engine->rpmCalculator.oneDegreeUs;
switch (mode) {
case IM_SEQUENTIAL:
@ -276,10 +276,11 @@ void findTriggerPosition(event_trigger_position_s *position, angle_t angleOffset
}
static int order_1_THEN_3_THEN_4_THEN2[] = { 1, 3, 4, 2 };
static int order_1_THEN_2_THEN_4_THEN3[] = { 1, 2, 4, 3 };
static int order_1_THEN_3_THEN_2_THEN4[] = { 1, 3, 2, 4 };
static int order_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4[] = { 1, 5, 3, 6, 2, 4 };
static int order_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6[] = {1, 4, 2, 5, 3, 6};
static int order_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6[] = { 1, 4, 2, 5, 3, 6 };
static int order_1_8_4_3_6_5_7_2[] = { 1, 8, 4, 3, 6, 5, 7, 2 };
@ -294,6 +295,10 @@ int getCylinderId(firing_order_e firingOrder, int index) {
return 1;
case FO_1_THEN_3_THEN_4_THEN2:
return order_1_THEN_3_THEN_4_THEN2[index];
case FO_1_THEN_2_THEN_4_THEN3:
return order_1_THEN_2_THEN_4_THEN3[index];
case FO_1_THEN_3_THEN_2_THEN4:
return order_1_THEN_3_THEN_2_THEN4[index];
case FO_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4:
return order_1_THEN_5_THEN_3_THEN_6_THEN_2_THEN_4[index];
case FO_1_THEN_4_THEN_2_THEN_5_THEN_3_THEN_6:

32
firmware/rusefi.cpp
View File

@ -136,6 +136,21 @@ char *getFirmwareError(void) {
return (char*) errorMessageBuffer;
}
// todo: move this into a hw-specific file
static void rebootNow(void) {
NVIC_SystemReset();
}
/**
* Some configuration changes require full firmware reset.
* Once day we will write graceful shutdown, but that would be one day.
*/
static void scheduleReboot(void) {
scheduleMsg(&sharedLogger, "Rebooting in 5 seconds...");
lockAnyContext();
chVTSetI(&resetTimer, 5 * CH_FREQUENCY, (vtfunc_t) rebootNow, NULL);
unlockAnyContext();
}
void swo_init()
{
@ -179,7 +194,7 @@ void runRusEfi(void) {
engine->init();
addConsoleAction("reset", scheduleReset);
addConsoleAction("reboot", scheduleReboot);
/**
* Initialize hardware drivers
@ -220,21 +235,6 @@ void runRusEfi(void) {
}
}
// todo: move this into a hw-specific file
static void rebootNow(void) {
NVIC_SystemReset();
}
/**
* Some configuration changes require full firmware reset.
* Once day we will write graceful shutdown, but that would be one day.
*/
void scheduleReset(void) {
scheduleMsg(&sharedLogger, "Rebooting in 5 seconds...");
lockAnyContext();
chVTSetI(&resetTimer, 5 * CH_FREQUENCY, (vtfunc_t) rebootNow, NULL);
unlockAnyContext();
}
void chDbgStackOverflowPanic(Thread *otp) {
strcpy(panicMessage, "stack overflow: ");
#ifdef CH_USE_REGISTRY

1
firmware/rusefi.h
View File

@ -9,6 +9,5 @@
#define RUSEFI_H_
void runRusEfi(void);
void scheduleReset(void);
#endif /* RUSEFI_H_ */