test

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/ST7789_plus_voltage/ST7789_plus_voltage.ino

@@ -32,8 +32,10 @@
      #include "0x35/config_Slave_Ports_neuron_LOCAL_0x35_init.h"
 #elif Active_ControllerID == 0x38
      #include "0x38/config_Slave_Ports_LOCAL_0x38_init.h"
- #elif Active_ControllerID == 0x43
+#elif Active_ControllerID == 0x43
      #include "0x43/config_Slave_Ports_LOCAL_0x43_init.h"
+#elif Active_ControllerID == 0x44
+     #include "0x44/config_Slave_Ports_LOCAL_0x44_init.h"
 #else
     #error not set  correct Active_ControllerID    
 #endif
@@ -50,6 +52,30 @@
 #endif
 
 
+
+#if defined(HAS_TFT_ILI9163C)
+   #include "_TFT_ILI9163C_config.h"
+//  #include "_TFT_ILI9163C_struct.h"
+    bool DISPLAY_PHYS_A_set() {
+        DISPLAY_PHYS_A[0].X = 128 ; 
+        DISPLAY_PHYS_A[0].Y = 128 ;
+    }
+    bool DISPLAY_PHYS_A_set_init = DISPLAY_PHYS_A_set();
+
+   TFT_ILI9163C DISPLAY_DEV = TFT_ILI9163C(TFT_ILI9163C_CSpin, TFT_ILI9163C_DCpin, TFT_ILI9163C__RSTpin); //#include "_TFT_ILI9163C_func.h"
+   #elif defined(HAS_TFT_HX8357)
+   #include <TFT_HX8357.h>
+  // #error test
+   TFT_HX8357 DISPLAY_DEV = TFT_HX8357();       // Invoke custom library
+   bool DISPLAY_PHYS_A_set() {
+        DISPLAY_PHYS_A[0].X = 320 ; 
+        DISPLAY_PHYS_A[0].Y = 240 ;
+    }
+    bool DISPLAY_PHYS_A_set_init = DISPLAY_PHYS_A_set();
+#endif
+
+
+
 void setup() {
   // initialize digital pin ledPin as an output.
     TASK_TYPE_T_Get_Ports_Status_INPUT_A___SETUP();
@@ -74,10 +100,10 @@ void loop() {
   //digitalWrite(ledPin, HIGH);   // turn the LED on (HIGH is the voltage level)
   delay(1000);                  // wait for a second
     DISPLAY_DEV.setTextSize(4);
-    DISPLAY_DEV.drawRect(0, 20, DISPLAY_DEV.width(), 100, MAGENTA);
+    DISPLAY_DEV.fillRect(0, 20, DISPLAY_DEV.width(), 100, ST77XX_MAGENTA);
     DISPLAY_DEV.setCursor(0, 40);
       
       DISPLAY_DEV.print(analogRead(A0));
-      DISPLAY_DEV.setCursor(0, 60);
+      DISPLAY_DEV.setCursor(0, 80);
       DISPLAY_DEV.print(analogRead(A1));
 }

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/ecu_can/ecu_can.ino

@@ -0,0 +1,271 @@
+
+#include "__main_struct.h" //lite #include "___main/__main_struct.h"
+
+#include "progmem.h"
+
+#include "__main_struct_limits.h"
+#include "_PortTypes_struct.h"
+#include "_Port_Exp_state_ttl_struct.h"
+#include "_Port_Broadcast_state_struct.h"
+#include "_PortStates_struct.h"
+#include "_Port_I2C_driver_struct.h"
+#include "config_Active_ControllerID.h"
+#include "config_Slave_Ports_LOCAL_config.h" //lite
+
+#include "automation_driven.submodule.struct.write_neuron_override.h"
+
+
+#include "_TASK_TYPES_struct.h"
+
+#include "_time_struct.h"
+
+#include "TASK_TYPE_T_Get_Ports_Status_INPUT_A___.h"
+
+
+#include "_Slave_Ports_Status_func_add_lite.h"
+
+
+
+#if Active_ControllerID == 0x14 
+    #include "0x14/config_Slave_Ports_LOCAL_0x14_init.h"
+#elif Active_ControllerID == 0x35
+     #include "0x35/config_Slave_Ports_neuron_LOCAL_0x35_init.h"
+#elif Active_ControllerID == 0x38
+     #include "0x38/config_Slave_Ports_LOCAL_0x38_init.h"
+ #elif Active_ControllerID == 0x43
+     #include "0x43/config_Slave_Ports_LOCAL_0x43_init.h"
+#else
+    #error not set  correct Active_ControllerID    
+#endif
+
+
+#if defined(HAS_Adafruit_ST7789)
+    #include <Adafruit_GFX.h>    // Core graphics library
+    #include <Adafruit_ST7789.h> // Hardware-specific library for ST7789
+    #include <SPI.h>  
+    // Initialize Adafruit ST7789 TFT library
+    //    Adafruit_ST7789 DISPLAY_DEV = Adafruit_ST7789(ST7789_CS, ST7789_DC, ST7789_RST);
+    Adafruit_ST7789 DISPLAY_DEV = Adafruit_ST7789(0, ST7789_DC, ST7789_RST);
+
+#endif
+
+
+
+#############
+
+
+// Service 01 PIDs (more detail: https://en.wikipedia.org/wiki/OBD-II_PIDs)
+#define PID_ENGINE_LOAD 0x04
+#define PID_COOLANT_TEMP 0x05
+#define PID_SHORT_TERM_FUEL_TRIM_1 0x06
+#define PID_LONG_TERM_FUEL_TRIM_1 0x07
+#define PID_SHORT_TERM_FUEL_TRIM_2 0x08
+#define PID_LONG_TERM_FUEL_TRIM_2 0x09
+#define PID_FUEL_PRESSURE 0x0A
+#define PID_INTAKE_MAP 0x0B
+#define PID_ENGINE_RPM  0x0C
+#define PID_VEHICLE_SPEED 0x0D
+#define PID_TIMING_ADVANCE 0x0E
+#define PID_INTAKE_TEMP 0x0F
+#define PID_MAF_FLOW 0x10
+#define PID_THROTTLE 0x11
+#define PID_AUX_INPUT 0x1E
+#define PID_RUNTIME 0x1F
+#define PID_DISTANCE_WITH_MIL 0x21
+#define PID_COMMANDED_EGR 0x2C
+#define PID_EGR_ERROR 0x2D
+#define PID_COMMANDED_EVAPORATIVE_PURGE 0x2E
+#define PID_FUEL_LEVEL 0x2F
+#define PID_WARMS_UPS 0x30
+#define PID_DISTANCE 0x31
+#define PID_EVAP_SYS_VAPOR_PRESSURE 0x32
+#define PID_BAROMETRIC 0x33
+#define PID_CATALYST_TEMP_B1S1 0x3C
+#define PID_CATALYST_TEMP_B2S1 0x3D
+#define PID_CATALYST_TEMP_B1S2 0x3E
+#define PID_CATALYST_TEMP_B2S2 0x3F
+#define PID_CONTROL_MODULE_VOLTAGE 0x42
+#define PID_ABSOLUTE_ENGINE_LOAD 0x43
+#define PID_AIR_FUEL_EQUIV_RATIO 0x44
+#define PID_RELATIVE_THROTTLE_POS 0x45
+#define PID_AMBIENT_TEMP 0x46
+#define PID_ABSOLUTE_THROTTLE_POS_B 0x47
+#define PID_ABSOLUTE_THROTTLE_POS_C 0x48
+#define PID_ACC_PEDAL_POS_D 0x49
+#define PID_ACC_PEDAL_POS_E 0x4A
+#define PID_ACC_PEDAL_POS_F 0x4B
+#define PID_COMMANDED_THROTTLE_ACTUATOR 0x4C
+#define PID_TIME_WITH_MIL 0x4D
+#define PID_TIME_SINCE_CODES_CLEARED 0x4E
+#define PID_ETHANOL_FUEL 0x52
+#define PID_FUEL_RAIL_PRESSURE 0x59
+#define PID_HYBRID_BATTERY_PERCENTAGE 0x5B
+#define PID_ENGINE_OIL_TEMP 0x5C
+#define PID_FUEL_INJECTION_TIMING 0x5D
+#define PID_ENGINE_FUEL_RATE 0x5E
+#define PID_ENGINE_TORQUE_DEMANDED 0x61
+#define PID_ENGINE_TORQUE_PERCENTAGE 0x62
+#define PID_ENGINE_REF_TORQUE 0x63
+//----------------------------------------------
+
+#define CAN_ID_PID 0x7DF //OBD-II CAN frame ID
+
+#include <mcp_can.h>
+#include <SPI.h>
+
+#define CAN0_INT 2                              // Set INT to pin 2  <--------- CHANGE if using different pin number
+MCP_CAN CAN0(10);                               // Set CS to pin 10 <--------- CHANGE if using different pin number
+
+long unsigned int rxId;
+unsigned char len = 0;
+unsigned char rxBuf[8];
+char msgString[128];                        // Array to store serial string
+
+void sendPID(unsigned char __pid)
+{
+  unsigned char tmp[8] = {0x02, 0x01, __pid, 0, 0, 0, 0, 0};
+
+  byte sndStat = CAN0.sendMsgBuf(CAN_ID_PID, 0, 8, tmp);
+
+  if (sndStat == CAN_OK) {
+    Serial.print("PID sent: 0x");
+    Serial.println(__pid, HEX);
+  }
+  else {
+    Serial.println("Error Sending Message...");
+  }
+}
+
+void receivePID(unsigned char __pid)
+{
+    if (!digitalRead(CAN0_INT)) {                      // If CAN0_INT pin is low, read receive buffer
+    CAN0.readMsgBuf(&rxId, &len, rxBuf);      // Read data: len = data length, buf = data byte(s)
+
+    sprintf(msgString, "Standard ID: 0x%.3lX, DLC: %1d, Data: ", rxId, len);
+    Serial.print(msgString);
+
+    for (byte i = 0; i < len; i++) {
+      sprintf(msgString, " 0x%.2X", rxBuf[i]);
+      Serial.print(msgString);
+    }
+    Serial.println("");
+
+
+    switch (__pid) {
+      case PID_COOLANT_TEMP:
+        if(rxBuf[2] == PID_COOLANT_TEMP){
+          uint8_t temp;
+          temp = rxBuf[3] - 40;
+          Serial.print("Engine Coolant Temp (degC): ");
+          Serial.println(temp, DEC);
+        }
+      break;
+
+      case PID_ENGINE_RPM:
+        if(rxBuf[2] == PID_ENGINE_RPM){
+          uint16_t rpm;
+          rpm = ((256 * rxBuf[3]) + rxBuf[4]) / 4;
+          Serial.print("Engine Speed (rpm): ");
+          Serial.println(rpm, DEC);
+        }
+      break;
+    }
+  }
+}
+
+/*
+void loop()
+{
+  //request coolant temp
+  sendPID(PID_COOLANT_TEMP);
+
+  delay(40); //to allow time for ECU to reply
+
+  receivePID(PID_COOLANT_TEMP);
+
+  //request engine speed
+  sendPID (PID_ENGINE_RPM);
+
+  delay(40); //to allow time for ECU to reply
+
+  receivePID(PID_ENGINE_RPM);
+
+  //abitrary loop delay
+  delay(40);
+
+}
+
+
+
+*/
+
+
+#############
+
+void setup() {
+  // initialize digital pin ledPin as an output.
+    TASK_TYPE_T_Get_Ports_Status_INPUT_A___SETUP();
+    
+     Serial.begin(115200);
+
+  // Initialize MCP2515 running at 16MHz with a baudrate of 500kb/s and the masks and filters disabled.
+  if (CAN0.begin(MCP_ANY, CAN_500KBPS, MCP_16MHZ) == CAN_OK) { //< -------- - CHANGE if using different board
+//  if (CAN0.begin(MCP_STDEXT, CAN_500KBPS, MCP_16MHZ) == CAN_OK) { //< -------- - CHANGE if using different board
+    Serial.println("MCP2515 Initialized Successfully!");
+  }
+  else {
+    Serial.println("Error Initializing MCP2515...");
+    while (1);
+  }
+
+  //initialise mask and filter to allow only receipt of 0x7xx CAN IDs
+  //CAN0.init_Mask(0, 0, 0x07000000);              // Init first mask...
+  //CAN0.init_Mask(1, 0, 0x07000000);              // Init second mask...
+
+  
+  //for (uint8_t i = 0; i < 6; ++i) {
+  //  CAN0.init_Filt(i, 0, 0x07000000);           //Init filters
+ // }
+  
+  CAN0.setMode(MCP_NORMAL);                     // Set operation mode to normal so the MCP2515 sends acks to received data.
+
+  //pinMode(CAN0_INT, INPUT);                    // Configuring pin for /INT input
+
+  Serial.println("Sending and Receiving OBD-II_PIDs Example...");
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    #if defined(HAS_Adafruit_ST7789)
+ 
+        DISPLAY_DEV.init(240, 240, SPI_MODE2);    // Init ST7789 display 240x240 pixel
+        //DISPLAY_DEV.setRotation(2);
+        DISPLAY_DEV.fillScreen(ST77XX_BLACK);
+        DISPLAY_DEV.setCursor(0, 0);
+          DISPLAY_DEV.setTextColor(WHITE);
+          DISPLAY_DEV.setTextWrap(true);
+          DISPLAY_DEV.print(F("P5 ST7789 Voltage"));
+
+    #endif
+    
+}
+
+
+
+// the loop function runs over and over again forever
+void loop() {
+  //digitalWrite(ledPin, HIGH);   // turn the LED on (HIGH is the voltage level)
+  delay(1000);                  // wait for a second
+    DISPLAY_DEV.setTextSize(4);
+    DISPLAY_DEV.fillRect(0, 20, DISPLAY_DEV.width(), 100, ST77XX_MAGENTA);
+    DISPLAY_DEV.setCursor(0, 40);
+      
+      DISPLAY_DEV.print(analogRead(A0));
+      DISPLAY_DEV.setCursor(0, 80);
+      DISPLAY_DEV.print(analogRead(A1));
+}

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/merc_pump_ctrl/merc_pump_ctrl.ino

@@ -0,0 +1,131 @@
+
+#include "__main_struct.h" //lite #include "___main/__main_struct.h"
+
+#include "progmem.h"
+
+#include "__main_struct_limits.h"
+#include "_PortTypes_struct.h"
+#include "_Port_Exp_state_ttl_struct.h"
+#include "_Port_Broadcast_state_struct.h"
+#include "_PortStates_struct.h"
+#include "_Port_I2C_driver_struct.h"
+#include "config_Active_ControllerID.h"
+#include "config_Slave_Ports_LOCAL_config.h" //lite
+
+#include "automation_driven.submodule.struct.write_neuron_override.h"
+
+
+#include "_TASK_TYPES_struct.h"
+
+#include "_time_struct.h"
+
+#include "TASK_TYPE_T_Get_Ports_Status_INPUT_A___.h"
+
+
+#include "_Slave_Ports_Status_func_add_lite.h"
+
+
+
+#if Active_ControllerID == 0x14 
+    #include "0x14/config_Slave_Ports_LOCAL_0x14_init.h"
+#elif Active_ControllerID == 0x35
+     #include "0x35/config_Slave_Ports_neuron_LOCAL_0x35_init.h"
+#elif Active_ControllerID == 0x38
+     #include "0x38/config_Slave_Ports_LOCAL_0x38_init.h"
+#elif Active_ControllerID == 0x43
+     #include "0x43/config_Slave_Ports_LOCAL_0x43_init.h"
+#elif Active_ControllerID == 0x44
+     #include "0x44/config_Slave_Ports_LOCAL_0x44_init.h"
+#else
+    #error not set  correct Active_ControllerID    
+#endif
+
+
+#if defined(HAS_Adafruit_ST7789)
+    #include <Adafruit_GFX.h>    // Core graphics library
+    #include <Adafruit_ST7789.h> // Hardware-specific library for ST7789
+    #include <SPI.h>  
+    // Initialize Adafruit ST7789 TFT library
+    //    Adafruit_ST7789 DISPLAY_DEV = Adafruit_ST7789(ST7789_CS, ST7789_DC, ST7789_RST);
+    Adafruit_ST7789 DISPLAY_DEV = Adafruit_ST7789(0, ST7789_DC, ST7789_RST);
+
+#endif
+
+
+
+#if defined(HAS_TFT_ILI9163C)
+   #include "_TFT_ILI9163C_config.h"
+   //#include "_TFT_ILI9163C_struct.h"
+   
+    struct DISPLAY_PHYS_S {
+    int X ; //114
+    int Y ; //114
+        } ;
+
+        typedef DISPLAY_PHYS_S DISPLAY_PHYS_T ;
+        #define DISPLAY_PHYS_A_LIMIT 1
+        DISPLAY_PHYS_T DISPLAY_PHYS_A[DISPLAY_PHYS_A_LIMIT] = {} ;
+        
+    bool DISPLAY_PHYS_A_set() {
+        DISPLAY_PHYS_A[0].X = 128 ; 
+        DISPLAY_PHYS_A[0].Y = 128 ;
+    }
+    bool DISPLAY_PHYS_A_set_init = DISPLAY_PHYS_A_set();
+
+   TFT_ILI9163C DISPLAY_DEV = TFT_ILI9163C(TFT_ILI9163C_CSpin, TFT_ILI9163C_DCpin, TFT_ILI9163C__RSTpin); //#include "_TFT_ILI9163C_func.h"
+   #elif defined(HAS_TFT_HX8357)
+   #include <TFT_HX8357.h>
+  // #error test
+   TFT_HX8357 DISPLAY_DEV = TFT_HX8357();       // Invoke custom library
+   bool DISPLAY_PHYS_A_set() {
+        DISPLAY_PHYS_A[0].X = 320 ; 
+        DISPLAY_PHYS_A[0].Y = 240 ;
+    }
+    bool DISPLAY_PHYS_A_set_init = DISPLAY_PHYS_A_set();
+#endif
+
+
+
+void setup() {
+  // initialize digital pin ledPin as an output.
+    
+    Serial.begin(115200);
+    
+     #if defined(HAS_TFT_ILI9163C)
+      DISPLAY_DEV.begin();
+          DISPLAY_DEV.setCursor(5, 3);
+          DISPLAY_DEV.setTextSize(1);
+          DISPLAY_DEV.print(F("p5 merc pump ctrl test"));
+
+     #endif
+    
+    TASK_TYPE_T_Get_Ports_Status_INPUT_A___SETUP();
+    #if defined(HAS_Adafruit_ST7789)
+ 
+        DISPLAY_DEV.init(240, 240, SPI_MODE2);    // Init ST7789 display 240x240 pixel
+        //DISPLAY_DEV.setRotation(2);
+        DISPLAY_DEV.fillScreen(BLACK);
+        DISPLAY_DEV.setCursor(0, 0);
+          DISPLAY_DEV.setTextColor(WHITE);
+          DISPLAY_DEV.setTextWrap(true);
+          DISPLAY_DEV.print(F("P5 ST7789 Voltage"));
+
+    #endif
+    
+}
+
+
+
+// the loop function runs over and over again forever
+void loop() {
+  //digitalWrite(ledPin, HIGH);   // turn the LED on (HIGH is the voltage level)
+  Serial.println(F("L1"));
+  delay(1000);                  // wait for a second
+    DISPLAY_DEV.setTextSize(1);
+    DISPLAY_DEV.fillRect(5, 20, 80, 100, MAGENTA); //DISPLAY_DEV.width()
+    DISPLAY_DEV.setCursor(10, 30);
+      
+      DISPLAY_DEV.print(analogRead(A0));
+      DISPLAY_DEV.setCursor(10, 50);
+      DISPLAY_DEV.print(analogRead(A1));
+}