From b472155eb15b9cd27c6ef0908c19a79c1799df12 Mon Sep 17 00:00:00 2001
From: ks6n19 <ks6n19@soton.ac.uk>
Date: Tue, 18 Aug 2020 11:42:33 +0100
Subject: [PATCH] Update main.c
---
software/code/main.c | 36 +++++++-----------------------------
1 file changed, 7 insertions(+), 29 deletions(-)
diff --git a/software/code/main.c b/software/code/main.c
index 5ff1cc1..1fc69ad 100644
--- a/software/code/main.c
+++ b/software/code/main.c
@@ -25,11 +25,6 @@ volatile uint32_t* OUT_REGS = (volatile uint32_t*) AHB_OUT_BASE;
//////////////////////////////////////////////////////////////////
// Functions provided to access i/o devices
//////////////////////////////////////////////////////////////////
-uint32_t read_switches(int addr) {
-
- return SW_REGS[addr];
-
-}
// x1
void write_out_0(uint32_t value_0) {
@@ -109,31 +104,14 @@ void wait_for_any_switch_data(void) {
//////////////////////////////////////////////////////////////////
int main(void) {
- int switch_temp ;
-
-while(1) {
- if ( check_switches(0) ) {
- write_out( read_switches(0) );
- }
- if ( check_switches(1) ) {
- switch_temp = read_switches(1);
- if (switch_temp = 1) {
- write_out_0( 0x000 ); //x1
- write_out_1( 0x000 );//y1
- write_out_2( 0x140 );//x2
- write_out_3( 0x140 );// y2
- }
- if (switch_temp = 0) {
- write_out_0( 0x000 ); //x1
- write_out_1( 0x000 );//y1
- write_out_2( 0x200 );//x2
- write_out_3( 0x240 );// y2
- }
- }
- }
-}
+while(1) {
+ write_out_0( 0xA ); //x1
+ write_out_1( 0x64 );//y1
+ write_out_2( 0xA );//x2
+ write_out_3( 0x64 );// y2
+}
-
+}
--
GitLab