tylen/SHOH-Innovation-Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prototype: Change pins to the prototype ones.

Browse Source
This commit is contained in:
RedHawk 2023-06-09 11:10:21 +03:00
parent 2e496a23c9
commit 2b785e5b0c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/shoh/src/threads/relay/Relay.h
View File

@ -48,8 +48,8 @@ public:
void utilizeEventData(); void utilizeEventData();
private: private:
ThreadCommon::QueueManager* _qm; ThreadCommon::QueueManager* _qm;
RelayDevice relays [2] = {{0, 24, 0}, RelayDevice relays [2] = {{0, 11, 0},
{0, 26, 1}}; {0, 23, 1}};
void parseEvent(Event * e); void parseEvent(Event * e);
int8_t setpoint, ext_temp; int8_t setpoint, ext_temp;

6
source/shoh/src/threads/rotary/Rotary.h
View File

@ -20,9 +20,9 @@ public:
private: private:
Event* message; Event* message;
ThreadCommon::QueueManager* _qm; ThreadCommon::QueueManager* _qm;
DigitalIoPin signal[3] = { { 0, 1, true, true, false, true, PIN_INT0_IRQn}, //SW1 DigitalIoPin signal[3] = { { 1, 18, true, true, false, true, PIN_INT0_IRQn}, //SW1 //Right //0 1
{ 0, 16, true, true, false, true, PIN_INT1_IRQn}, //SW2 { 2, 12, true, true, false, true, PIN_INT1_IRQn}, //SW2 //Left //0 16
{ 1, 8, true, false, false, true, PIN_INT2_IRQn} }; { 2, 11, true, false, false, true, PIN_INT2_IRQn} }; //Press //1 8
}; };
void thread_rotary(void* pvParams); void thread_rotary(void* pvParams);

12
source/shoh/src/threads/user_interface/UserInterface.cpp
View File

@ -75,12 +75,12 @@ void UserInterface::handleLCD(LiquidCrystal *lcd, const char *str)
void UserInterface::initLCD1() void UserInterface::initLCD1()
{ {
this->lcd1_rs = new DigitalIoPin(1, 9, false); this->lcd1_rs = new DigitalIoPin(1, 24, false);//(1, 18, false);
this->lcd1_en = new DigitalIoPin(0, 14, false); this->lcd1_en = new DigitalIoPin(1, 26, false);//(1, 24, false);
this->lcd1_d4 = new DigitalIoPin(0, 13, false); this->lcd1_d4 = new DigitalIoPin(1, 27, false);//(1, 19, false);
this->lcd1_d5 = new DigitalIoPin(0, 12, false); this->lcd1_d5 = new DigitalIoPin(1, 25, false);//(1, 26, false);
this->lcd1_d6 = new DigitalIoPin(0, 23, false); this->lcd1_d6 = new DigitalIoPin(1, 28, false);//(1, 27, false);
this->lcd1_d7 = new DigitalIoPin(0, 11, false); this->lcd1_d7 = new DigitalIoPin(2, 3, false);//(1, 25, false);
this->lcd1_rs->write(false); this->lcd1_rs->write(false);
this->lcd1_en->write(false); this->lcd1_en->write(false);