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

auto-sync

This commit is contained in:
rusEfi 2014-12-22 21:03:34 -06:00
parent 18ac924b30
commit 1a4614d79c
3 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,12 +12,6 @@
#include <stdint.h> #include <stdint.h>
// http://en.wikipedia.org/wiki/Endianness
#define SWAP_UINT16(x) ((x) << 8) | ((x) >> 8)
#define SWAP_UINT32(x) (((x) >> 24) & 0xff) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) | (((x) << 24) & 0xff000000)
// response codes // response codes
#define TS_RESPONSE_OK 0x00 #define TS_RESPONSE_OK 0x00

56
firmware/hw_layer/can_hw.cpp
View File

@ -117,40 +117,40 @@ static void canDashboardBMW(void) {
static void canMazdaRX8(void) { static void canMazdaRX8(void) {
rand = rand * 17; rand = rand * 17;
commonTxInit(0x300); // commonTxInit(0x300);
sendMessage2(0); // sendMessage2(0);
commonTxInit(CAN_MAZDA_RX_RPM_SPEED); commonTxInit(CAN_MAZDA_RX_RPM_SPEED);
setShortValue(&txmsg, engine_rpm * 4, 1); float mph = 123;
setShortValue(&txmsg, 0xFFFF, 3); float kph = mph * 1.60934;
setShortValue(&txmsg, 123 + 10000, 5);
setShortValue(&txmsg, 0, 7); setShortValue(&txmsg, SWAP_UINT16(engine_rpm * 4), 0);
setShortValue(&txmsg, 0xFFFF, 2);
setShortValue(&txmsg, SWAP_UINT16((int )(100 * kph + 10000)), 4);
setShortValue(&txmsg, 0, 6);
sendMessage(); sendMessage();
commonTxInit(CAN_MAZDA_RX_STATUS_1); commonTxInit(CAN_MAZDA_RX_STATUS_2);
setShortValue(&txmsg, engine_rpm * 4, 1); txmsg.data8[0] = 0xFE; //Unknown
setShortValue(&txmsg, 0xFFFF, 3); txmsg.data8[1] = 0xFE; //Unknown
setShortValue(&txmsg, 123 + 10000, 5); txmsg.data8[2] = 0xFE; //Unknown
setShortValue(&txmsg, 0, 7); txmsg.data8[3] = 0x34; //DSC OFF in combo with byte 5 Live data only seen 0x34
sendMessage2(7); txmsg.data8[4] = 0x00; // B01000000; // Brake warning B00001000; //ABS warning
txmsg.data8[5] = 0x40; // TCS in combo with byte 3
commonTxInit(CAN_MAZDA_RX_STATUS_1); txmsg.data8[6] = 0x00; // Unknown
setShortValue(&txmsg, engine_rpm * 4, 1); txmsg.data8[7] = 0x00; // Unused
setShortValue(&txmsg, 0xFFFF, 3);
setShortValue(&txmsg, 123 + 10000, 5);
setShortValue(&txmsg, 0, 7);
sendMessage2(7);
// my_data[0] = (RPM * 4) / 256; // rpm
// my_data[1] = (RPM * 4) % 256; // rpm
// my_data[2] = 0xFF; // Unknown, 0xFF from 'live'.
// my_data[3] = 0xFF; // Unknown, 0xFF from 'live'.
// my_data[4] = (kmhspeed+10000) / 256; //speed
// my_data[5] = (kmhspeed+10000) % 256; //speed
// my_data[6] = 0x00; // Unknown possible accelerator pedel if Madox is correc
// my_data[7] = 0x00; //Unknown
commonTxInit(CAN_MAZDA_RX_STATUS_2);
txmsg.data8[0] = 0x98; //temp gauge //~170 is red, ~165 last bar, 152 centre, 90 first bar, 92 second bar
txmsg.data8[1] = 0x00; // something to do with trip meter 0x10, 0x11, 0x17 increments by 0.1 miles
txmsg.data8[2] = 0x00; // unknown
txmsg.data8[3] = 0x00; //unknown
txmsg.data8[4] = 0x01; //Oil Pressure (not really a gauge)
txmsg.data8[5] = 0x00; //check engine light
txmsg.data8[6] = 0x00; //Coolant, oil and battery
txmsg.data8[7] = 0x00; //unused
sendMessage();
} }
static void canDashboardFiat(void) { static void canDashboardFiat(void) {

7
firmware/util/efilib.h
View File

@ -11,6 +11,13 @@
#include <stdint.h> #include <stdint.h>
#include "global.h" #include "global.h"
// http://en.wikipedia.org/wiki/Endianness
#define SWAP_UINT16(x) ((x) << 8) | ((x) >> 8)
#define SWAP_UINT32(x) (((x) >> 24) & 0xff) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) | (((x) << 24) & 0xff000000)
// number of milliseconds in one period of given frequency (per second) // number of milliseconds in one period of given frequency (per second)
#define frequency2periodMs(freq) ((1000.0f) / (freq)) #define frequency2periodMs(freq) ((1000.0f) / (freq))