From: Andrea Manni Date: Fri, 6 Nov 2015 16:40:51 +0000 (+0100) Subject: Pre Crocetta X-Git-Url: http://git.piffa.net/web?p=scratch;a=commitdiff_plain;h=87773b290b8df867efe57835b9aad284eb42af14 Pre Crocetta --- diff --git a/S4AFirmware16.ino b/S4AFirmware16.ino deleted file mode 100644 index 1423c20..0000000 --- a/S4AFirmware16.ino +++ /dev/null @@ -1,237 +0,0 @@ -// NEW IN VERSION 1.6c (by Jorge Gomez): -// Fixed variable type in pin structure: pin.state should be int, not byte -// Optimized speed of execution while receiving data from computer in readSerialPort() - -// NEW IN VERSION 1.6b (by Jorge Gomez): -// Added new structure arduinoPins to hold the pins information: -// - This makes the code easier to read and modify (IMHO) -// - Allows to change the type of pin more easily to meet non standard use of S4A -// - Eliminates the need of having to deal with different kind of index access (ie: states[pin-4]) -// - By using an enum to hold all the possible output pin states the code is now more readable -// Changed all functions using old style pin access: configurePins(), resetPins(), readSerialPort(), updateActuator() and sendUpdateActuator() -// Fixed possible overflow every 70 minutes (2e32 us) in pulse() while using micros(). Changed for delayMicroseconds() -// Some minor coding style fixes - -// NEW IN VERSION 1.6a (by Jorge Gomez): -// Fixed compatibility with Arduino Leonardo by avoiding the use of timers -// readSerialPort() optimized: -// - created state machine for reading the two bytes of the S4A message -// - updateActuator() is only called if the state is changed -// Memory use optimization -// Cleaning some parts of code -// Avoid using some global variables - -// NEW IN VERSION 1.6: -// Refactored reset pins -// Merged code for standard and CR servos -// Merged patch for Leonardo from Peter Mueller (many thanks for this!) - -// NEW IN VERSION 1.5: -// Changed pin 8 from standard servo to normal digital output - -// NEW IN VERSION 1.4: -// Changed Serial.print() for Serial.write() in ScratchBoardSensorReport function to make it compatible with latest Arduino IDE (1.0) - -// NEW IN VERSION 1.3: -// Now it works on GNU/Linux. Also tested with MacOS and Windows 7. -// timer2 set to 20ms, fixing a glitch that made this period unstable in previous versions. -// readSerialport() function optimized. -// pulse() modified so that it receives pulse width as a parameter instead using a global variable. -// updateServoMotors changes its name as a global variable had the same name. -// Some minor fixes. - -typedef enum { - input, servomotor, pwm, digital } -pinType; - -typedef struct pin { - pinType type; //Type of pin - int state; //State of an output - //byte value; //Value of an input. Not used by now. TODO -}; - -pin arduinoPins[14]; //Array of struct holding 0-13 pins information - -unsigned long lastDataReceivedTime = millis(); - -void setup() -{ - Serial.begin(38400); - Serial.flush(); - configurePins(); - resetPins(); -} - -void loop() -{ - static unsigned long timerCheckUpdate = millis(); - - if (millis()-timerCheckUpdate>=20) - { - sendUpdateServomotors(); - sendSensorValues(); - timerCheckUpdate=millis(); - } - - readSerialPort(); -} - -void configurePins() -{ - arduinoPins[0].type=input; - arduinoPins[1].type=input; - arduinoPins[2].type=input; - arduinoPins[3].type=input; - arduinoPins[4].type=servomotor; - arduinoPins[5].type=pwm; - arduinoPins[6].type=pwm; - arduinoPins[7].type=servomotor; - arduinoPins[8].type=servomotor; - arduinoPins[9].type=pwm; - arduinoPins[10].type=digital; - arduinoPins[11].type=digital; - arduinoPins[12].type=digital; - arduinoPins[13].type=digital; -} - -void resetPins() { - for (byte index=0; index <=13; index++) - { - if (arduinoPins[index].type!=input) - { - pinMode(index, OUTPUT); - if (arduinoPins[index].type==servomotor) - { - arduinoPins[index].state = 255; - servo (index, 255); - } - else - { - arduinoPins[index].state=0; - digitalWrite(index,LOW); - } - } - } -} - -void sendSensorValues() -{ - unsigned int sensorValues[6], readings[5]; - byte sensorIndex; - - for (sensorIndex = 0; sensorIndex < 6; sensorIndex++) //for analog sensors, calculate the median of 5 sensor readings in order to avoid variability and power surges - { - for (byte p = 0; p < 5; p++) - readings[p] = analogRead(sensorIndex); - insertionSort(readings, 5); //sort readings - sensorValues[sensorIndex] = readings[2]; //select median reading - } - - //send analog sensor values - for (sensorIndex = 0; sensorIndex < 6; sensorIndex++) - ScratchBoardSensorReport(sensorIndex, sensorValues[sensorIndex]); - - //send digital sensor values - ScratchBoardSensorReport(6, digitalRead(2)?1023:0); - ScratchBoardSensorReport(7, digitalRead(3)?1023:0); -} - -void insertionSort(unsigned int* array, unsigned int n) -{ - for (int i = 1; i < n; i++) - for (int j = i; (j > 0) && ( array[j] < array[j-1] ); j--) - swap( array, j, j-1 ); -} - -void swap(unsigned int* array, unsigned int a, unsigned int b) -{ - unsigned int temp = array[a]; - array[a] = array[b]; - array[b] = temp; -} - -void ScratchBoardSensorReport(byte sensor, int value) //PicoBoard protocol, 2 bytes per sensor -{ - Serial.write( B10000000 - | ((sensor & B1111)<<3) - | ((value>>7) & B111)); - Serial.write( value & B1111111); -} - -void readSerialPort() -{ - byte pin; - int newVal; - static byte actuatorHighByte, actuatorLowByte; - static byte readingSM = 0; - - if (Serial.available()) - { - if (readingSM == 0) - { - actuatorHighByte = Serial.read(); - if (actuatorHighByte >= 128) readingSM = 1; - } - else if (readingSM == 1) - { - actuatorLowByte = Serial.read(); - if (actuatorLowByte < 128) readingSM = 2; - else readingSM = 0; - } - - if (readingSM == 2) - { - lastDataReceivedTime = millis(); - pin = ((actuatorHighByte >> 3) & 0x0F); - newVal = ((actuatorHighByte & 0x07) << 7) | (actuatorLowByte & 0x7F); - - if(arduinoPins[pin].state != newVal) - { - arduinoPins[pin].state = newVal; - updateActuator(pin); - } - readingSM = 0; - } - } - else checkScratchDisconnection(); -} - -void reset() //with xbee module, we need to simulate the setup execution that occurs when a usb connection is opened or closed without this module -{ - resetPins(); // reset pins - sendSensorValues(); // protocol handshaking - lastDataReceivedTime = millis(); -} - -void updateActuator(byte pinNumber) -{ - if (arduinoPins[pinNumber].type==digital) digitalWrite(pinNumber, arduinoPins[pinNumber].state); - else if (arduinoPins[pinNumber].type==pwm) analogWrite(pinNumber, arduinoPins[pinNumber].state); -} - -void sendUpdateServomotors() -{ - for (byte p = 0; p < 10; p++) - if (arduinoPins[p].type == servomotor) servo(p, arduinoPins[p].state); -} - -void servo (byte pinNumber, byte angle) -{ - if (angle != 255) - pulse(pinNumber, (angle * 10) + 600); -} - -void pulse (byte pinNumber, unsigned int pulseWidth) -{ - digitalWrite(pinNumber, HIGH); - delayMicroseconds(pulseWidth); - digitalWrite(pinNumber, LOW); -} - -void checkScratchDisconnection() //the reset is necessary when using an wireless arduino board (because we need to ensure that arduino isn't waiting the actuators state from Scratch) or when scratch isn't sending information (because is how serial port close is detected) -{ - if (millis() - lastDataReceivedTime > 1000) reset(); //reset state if actuators reception timeout = one second -} - - - diff --git a/S4AFirmware16/S4AFirmware16.ino b/S4AFirmware16/S4AFirmware16.ino new file mode 100644 index 0000000..1423c20 --- /dev/null +++ b/S4AFirmware16/S4AFirmware16.ino @@ -0,0 +1,237 @@ +// NEW IN VERSION 1.6c (by Jorge Gomez): +// Fixed variable type in pin structure: pin.state should be int, not byte +// Optimized speed of execution while receiving data from computer in readSerialPort() + +// NEW IN VERSION 1.6b (by Jorge Gomez): +// Added new structure arduinoPins to hold the pins information: +// - This makes the code easier to read and modify (IMHO) +// - Allows to change the type of pin more easily to meet non standard use of S4A +// - Eliminates the need of having to deal with different kind of index access (ie: states[pin-4]) +// - By using an enum to hold all the possible output pin states the code is now more readable +// Changed all functions using old style pin access: configurePins(), resetPins(), readSerialPort(), updateActuator() and sendUpdateActuator() +// Fixed possible overflow every 70 minutes (2e32 us) in pulse() while using micros(). Changed for delayMicroseconds() +// Some minor coding style fixes + +// NEW IN VERSION 1.6a (by Jorge Gomez): +// Fixed compatibility with Arduino Leonardo by avoiding the use of timers +// readSerialPort() optimized: +// - created state machine for reading the two bytes of the S4A message +// - updateActuator() is only called if the state is changed +// Memory use optimization +// Cleaning some parts of code +// Avoid using some global variables + +// NEW IN VERSION 1.6: +// Refactored reset pins +// Merged code for standard and CR servos +// Merged patch for Leonardo from Peter Mueller (many thanks for this!) + +// NEW IN VERSION 1.5: +// Changed pin 8 from standard servo to normal digital output + +// NEW IN VERSION 1.4: +// Changed Serial.print() for Serial.write() in ScratchBoardSensorReport function to make it compatible with latest Arduino IDE (1.0) + +// NEW IN VERSION 1.3: +// Now it works on GNU/Linux. Also tested with MacOS and Windows 7. +// timer2 set to 20ms, fixing a glitch that made this period unstable in previous versions. +// readSerialport() function optimized. +// pulse() modified so that it receives pulse width as a parameter instead using a global variable. +// updateServoMotors changes its name as a global variable had the same name. +// Some minor fixes. + +typedef enum { + input, servomotor, pwm, digital } +pinType; + +typedef struct pin { + pinType type; //Type of pin + int state; //State of an output + //byte value; //Value of an input. Not used by now. TODO +}; + +pin arduinoPins[14]; //Array of struct holding 0-13 pins information + +unsigned long lastDataReceivedTime = millis(); + +void setup() +{ + Serial.begin(38400); + Serial.flush(); + configurePins(); + resetPins(); +} + +void loop() +{ + static unsigned long timerCheckUpdate = millis(); + + if (millis()-timerCheckUpdate>=20) + { + sendUpdateServomotors(); + sendSensorValues(); + timerCheckUpdate=millis(); + } + + readSerialPort(); +} + +void configurePins() +{ + arduinoPins[0].type=input; + arduinoPins[1].type=input; + arduinoPins[2].type=input; + arduinoPins[3].type=input; + arduinoPins[4].type=servomotor; + arduinoPins[5].type=pwm; + arduinoPins[6].type=pwm; + arduinoPins[7].type=servomotor; + arduinoPins[8].type=servomotor; + arduinoPins[9].type=pwm; + arduinoPins[10].type=digital; + arduinoPins[11].type=digital; + arduinoPins[12].type=digital; + arduinoPins[13].type=digital; +} + +void resetPins() { + for (byte index=0; index <=13; index++) + { + if (arduinoPins[index].type!=input) + { + pinMode(index, OUTPUT); + if (arduinoPins[index].type==servomotor) + { + arduinoPins[index].state = 255; + servo (index, 255); + } + else + { + arduinoPins[index].state=0; + digitalWrite(index,LOW); + } + } + } +} + +void sendSensorValues() +{ + unsigned int sensorValues[6], readings[5]; + byte sensorIndex; + + for (sensorIndex = 0; sensorIndex < 6; sensorIndex++) //for analog sensors, calculate the median of 5 sensor readings in order to avoid variability and power surges + { + for (byte p = 0; p < 5; p++) + readings[p] = analogRead(sensorIndex); + insertionSort(readings, 5); //sort readings + sensorValues[sensorIndex] = readings[2]; //select median reading + } + + //send analog sensor values + for (sensorIndex = 0; sensorIndex < 6; sensorIndex++) + ScratchBoardSensorReport(sensorIndex, sensorValues[sensorIndex]); + + //send digital sensor values + ScratchBoardSensorReport(6, digitalRead(2)?1023:0); + ScratchBoardSensorReport(7, digitalRead(3)?1023:0); +} + +void insertionSort(unsigned int* array, unsigned int n) +{ + for (int i = 1; i < n; i++) + for (int j = i; (j > 0) && ( array[j] < array[j-1] ); j--) + swap( array, j, j-1 ); +} + +void swap(unsigned int* array, unsigned int a, unsigned int b) +{ + unsigned int temp = array[a]; + array[a] = array[b]; + array[b] = temp; +} + +void ScratchBoardSensorReport(byte sensor, int value) //PicoBoard protocol, 2 bytes per sensor +{ + Serial.write( B10000000 + | ((sensor & B1111)<<3) + | ((value>>7) & B111)); + Serial.write( value & B1111111); +} + +void readSerialPort() +{ + byte pin; + int newVal; + static byte actuatorHighByte, actuatorLowByte; + static byte readingSM = 0; + + if (Serial.available()) + { + if (readingSM == 0) + { + actuatorHighByte = Serial.read(); + if (actuatorHighByte >= 128) readingSM = 1; + } + else if (readingSM == 1) + { + actuatorLowByte = Serial.read(); + if (actuatorLowByte < 128) readingSM = 2; + else readingSM = 0; + } + + if (readingSM == 2) + { + lastDataReceivedTime = millis(); + pin = ((actuatorHighByte >> 3) & 0x0F); + newVal = ((actuatorHighByte & 0x07) << 7) | (actuatorLowByte & 0x7F); + + if(arduinoPins[pin].state != newVal) + { + arduinoPins[pin].state = newVal; + updateActuator(pin); + } + readingSM = 0; + } + } + else checkScratchDisconnection(); +} + +void reset() //with xbee module, we need to simulate the setup execution that occurs when a usb connection is opened or closed without this module +{ + resetPins(); // reset pins + sendSensorValues(); // protocol handshaking + lastDataReceivedTime = millis(); +} + +void updateActuator(byte pinNumber) +{ + if (arduinoPins[pinNumber].type==digital) digitalWrite(pinNumber, arduinoPins[pinNumber].state); + else if (arduinoPins[pinNumber].type==pwm) analogWrite(pinNumber, arduinoPins[pinNumber].state); +} + +void sendUpdateServomotors() +{ + for (byte p = 0; p < 10; p++) + if (arduinoPins[p].type == servomotor) servo(p, arduinoPins[p].state); +} + +void servo (byte pinNumber, byte angle) +{ + if (angle != 255) + pulse(pinNumber, (angle * 10) + 600); +} + +void pulse (byte pinNumber, unsigned int pulseWidth) +{ + digitalWrite(pinNumber, HIGH); + delayMicroseconds(pulseWidth); + digitalWrite(pinNumber, LOW); +} + +void checkScratchDisconnection() //the reset is necessary when using an wireless arduino board (because we need to ensure that arduino isn't waiting the actuators state from Scratch) or when scratch isn't sending information (because is how serial port close is detected) +{ + if (millis() - lastDataReceivedTime > 1000) reset(); //reset state if actuators reception timeout = one second +} + + + diff --git a/esercizi/analog_input_6.sb b/esercizi/analog_input_6.sb index 83e61d0..5ef3c95 100644 Binary files a/esercizi/analog_input_6.sb and b/esercizi/analog_input_6.sb differ diff --git a/esercizi/bottone_ciclo_condizionele_4.sb b/esercizi/bottone_ciclo_condizionele_4.sb index 0e304a8..443e03d 100644 Binary files a/esercizi/bottone_ciclo_condizionele_4.sb and b/esercizi/bottone_ciclo_condizionele_4.sb differ diff --git a/esercizi/camminata_7.sb b/esercizi/camminata_7.sb index 38158fb..7e4a526 100644 Binary files a/esercizi/camminata_7.sb and b/esercizi/camminata_7.sb differ diff --git a/esercizi/ciclo_iterattivo_5.sb b/esercizi/ciclo_iterattivo_5.sb index a687beb..7a96755 100644 Binary files a/esercizi/ciclo_iterattivo_5.sb and b/esercizi/ciclo_iterattivo_5.sb differ diff --git a/esercizi/input_condizionale_3.sb b/esercizi/input_condizionale_3.sb index a879037..c91f995 100644 Binary files a/esercizi/input_condizionale_3.sb and b/esercizi/input_condizionale_3.sb differ diff --git a/esercizi/preso_9.sb b/esercizi/preso_9.sb index 855d199..788e7f4 100644 Binary files a/esercizi/preso_9.sb and b/esercizi/preso_9.sb differ diff --git a/esercizi/sfondo_segnale_8.sb b/esercizi/sfondo_segnale_8.sb index c6a1d18..15e2ad7 100644 Binary files a/esercizi/sfondo_segnale_8.sb and b/esercizi/sfondo_segnale_8.sb differ