renamed master display function and made it compile again

firmware/masterchip/display.c

@@ -255,7 +255,7 @@ void display_bar(int8_t value, int8_t min, int8_t max) {
 	}
 }
 
-void updateTemperature() {
+void displayTemperature() {
   if(newThermoData==1) {
     newThermoData = 0;
     

firmware/masterchip/display.h

@@ -38,6 +38,6 @@ extern void display_puthex(uint8_t outbyte);
 extern void display_bar(int8_t value, int8_t min, int8_t max);
 extern void display_putint(int16_t number);
 
-extern void updateTemperature();
+extern void displayTemperature();
 
 #endif

firmware/masterchip/main.c

@@ -84,33 +84,8 @@ int __attribute__((noreturn)) main(void) {
     }
 
     SOFTTIMER(1,250) {
-      updateTemperature();    
+      displayTemperature();
     }
-
-/*    SOFTTIMER(3,100) {
-/*        uint8_t foo[4];
-        foo[0]=0x55;
-        foo[1]=0x88;
-        foo[3]=0x23;
-        spi_mst_write_read(2,foo);
-        spi_mst_start_packet();
-        spi_mst_write_read(2,foo+2);
-        spi_mst_end_packet();
-
-        uint16_t foo=0x3456;
-        foo=spi_master_communicate(3,5,foo);
-        display_gotoyx(0,0);
-        display_puthex(foo[0]);
-        display_puthex(foo[1]);
-        display_puthex(foo[2]);
-        display_puthex(foo[3]);
-        display_puthex((foo>>8)&0xff);
-        display_puthex((foo)&0xff);
-        display_puts("\nfoo");
-        display_update();
-
-    }*/
-
   }
 }
 

firmware/shared/spi_proto.c

@@ -1,6 +1,9 @@
 #include "spi_proto.h"
 #include "spi.h"
+
+#ifndef SPI_MASTER
 #include "main.h"
+#endif
 
 /***** MASTER *****/
 
@@ -91,9 +94,11 @@ uint16_t spi_proto_slaveaction(uint8_t opcode, uint8_t addr, uint16_t data) {
 			//TODO: prevent a function from being run several times because the message gets repeated.
 			break;
 		case 7:
+#ifndef SPI_MASTER
 			if(addr < 4) {
 				retval = temperatures[addr];
 			} else return 0;
+#endif
 			break;
 		default:
 			break;

firmware/shared/spi_proto.h

@@ -21,12 +21,6 @@ void call_func(uint8_t number);
 
 /***** MASTER END *****/
 /***** SLAVE *****/
-
-/*
-extern uint16_t *spi_proto_globals8[];
-extern uint8_t *spi_proto_globals16[];
-extern funptr_t spi_proto_funcs[];
-*/
 #include "spi_pointers.h"
 
 uint16_t spi_proto_slaveaction(uint8_t opcode, uint8_t addr, uint16_t data);