教材のsuffix 'cl' を取り除く

[RollMan]

In GitLab by @yshimmyo on Nov 30, 2019, 07:55

find ./ -name "*.hsp" -exec "sed -i 's/cgpio/gpio/g'"

e.g.:

https://adaptive.u-aizu.ac.jp/gitlab/ome/ome2019/blob/eb661ae992739f88359571c05c260a3bb0a322f8/07/www/cgi-bin/led.hsp

yshimmyo@debian-thinkpad:~/Documents/ome2019$ for f in $(find ./ -name "*.hsp"); do grep "cgpio" $f && echo ===↑FILE: $f; done
cgpio led_port, led_val
===↑FILE: ./07/www/cgi-bin/qsled.hsp
;CGIからはcgpioinを使う(使い方はgpioinと同じ)
prev_led = cgpioin(17)
;CGIからはcgpioを使う(使い方はgpioと同じ、0以外を書いた場合プログラムが終了してもLEDは点灯し続ける)
cgpio 17, next_led
===↑FILE: ./07/www/cgi-bin/led.hsp
yshimmyo@debian-thinkpad:~/Documents/ome2019$ ^C
yshimmyo@debian-thinkpad:~/Documents/ome2019$ ^C
yshimmyo@debian-thinkpad:~/Documents/ome2019$ for f in $(find ./ -name "*.hsp"); do grep "cgpio" $f && echo - [] ↑FILE: $f; done
cgpio led_port, led_val
- [] ↑FILE: ./07/www/cgi-bin/qsled.hsp
;CGIからはcgpioinを使う(使い方はgpioinと同じ)
prev_led = cgpioin(17)
;CGIからはcgpioを使う(使い方はgpioと同じ、0以外を書いた場合プログラムが終了してもLEDは点灯し続ける)
cgpio 17, next_led
- [] ↑FILE: ./07/www/cgi-bin/led.hsp
yshimmyo@debian-thinkpad:~/Documents/ome2019$ for f in $(find ./ -name "*.hsp"); do grep "rpz-gpio" $f && echo - [] ↑FILE: $f; done
#include "rpz-gpio.as"
- [] ↑FILE: ./05/digout.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./05/pwm.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./05/digin.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./05/anain.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./05/angle2.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./05/oled.hsp
;#include "rpz-gpio.as"
- [] ↑FILE: ./05/ir.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./05/angle.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./05/kyori.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./03/button_led2.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./03/button_led3.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./03/button.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./03/led.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./03/Ltika.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./03/sensors.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./03/button_led.hsp
#include "rpz-gpio.as"
; 実行前にrpz-gpio.asの `#include "hsp3dish.as"` を取り除く
- [] ↑FILE: ./bin/test/bme/bme.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./bin/test/bme/bme_dish.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./bin/test/lux_test.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./ir.hsp
#include "rpz-gpio-cl.as"
- [] ↑FILE: ./07/www/cgi-bin/sensors_table.hsp
#include "rpz-gpio-cl.as"
- [] ↑FILE: ./07/www/cgi-bin/qsled.hsp
#include "rpz-gpio-cl.as"
- [] ↑FILE: ./07/www/cgi-bin/led.hsp
#include "rpz-gpio-cl.as"
- [] ↑FILE: ./07/www/cgi-bin/sensors.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./02/i2c_test.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./02/org/i2c_test.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./04/catch.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./04/org/catch.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./04/org/luxmove.hsp
#include "rpz-gpio.as"
- [] ↑FILE: ./04/luxmove.hsp

[RollMan]

In GitLab by @yshimmyo on Nov 30, 2019, 07:57

include "rpz-gpiocl.as" --> include "hsp3{dish,cl}.as" & include "rpz-gpio.as"

[RollMan]

In GitLab by @koyaman on Nov 30, 2019, 13:29

07回のプログラム変更が必要

• cgpio --> gpio
• cgpioin --> gpioin
• rpz-gpio-cl.as --> rpz-gpio.as

[RollMan]

In GitLab by @koyaman on Dec 1, 2019, 02:25

07回のプログラムは変更、動作確認

led.hspのgpioinはまだ未動作

[RollMan]

In GitLab by @yshimmyo on Sep 11, 2021, 09:30

7回 プログラム変更 は done

https://adaptive.u-aizu.ac.jp/gitlab/ome/ome2019/blob/master/bin/common/rpz-gpio-cl.as を消す

[RollMan]

In GitLab by @yshimmyo on Sep 16, 2021, 03:19

↓によると、2021-09-16現在まだ cl が使われている。

debian:~/Documents/ome2019/07/www/cgi-bin$ git symbolic-ref --short HEAD
master
debian:~/Documents/ome2019/07/www/cgi-bin$ git rev-parse HEAD
bc97e617bee796fcb778250106e021cd32de1fb8
debian:~/Documents/ome2019/07/www/cgi-bin$ grep -R "rpz-gpio-cl.as" . 2>/dev/null
./qsled.hsp:#include "rpz-gpio-cl.as"
./sensors_table.hsp:#include "rpz-gpio-cl.as"
./led.hsp:#include "rpz-gpio-cl.as"
./sensors.hsp:#include "rpz-gpio-cl.as"

!47 や !46 にて revert されているコミットがそのまま入っている。しかしこの revert は、3.6beta5 になる以前の OpenHSP への対処であり、当時 2019 年度の講座を保存するための作業のもので、2021年は実際 *-cl.as が不要。

したがって、この revert (!46, !47) は revert (再度もとのMRが適用) されてよい。

[RollMan]

In GitLab by @yshimmyo on Sep 16, 2021, 03:26

50