Skip to content

Mc lab 3 test #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/.gitignore

This file was deleted.

18 changes: 18 additions & 0 deletions .github/actions/avr_setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: "Get changed files list"
description: "Setup Node with caching for dependencies"
runs:
using: "composite"
steps:
- name: Set up Arduino CLI
uses: arduino/setup-arduino-cli@v2

- name: Install platform
run: |
arduino-cli core update-index
arduino-cli core install ${{ env.platform }}
shell: bash

- name: Install popular libs
run: |
arduino-cli lib install LiquidCrystal
shell: bash
13 changes: 13 additions & 0 deletions .github/actions/get_changed_files/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: "Get changed files list"
description: "Setup Node with caching for dependencies"
runs:
using: "composite"
steps:
- name: Get changed files list
id: get_changed_files
run: |
echo "Changed files:"
git diff --name-only ${{ github.event.pull_request.base.sha }} > changed_files.txt
cat changed_files.txt
echo "The list is saved to changed_files.txt"
shell: bash
37 changes: 0 additions & 37 deletions .github/workflows/Lab_01_CI.yml

This file was deleted.

114 changes: 114 additions & 0 deletions .github/workflows/lab-validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
name: Cheking of compile Arduino sketch for AVR/AtMega

on:
pull_request:
branches: [main, master]

env:
platform: "arduino:avr"
fqbn_master: "arduino:avr:mega"
COMMIT_COUNT: $(( ${{ github.event_name == 'pull_request' && github.event.pull_request.commits || 0 }} + 1 ))

jobs:
handle_bad_branch_name:
runs-on: ubuntu-22.04
if: (contains(github.head_ref, 'mc_lab_1') || contains(github.head_ref, 'mc_lab_2') || contains(github.head_ref, 'mc_lab_3') || contains(github.head_ref, 'mc_lab_4') || contains(github.head_ref, 'mc_lab_5') || contains(github.head_ref, 'mc_lab_6') || contains(github.head_ref, 'mc_lab_7')) == false
steps:
- name: Fail the build
run: |
echo "The branch name is not correct. It should contain 'mc_lab_' prefix"
exit 1
build_labs_1_to_4:
runs-on: ubuntu-22.04
if: contains(github.head_ref, 'mc_lab_1') || contains(github.head_ref, 'mc_lab_2') || contains(github.head_ref, 'mc_lab_3') || contains(github.head_ref, 'mc_lab_4')
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: ${{ env.COMMIT_COUNT }}

- name: Get changed files list
uses: ./.github/actions/get_changed_files

- name: Set up Arduino CLI
uses: ./.github/actions/avr_setup

- name: Compile Sketch
run: arduino-cli compile --fqbn ${{ env.fqbn_master }} $(grep -E '\.ino$' changed_files.txt | xargs)
build_lab_5:
runs-on: ubuntu-22.04
if: contains(github.head_ref, 'mc_lab_5')
env:
fqbn_slave: "arduino:avr:nano"
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: ${{ env.COMMIT_COUNT }}

- name: Get changed files list
uses: ./.github/actions/get_changed_files

- name: Get master folder
run: |
cat changed_files.txt | xargs dirname | grep 'master' | grep -m 1 -vE '/(.*master.*|.*slave.*)/' > master_project.txt
echo "Master project:"
cat master_project.txt

- name: Get slave folders
run: |
cat changed_files.txt | xargs dirname | grep 'slave' | grep -vE '/(.*master.*|.*slave.*)/' > slave_projects.txt
echo "Slave projects:"
cat slave_projects.txt

- name: Check if there is at least one master and one slave project
run: |
if [ ! -s master_project.txt ] || [ ! -s slave_projects.txt ]; then
echo "There is no master or slave project"
exit 1
fi

- name: Set up Arduino CLI
uses: ./.github/actions/avr_setup

- name: Compile master
run: while read master_folder; do arduino-cli compile --fqbn ${{ env.fqbn_master }} $master_folder/*.ino; done < master_project.txt

- name: Compile slaves
run: while read slave_folder; do arduino-cli compile --fqbn ${{ env.fqbn_slave }} $slave_folder/*.ino; done < slave_projects.txt
build_lab_6:
runs-on: ubuntu-22.04
if: contains(github.head_ref, 'mc_lab_6')
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: ${{ env.COMMIT_COUNT }}

- name: It just passes
run: echo "It just passes. It's too complex"
build_lab_7:
runs-on: ubuntu-22.04
if: contains(github.head_ref, 'mc_lab_7')
env:
register-bindings: "m2560def.inc"
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: ${{ env.COMMIT_COUNT }}

- name: Get changed files list
uses: ./.github/actions/get_changed_files

- name: Setup AVRA Assembler
run: |
git clone https://github.com/Ro5bert/avra.git
cd avra
sudo make install

- name: Preprocess sketch - append register bindings to the top of the file
run: printf ".include \"${{ env.register-bindings }}\"\n\n" | cat - $(grep -m 1 -E '\.(asm|S)$' changed_files.txt | xargs) > pipeline_main_assembly_source_file.asm

- name: Compile Sketch
run: avra pipeline_main_assembly_source_file.asm
184 changes: 184 additions & 0 deletions mc_labs/mc_lab_03/lab3-mko/keypad4x4.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
#define DDR_KEYPAD DDRK
#define PORT_KEYPAD PORTK
#define PIN_KEYPAD PINK


class Keypad {
public:
bool pressed = false;
char d1, d2, d3, d4, dA, dB, dC, dD;
char columns[4];
char rows[4];
Keypad(char d1, char d2, char d3, char d4, char dA, char dB, char dC, char dD)
: columns({ d1, d2, d3, d4 }),
rows({ dA, dB, dC, dD }) {
this->d1 = d1;
this->d2 = d2;
this->d3 = d3;
this->d4 = d4;
this->dA = dA;
this->dB = dB;
this->dC = dC;
this->dD = dD;
}

bool init() {
for (char row : rows)
pinMode(row, OUTPUT);


for (char column : columns)
pinMode(column, INPUT);
}

bool isPressed() {
return pressed;
}

char readKey() {
char* location = getPressedButtonLocation();

if (!pressed)
return '?';

delay(200);
return getKeyByLocation(location);
}

private:
char* getPressedButtonLocation() {
char result[] = { 0, 0 };
for (char rowToRead : rows) {
for (char row : rows) {
digitalWrite(row, HIGH);
asm("nop");
}
char activeColumn;
for (char column : columns) {
pressed = digitalRead(column) == HIGH;
if (pressed)
activeColumn = column;
}


if (pressed) {
result[0] = rowToRead;
result[1] = activeColumn;
}
}

return result;
}

char getKeyByLocation(char location[2]) {
char key = '?';
if (location[0] == dA && location[2] == d1) key = '7';
if (location[0] == dB && location[2] == d1) key = '4';
if (location[0] == dC && location[2] == d1) key = '1';
if (location[0] == dD && location[2] == d1) key = 'F';
if (location[0] == dA && location[2] == d2) key = '8';
if (location[0] == dB && location[2] == d2) key = '5';
if (location[0] == dC && location[2] == d2) key = '2';
if (location[0] == dD && location[2] == d2) key = '0';
if (location[0] == dD && location[2] == d3) key = '9';
if (location[0] == dA && location[2] == d3) key = '6';
if (location[0] == dB && location[2] == d3) key = '3';
if (location[0] == dC && location[2] == d3) key = 'E';
if (location[0] == dD && location[2] == d4) key = 'A';
if (location[0] == dA && location[2] == d4) key = 'B';
if (location[0] == dB && location[2] == d4) key = 'C';
if (location[0] == dC && location[2] == d4) key = 'D';
return key;
}
};

const int Key_1 = B10111110;
const int Key_2 = B10111101;
const int Key_3 = B10111011;
const int Key_A = B11100111;

const int Key_4 = B11011110;
const int Key_5 = B11011101;
const int Key_6 = B11011011;
const int Key_B = B11010111;

const int Key_7 = B11101110;
const int Key_8 = B11101101;
const int Key_9 = B11101011;
const int Key_C = B10110111;

const int Key_F = B01111110;
const int Key_0 = B01111101;
const int Key_E = B01111011;
const int Key_D = B01110111;

unsigned char freePinFromKeyPad = 1;
unsigned char keyFromKeyPad = 1;
char pressedButton = 0;
bool logicPressed = false;

void initKeyPad() {
DDR_KEYPAD = 0x0F;
PORT_KEYPAD = 0xF0;
}

char readKeyFromPad4x4() {
logicPressed = false;
return pressedButton;
}

bool isButtonPressed() {
if (freePinFromKeyPad == 1) //перевірка чи була натиснута кнопка
{ //якщо =1, тоді ще не натискалася
if (PIN_KEYPAD != 0xF0) {
delay(50);
freePinFromKeyPad = 0;
keyFromKeyPad = 1;
// Визначення натиснутої клавіші
// почергова подача 0V на рядки клавіатури A,B,C,D
PORT_KEYPAD = B11111110; // A-рядок
asm("nop");
if (PORT_KEYPAD == PIN_KEYPAD) {
PORT_KEYPAD = B11111101; // B-рядок
asm("nop");
if (PORT_KEYPAD == PIN_KEYPAD) {
PORT_KEYPAD = B11111011; // C-рядок
asm("nop");
if (PORT_KEYPAD == PIN_KEYPAD) {
PORT_KEYPAD = B11110111; // D-рядок
asm("nop");
if (PORT_KEYPAD == PIN_KEYPAD)
keyFromKeyPad = 0; // жодна клавіша не натиснута
}
}
}
if (keyFromKeyPad == 1) //визначення натиснутої клавіші
{
if (PIN_KEYPAD == Key_1) pressedButton = '1';
else if (PIN_KEYPAD == Key_2) pressedButton = '2';
else if (PIN_KEYPAD == Key_3) pressedButton = '3';
else if (PIN_KEYPAD == Key_4) pressedButton = '4';
else if (PIN_KEYPAD == Key_5) pressedButton = '5';
else if (PIN_KEYPAD == Key_6) pressedButton = '6';
else if (PIN_KEYPAD == Key_7) pressedButton = '7';
else if (PIN_KEYPAD == Key_8) pressedButton = '8';
else if (PIN_KEYPAD == Key_9) pressedButton = '9';
else if (PIN_KEYPAD == Key_0) pressedButton = '0';
else if (PIN_KEYPAD == Key_A) pressedButton = 'A';
else if (PIN_KEYPAD == Key_B) pressedButton = 'B';
else if (PIN_KEYPAD == Key_C) pressedButton = 'C';
else if (PIN_KEYPAD == Key_D) pressedButton = 'D';
else if (PIN_KEYPAD == Key_E) pressedButton = 'E';
else if (PIN_KEYPAD == Key_F) pressedButton = 'F';
logicPressed = true;
}

PORT_KEYPAD = 0xF0; //відновлюємо порт
}
} else if (PIN_KEYPAD == 0xF0) //перевіряємо чи кнопка відпущена
{
delay(200);
freePinFromKeyPad = 1;
}
return logicPressed;
}
Loading